🚧 NotionData adjustments and fixes

Carter Games/The Cart/Core/Editor/Logging/Settings/SettingsProviderLogging.cs

@@ -60,10 +60,10 @@ private static bool IsCategoriesExpanded
 
 
         private static SerializedObject ObjectRef =>
-            ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().ObjectRef;
+            ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().ObjectRef;
 
-        private static DataAssetCartGlobalRuntimeSettings AssetRef =>
-            ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().AssetRef;
+        private static DataAssetCoreRuntimeSettings AssetRef =>
+            ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().AssetRef;
 
 
 

Carter Games/The Cart/Core/Editor/Management/Settings/Custom Editors/DataAssetCartRuntimeSettingsInspector.cs

@@ -23,10 +23,6 @@
 
 using System.Linq;
 using System.Reflection;
-using CarterGames.Cart.Core.Data;
-using CarterGames.Cart.Core.Logs.Editor;
-using CarterGames.Cart.Core.Random.Editor;
-using CarterGames.Cart.Modules.Settings;
 using UnityEditor;
 using UnityEngine;
 
@@ -35,7 +31,7 @@ namespace CarterGames.Cart.Core.Management.Editor
     /// <summary>
     /// Handles the custom editor for the runtime settings asset.
     /// </summary>
-    [CustomEditor(typeof(DataAssetCartGlobalRuntimeSettings))]
+    [CustomEditor(typeof(DataAssetCoreRuntimeSettings))]
     public sealed class DataAssetCartRuntimeSettingsInspector : UnityEditor.Editor
     {
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -48,7 +44,7 @@ public sealed class DataAssetCartRuntimeSettingsInspector : UnityEditor.Editor
         public override void OnInspectorGUI()
         {
             GUILayout.Space(4f);
-            GeneralUtilEditor.DrawSoScriptSection((DataAssetCartGlobalRuntimeSettings)target);
+            GeneralUtilEditor.DrawSoScriptSection((DataAssetCoreRuntimeSettings)target);
             GUILayout.Space(10f);
 
             EditorGUILayout.LabelField("Core", EditorStyles.boldLabel);

Carter Games/The Cart/Core/Editor/Management/Settings/Definitions/ScriptableDefCoreSettings.cs

@@ -29,17 +29,17 @@
 
 namespace CarterGames.Cart.Core.Editor
 {
-	public class ScriptableDefCoreSettings : IScriptableAssetDef<DataAssetCartGlobalRuntimeSettings>
+	public class ScriptableDefCoreSettings : IScriptableAssetDef<DataAssetCoreRuntimeSettings>
 	{
-		private static DataAssetCartGlobalRuntimeSettings cache;
+		private static DataAssetCoreRuntimeSettings cache;
 		private static SerializedObject objCache;
 
-		public Type AssetType => typeof(DataAssetCartGlobalRuntimeSettings);
+		public Type AssetType => typeof(DataAssetCoreRuntimeSettings);
 		public string DataAssetFileName => "[Cart] Core Runtime Settings.asset";
-		public string DataAssetFilter => $"t:{typeof(DataAssetCartGlobalRuntimeSettings).FullName}";
+		public string DataAssetFilter => $"t:{typeof(DataAssetCoreRuntimeSettings).FullName}";
 		public string DataAssetPath => $"{ScriptableRef.FullPathData}{DataAssetFileName}";
 
-		public DataAssetCartGlobalRuntimeSettings AssetRef => ScriptableRef.GetOrCreateAsset(this, ref cache);
+		public DataAssetCoreRuntimeSettings AssetRef => ScriptableRef.GetOrCreateAsset(this, ref cache);
 		public SerializedObject ObjectRef => ScriptableRef.GetOrCreateAssetObject(this, ref objCache);
 
 		public void TryCreate()

Carter Games/The Cart/Core/Editor/Management/Utility/Scriptable Assets/ScriptableObjectInitialize.cs

@@ -21,8 +21,6 @@
  * THE SOFTWARE.
  */
 
-using UnityEditor;
-
 namespace CarterGames.Cart.Core.Management.Editor
 {
     /// <summary>
@@ -37,7 +35,7 @@ public class ScriptableObjectInitialize : IAssetEditorInitialize, IAssetEditorRe
         /// <summary>
         /// Defines the order that this initializer run at.
         /// </summary>
-        public int InitializeOrder => -1;
+        public int InitializeOrder => 0;
 
 
         /// <summary>
@@ -61,13 +59,5 @@ public void OnEditorReloaded()
             if (ScriptableRef.HasAllAssets()) return;
             ScriptableRef.TryCreateAssets();
         }
-
-
-        [InitializeOnLoadMethod]
-        private static void TryInit()
-        {
-            if (ScriptableRef.HasAllAssets()) return;
-            ScriptableRef.TryCreateAssets();
-        }
     }
 }

Carter Games/The Cart/Core/Editor/Management/Utility/UtilEditor.cs

@@ -56,7 +56,7 @@ public static class UtilEditor
         /// <summary>
         /// Gets/Sets the save manager settings asset.
         /// </summary>
-        public static DataAssetCartGlobalRuntimeSettings Settings => ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().AssetRef;
+        public static DataAssetCoreRuntimeSettings Settings => ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().AssetRef;
 
 
         /// <summary>
@@ -69,7 +69,7 @@ public static class UtilEditor
         /// <summary>
         /// Gets/Sets the save manager editor settings asset.
         /// </summary>
-        public static SerializedObject SettingsObject => ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().ObjectRef;
+        public static SerializedObject SettingsObject => ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().ObjectRef;
 
 
         /// <summary>

Carter Games/The Cart/Core/Editor/Rng/SettingsProviderRandom.cs

@@ -48,10 +48,10 @@ private static bool IsExpanded
 
 
         private static SerializedObject ObjectRef =>
-            ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().ObjectRef;
+            ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().ObjectRef;
 
-        private static DataAssetCartGlobalRuntimeSettings AssetRef =>
-            ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().AssetRef;
+        private static DataAssetCoreRuntimeSettings AssetRef =>
+            ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().AssetRef;
 
 
 

Carter Games/The Cart/Core/Editor/Save/SettingsProviderSave.cs

@@ -21,7 +21,7 @@ private static bool IsExpanded
 
 
 		private static SerializedObject ObjectRef =>
-			ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().ObjectRef;
+			ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().ObjectRef;
 
 
 		public void OnInspectorSettingsGUI()
@@ -60,7 +60,7 @@ public void OnProjectSettingsGUI()
 						var typeString = ObjectRef.Fp("saveMethodTypeDef").Fpr("type").stringValue;
 
 						SearchProviderSaveMethod.GetProvider().SelectionMade.Add(HandleSelection);
-						SearchProviderSaveMethod.GetProvider().Open(ScriptableRef.GetAssetDef<DataAssetCartGlobalRuntimeSettings>().AssetRef.SaveMethodType);
+						SearchProviderSaveMethod.GetProvider().Open(ScriptableRef.GetAssetDef<DataAssetCoreRuntimeSettings>().AssetRef.SaveMethodType);
 					}
 					else
 					{

Carter Games/The Cart/Core/Runtime/Management/Assets/Settings/DataAssetCartGlobalRuntimeSettings.cs → Carter Games/The Cart/Core/Runtime/Management/Assets/Settings/DataAssetCoreRuntimeSettings.cs

@@ -22,7 +22,6 @@
  */
 
 using System;
-using System.Linq;
 using CarterGames.Cart.Core.Data;
 using CarterGames.Cart.Core.Random;
 using CarterGames.Cart.Core.Save;
@@ -33,7 +32,7 @@ namespace CarterGames.Cart.Core.Management
     /// <summary>
     /// Handles any runtime specific settings for the package.
     /// </summary>
-    public sealed class DataAssetCartGlobalRuntimeSettings : DataAsset
+    public sealed class DataAssetCoreRuntimeSettings : DataAsset
     {
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Fields

Carter Games/The Cart/Core/Runtime/Management/Save/CartSaveHandler.cs

@@ -7,8 +7,8 @@ public static class CartSaveHandler
 	{
 		private static ISaveMethod SaveMethod => CoreSettings.SaveMethodType;
 
-		private static DataAssetCartGlobalRuntimeSettings CoreSettings =>
-			DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>();
+		private static DataAssetCoreRuntimeSettings CoreSettings =>
+			DataAccess.GetAsset<DataAssetCoreRuntimeSettings>();
 
 
 		public static T Get<T>(string key)

Carter Games/The Cart/Core/Runtime/Management/Utility/UtilRuntime.cs

@@ -36,7 +36,7 @@ public static class UtilRuntime
 
         // Caches
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
-        private static DataAssetCartGlobalRuntimeSettings settingsCache;
+        private static DataAssetCoreRuntimeSettings settingsCache;
 
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Properties
@@ -45,12 +45,12 @@ public static class UtilRuntime
         /// <summary>
         /// The runtime settings asset.
         /// </summary>
-        public static DataAssetCartGlobalRuntimeSettings Settings
+        public static DataAssetCoreRuntimeSettings Settings
         {
             get
             {
                 if (settingsCache != null) return settingsCache;
-                settingsCache = DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>();
+                settingsCache = DataAccess.GetAsset<DataAssetCoreRuntimeSettings>();
                 return settingsCache;
             }
         }

Carter Games/The Cart/Core/Runtime/Random/Providers/Alea/AleaRngProvider.cs

@@ -35,8 +35,8 @@ public sealed class AleaRngProvider : ISeededRngProvider
         /// <remarks>This is intended to help with debugging as you can replicate the seed & get the same results as a user.</remarks>
         public static string Seed
         {
-            get => DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>().RngAleaRngSeed;
-            private set => DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>().RngAleaRngSeed = value;
+            get => DataAccess.GetAsset<DataAssetCoreRuntimeSettings>().RngAleaRngSeed;
+            private set => DataAccess.GetAsset<DataAssetCoreRuntimeSettings>().RngAleaRngSeed = value;
         }
 
 

Carter Games/The Cart/Core/Runtime/Random/Providers/System/SystemRngProvider.cs

@@ -35,8 +35,8 @@ public sealed class SystemRngProvider : ISeededRngProvider
         /// <remarks>This is intended to help with debugging as you can replicate the seed & get the same results as a user.</remarks>
         public static int Seed
         {
-            get => DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>().RngSystemRngSeed;
-            private set => DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>().RngSystemRngSeed = value;
+            get => DataAccess.GetAsset<DataAssetCoreRuntimeSettings>().RngSystemRngSeed;
+            private set => DataAccess.GetAsset<DataAssetCoreRuntimeSettings>().RngSystemRngSeed = value;
         }
 
 

Carter Games/The Cart/Core/Runtime/Random/Rng.cs

@@ -45,7 +45,7 @@ public static class Rng
         /// <summary>
         /// Gets the current random provider in use.
         /// </summary>
-        public static IRngProvider Provider => DataAccess.GetAsset<DataAssetCartGlobalRuntimeSettings>().RngProvider;
+        public static IRngProvider Provider => DataAccess.GetAsset<DataAssetCoreRuntimeSettings>().RngProvider;
 
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Bool

Carter Games/The Cart/Modules/Localization/Code/Runtime/LocalizationManager.cs

@@ -187,6 +187,12 @@ public static string GetCopy(string id)
 
 			return copy;
 		}
+
+
+		public static LocalizationData GetRawData(string id)
+		{
+			return GetCopyData(id);
+		}
 	}
 }
 

Carter Games/The Cart/Modules/Localization/Code/Runtime/Notion Data/NotionDataWrapperLocalizationData.cs

@@ -0,0 +1,56 @@
+#if CARTERGAMES_CART_MODULE_LOCALIZATION && CARTERGAMES_CART_MODULE_NOTIONDATA
+
+/*
+ * Copyright (c) 2024 Carter Games
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+using System;
+using CarterGames.Cart.Core.Logs;
+using CarterGames.Cart.Modules.NotionData;
+
+namespace CarterGames.Cart.Modules.Localization
+{
+    /// <summary>
+    /// Use to convert a localization id into its data in a NotionDataAsset through standard database parsing.
+    /// </summary>
+    public class NotionDataWrapperLocalizationData : NotionDataWrapper<LocalizationData>
+    {
+        public NotionDataWrapperLocalizationData(string id) : base(id) { }
+
+        protected override void Assign()
+        {
+            try
+            {
+                value = LocalizationManager.GetRawData(id);
+            }
+#pragma warning disable
+            catch (Exception e)
+            {
+                CartLogger.LogWarning<LogCategoryModules>($"Unable to wrap {id} as Localized text, make sure the id exists.");
+                throw;
+            }
+#pragma warning restore
+        }
+    }
+}
+
+#endif

Carter Games/The Cart/Modules/Management/ModuleAssetInitializer.cs

@@ -60,14 +60,6 @@ public void OnEditorReloaded()
             if (ModulesScriptableRef.HasAllAssets()) return;
             ModulesScriptableRef.TryCreateAssets();
         }
-
-
-        [InitializeOnLoadMethod]
-        private static void TryInit()
-        {
-            if (ModulesScriptableRef.HasAllAssets()) return;
-            ModulesScriptableRef.TryCreateAssets();
-        }
     }
 }