Rename ChatService and move some support buttons to OtterGui.

Ottermandias · Ottermandias · commit 5f916efb13b7 · 2023-06-18T13:24:13.000+02:00
diff --git a/OtterGui b/OtterGui
@@ -1 +1 @@
-Subproject commit ced7068b8bf9729018c9f03f9a8e9354b9e7ca3e
+Subproject commit a79abe203da2673f71a4e31422c6058375fb8dec
diff --git a/Penumbra/Collections/Manager/ActiveCollectionMigration.cs b/Penumbra/Collections/Manager/ActiveCollectionMigration.cs
@@ -50,7 +50,7 @@ public static bool MigrateIndividualCollections(CollectionStorage storage, Indiv
         {
             if (!storage.ByName(collectionName, out var collection))
             {
-                Penumbra.ChatService.NotificationMessage(
+                Penumbra.Chat.NotificationMessage(
                     $"Last choice of <{player}>'s Collection {collectionName} is not available, reset to {ModCollection.Empty.Name}.", "Load Failure",
                     NotificationType.Warning);
                 dict.Add(player, ModCollection.Empty);
diff --git a/Penumbra/Collections/Manager/ActiveCollections.cs b/Penumbra/Collections/Manager/ActiveCollections.cs
@@ -335,7 +335,7 @@ private void LoadCollections()
          ?? (configChanged ? ModCollection.DefaultCollectionName : ModCollection.Empty.Name);
         if (!_storage.ByName(defaultName, out var defaultCollection))
         {
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"Last choice of {TutorialService.DefaultCollection} {defaultName} is not available, reset to {ModCollection.Empty.Name}.",
                 "Load Failure",
                 NotificationType.Warning);
@@ -351,7 +351,7 @@ private void LoadCollections()
         var interfaceName = jObject[nameof(Interface)]?.ToObject<string>() ?? Default.Name;
         if (!_storage.ByName(interfaceName, out var interfaceCollection))
         {
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"Last choice of {TutorialService.InterfaceCollection} {interfaceName} is not available, reset to {ModCollection.Empty.Name}.",
                 "Load Failure", NotificationType.Warning);
             Interface     = ModCollection.Empty;
@@ -366,7 +366,7 @@ private void LoadCollections()
         var currentName = jObject[nameof(Current)]?.ToObject<string>() ?? Default.Name;
         if (!_storage.ByName(currentName, out var currentCollection))
         {
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"Last choice of {TutorialService.SelectedCollection} {currentName} is not available, reset to {ModCollection.DefaultCollectionName}.",
                 "Load Failure", NotificationType.Warning);
             Current       = _storage.DefaultNamed;
@@ -385,7 +385,7 @@ private void LoadCollections()
             {
                 if (!_storage.ByName(typeName, out var typeCollection))
                 {
-                    Penumbra.ChatService.NotificationMessage($"Last choice of {name} Collection {typeName} is not available, removed.",
+                    Penumbra.Chat.NotificationMessage($"Last choice of {name} Collection {typeName} is not available, removed.",
                         "Load Failure",
                         NotificationType.Warning);
                     configChanged = true;
diff --git a/Penumbra/Collections/Manager/CollectionStorage.cs b/Penumbra/Collections/Manager/CollectionStorage.cs
@@ -107,7 +107,7 @@ public bool AddCollection(string name, ModCollection? duplicate)
     {
         if (!CanAddCollection(name, out var fixedName))
         {
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"The new collection {name} would lead to the same path {fixedName} as one that already exists.", "Warning",
                 NotificationType.Warning);
             return false;
@@ -118,7 +118,7 @@ public bool AddCollection(string name, ModCollection? duplicate)
         _collections.Add(newCollection);
 
         _saveService.ImmediateSave(new ModCollectionSave(_modStorage, newCollection));
-        Penumbra.ChatService.NotificationMessage($"Created new collection {newCollection.AnonymizedName}.", "Success",
+        Penumbra.Chat.NotificationMessage($"Created new collection {newCollection.AnonymizedName}.", "Success",
             NotificationType.Success);
         _communicator.CollectionChange.Invoke(CollectionType.Inactive, null, newCollection, string.Empty);
         return true;
@@ -131,13 +131,13 @@ public bool RemoveCollection(ModCollection collection)
     {
         if (collection.Index <= ModCollection.Empty.Index || collection.Index >= _collections.Count)
         {
-            Penumbra.ChatService.NotificationMessage("Can not remove the empty collection.", "Error", NotificationType.Error);
+            Penumbra.Chat.NotificationMessage("Can not remove the empty collection.", "Error", NotificationType.Error);
             return false;
         }
 
         if (collection.Index == DefaultNamed.Index)
         {
-            Penumbra.ChatService.NotificationMessage("Can not remove the default collection.", "Error", NotificationType.Error);
+            Penumbra.Chat.NotificationMessage("Can not remove the default collection.", "Error", NotificationType.Error);
             return false;
         }
 
@@ -147,7 +147,7 @@ public bool RemoveCollection(ModCollection collection)
         for (var i = collection.Index; i < Count; ++i)
             _collections[i].Index = i;
 
-        Penumbra.ChatService.NotificationMessage($"Deleted collection {collection.AnonymizedName}.", "Success", NotificationType.Success);
+        Penumbra.Chat.NotificationMessage($"Deleted collection {collection.AnonymizedName}.", "Success", NotificationType.Success);
         _communicator.CollectionChange.Invoke(CollectionType.Inactive, collection, null, string.Empty);
         return true;
     }
@@ -190,22 +190,22 @@ private void ReadCollections(out ModCollection defaultNamedCollection)
             if (!IsValidName(name))
             {
                 // TODO: handle better.
-                Penumbra.ChatService.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.",
+                Penumbra.Chat.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.",
                     "Warning", NotificationType.Warning);
                 continue;
             }
 
             if (ByName(name, out _))
             {
-                Penumbra.ChatService.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",
+                Penumbra.Chat.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",
                     "Warning", NotificationType.Warning);
                 continue;
             }
 
             var collection  = ModCollection.CreateFromData(_saveService, _modStorage, name, version, Count, settings, inheritance);
             var correctName = _saveService.FileNames.CollectionFile(collection);
             if (file.FullName != correctName)
-                Penumbra.ChatService.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Name}.", "Warning",
+                Penumbra.Chat.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Name}.", "Warning",
                     NotificationType.Warning);
             _collections.Add(collection);
         }
@@ -226,7 +226,7 @@ private ModCollection SetDefaultNamedCollection()
         if (AddCollection(ModCollection.DefaultCollectionName, null))
             return _collections[^1];
 
-        Penumbra.ChatService.NotificationMessage(
+        Penumbra.Chat.NotificationMessage(
             $"Unknown problem creating a collection with the name {ModCollection.DefaultCollectionName}, which is required to exist.", "Error",
             NotificationType.Error);
         return Count > 1 ? _collections[1] : _collections[0];
diff --git a/Penumbra/Collections/Manager/IndividualCollections.Files.cs b/Penumbra/Collections/Manager/IndividualCollections.Files.cs
@@ -57,7 +57,7 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)
                 if (group.Length == 0 || group.Any(i => !i.IsValid))
                 {
                     changes = true;
-                    Penumbra.ChatService.NotificationMessage("Could not load an unknown individual collection, removed.", "Load Failure",
+                    Penumbra.Chat.NotificationMessage("Could not load an unknown individual collection, removed.", "Load Failure",
                         NotificationType.Warning);
                     continue;
                 }
@@ -66,7 +66,7 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)
                 if (collectionName.Length == 0 || !storage.ByName(collectionName, out var collection))
                 {
                     changes = true;
-                    Penumbra.ChatService.NotificationMessage(
+                    Penumbra.Chat.NotificationMessage(
                         $"Could not load the collection \"{collectionName}\" as individual collection for {identifier}, set to None.",
                         "Load Failure",
                         NotificationType.Warning);
@@ -76,15 +76,15 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)
                 if (!Add(group, collection))
                 {
                     changes = true;
-                    Penumbra.ChatService.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",
+                    Penumbra.Chat.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",
                         "Load Failure",
                         NotificationType.Warning);
                 }
             }
             catch (Exception e)
             {
                 changes = true;
-                Penumbra.ChatService.NotificationMessage($"Could not load an unknown individual collection, removed:\n{e}", "Load Failure",
+                Penumbra.Chat.NotificationMessage($"Could not load an unknown individual collection, removed:\n{e}", "Load Failure",
                     NotificationType.Error);
             }
         }
@@ -124,7 +124,7 @@ static bool FindDataId(string name, IReadOnlyDictionary<uint, string> data, out
                 if (Add($"{_actorService.AwaitedService.Data.ToName(kind, dataId)} ({kind.ToName()})", group, collection))
                     Penumbra.Log.Information($"Migrated {name} ({kind.ToName()}) to NPC Identifiers [{ids}].");
                 else
-                    Penumbra.ChatService.NotificationMessage(
+                    Penumbra.Chat.NotificationMessage(
                         $"Could not migrate {name} ({collection.AnonymizedName}) which was assumed to be a {kind.ToName()} with IDs [{ids}], please look through your individual collections.",
                         "Migration Failure", NotificationType.Error);
             }
@@ -140,13 +140,13 @@ static bool FindDataId(string name, IReadOnlyDictionary<uint, string> data, out
                     }, collection))
                     Penumbra.Log.Information($"Migrated {shortName} ({collection.AnonymizedName}) to Player Identifier.");
                 else
-                    Penumbra.ChatService.NotificationMessage(
+                    Penumbra.Chat.NotificationMessage(
                         $"Could not migrate {shortName} ({collection.AnonymizedName}), please look through your individual collections.",
                         "Migration Failure", NotificationType.Error);
             }
             else
             {
-                Penumbra.ChatService.NotificationMessage(
+                Penumbra.Chat.NotificationMessage(
                     $"Could not migrate {name} ({collection.AnonymizedName}), which can not be a player name nor is it a known NPC name, please look through your individual collections.",
                     "Migration Failure", NotificationType.Error);
             }
diff --git a/Penumbra/Collections/Manager/InheritanceManager.cs b/Penumbra/Collections/Manager/InheritanceManager.cs
@@ -146,12 +146,12 @@ private void ApplyInheritances()
                         continue;
 
                     changes = true;
-                    Penumbra.ChatService.NotificationMessage($"{collection.Name} can not inherit from {subCollection.Name}, removed.", "Warning",
+                    Penumbra.Chat.NotificationMessage($"{collection.Name} can not inherit from {subCollection.Name}, removed.", "Warning",
                         NotificationType.Warning);
                 }
                 else
                 {
-                    Penumbra.ChatService.NotificationMessage(
+                    Penumbra.Chat.NotificationMessage(
                         $"Inherited collection {subCollectionName} for {collection.AnonymizedName} does not exist, it was removed.", "Warning",
                         NotificationType.Warning);
                     changes = true;
diff --git a/Penumbra/Mods/Editor/ModMerger.cs b/Penumbra/Mods/Editor/ModMerger.cs
@@ -84,7 +84,7 @@ public void Merge()
         catch (Exception ex)
         {
             Error = ex;
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"Could not merge {MergeFromMod!.Name} into {MergeToMod!.Name}, cleaning up changes.:\n{ex}", "Failure",
                 NotificationType.Error);
             FailureCleanup();
diff --git a/Penumbra/Mods/Editor/ModNormalizer.cs b/Penumbra/Mods/Editor/ModNormalizer.cs
@@ -77,7 +77,7 @@ private void NormalizeSync()
         }
         catch (Exception e)
         {
-            Penumbra.ChatService.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);
+            Penumbra.Chat.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);
         }
         finally
         {
@@ -90,15 +90,15 @@ private bool CheckDirectories()
     {
         if (Directory.Exists(_normalizationDirName))
         {
-            Penumbra.ChatService.NotificationMessage("Could not normalize mod:\n"
+            Penumbra.Chat.NotificationMessage("Could not normalize mod:\n"
               + "The directory TmpNormalization may not already exist when normalizing a mod.", "Failure",
                 NotificationType.Error);
             return false;
         }
 
         if (Directory.Exists(_oldDirName))
         {
-            Penumbra.ChatService.NotificationMessage("Could not normalize mod:\n"
+            Penumbra.Chat.NotificationMessage("Could not normalize mod:\n"
               + "The directory TmpNormalizationOld may not already exist when normalizing a mod.", "Failure",
                 NotificationType.Error);
             return false;
@@ -204,7 +204,7 @@ private bool CopyNewFiles()
         }
         catch (Exception e)
         {
-            Penumbra.ChatService.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);
+            Penumbra.Chat.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);
         }
 
         return false;
@@ -232,7 +232,7 @@ private bool MoveOldFiles()
         }
         catch (Exception e)
         {
-            Penumbra.ChatService.NotificationMessage($"Could not move old files out of the way while normalizing mod mod:\n{e}", "Failure",
+            Penumbra.Chat.NotificationMessage($"Could not move old files out of the way while normalizing mod mod:\n{e}", "Failure",
                 NotificationType.Error);
         }
 
@@ -256,7 +256,7 @@ private bool MoveNewFiles()
         }
         catch (Exception e)
         {
-            Penumbra.ChatService.NotificationMessage($"Could not move new files into the mod while normalizing mod mod:\n{e}", "Failure",
+            Penumbra.Chat.NotificationMessage($"Could not move new files into the mod while normalizing mod mod:\n{e}", "Failure",
                 NotificationType.Error);
             foreach (var dir in Mod.ModPath.EnumerateDirectories())
             {
diff --git a/Penumbra/Mods/Manager/ModImportManager.cs b/Penumbra/Mods/Manager/ModImportManager.cs
@@ -48,7 +48,7 @@ public void TryUnpacking()
             if (File.Exists(s))
                 return true;
 
-            Penumbra.ChatService.NotificationMessage($"Failed to import queued mod at {s}, the file does not exist.", "Warning",
+            Penumbra.Chat.NotificationMessage($"Failed to import queued mod at {s}, the file does not exist.", "Warning",
                 NotificationType.Warning);
             return false;
         }).Select(s => new FileInfo(s)).ToArray();
diff --git a/Penumbra/Mods/Manager/ModOptionEditor.cs b/Penumbra/Mods/Manager/ModOptionEditor.cs
@@ -398,7 +398,7 @@ public static bool VerifyFileName(Mod mod, IModGroup? group, string newName, boo
             return true;
 
         if (message)
-            Penumbra.ChatService.NotificationMessage(
+            Penumbra.Chat.NotificationMessage(
                 $"Could not name option {newName} because option with same filename {path} already exists.",
                 "Warning", NotificationType.Warning);
 
diff --git a/Penumbra/Mods/ModCreator.cs b/Penumbra/Mods/ModCreator.cs
@@ -51,7 +51,7 @@ public ModCreator(SaveService saveService, Configuration config, ModDataEditor d
         }
         catch (Exception e)
         {
-            Penumbra.ChatService.NotificationMessage($"Could not create directory for new Mod {newName}:\n{e}", "Failure",
+            Penumbra.Chat.NotificationMessage($"Could not create directory for new Mod {newName}:\n{e}", "Failure",
                 NotificationType.Error);
             return null;
         }
diff --git a/Penumbra/Mods/Subclasses/MultiModGroup.cs b/Penumbra/Mods/Subclasses/MultiModGroup.cs
@@ -59,7 +59,7 @@ IEnumerator IEnumerable.GetEnumerator()
             {
                 if (ret.PrioritizedOptions.Count == IModGroup.MaxMultiOptions)
                 {
-                    Penumbra.ChatService.NotificationMessage(
+                    Penumbra.Chat.NotificationMessage(
                         $"Multi Group {ret.Name} has more than {IModGroup.MaxMultiOptions} options, ignoring excessive options.", "Warning",
                         NotificationType.Warning);
                     break;
diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs
@@ -31,7 +31,7 @@ public string Name
         => "Penumbra";
 
     public static readonly Logger      Log = new();
-    public static          ChatService ChatService { get; private set; } = null!;
+    public static          ChatService Chat { get; private set; } = null!;
 
     private readonly ValidityChecker         _validityChecker;
     private readonly ResidentResourceManager _residentResources;
@@ -55,7 +55,7 @@ public Penumbra(DalamudPluginInterface pluginInterface)
             var       startTimer = new StartTracker();
             using var timer      = startTimer.Measure(StartTimeType.Total);
             _services        = ServiceManager.CreateProvider(this, pluginInterface, Log, startTimer);
-            ChatService      = _services.GetRequiredService<ChatService>();
+            Chat      = _services.GetRequiredService<ChatService>();
             _validityChecker = _services.GetRequiredService<ValidityChecker>();
             var startup = _services.GetRequiredService<DalamudServices>().GetDalamudConfig(DalamudServices.WaitingForPluginsOption, out bool s)
                 ? s.ToString()
@@ -115,7 +115,7 @@ private void SetupApi()
         _communicatorService.ChangedItemClick.Subscribe((button, it) =>
         {
             if (button == MouseButton.Left && it is Item item)
-                ChatService.LinkItem(item);
+                Chat.LinkItem(item);
         }, ChangedItemClick.Priority.Link);
     }
 
diff --git a/Penumbra/Services/ValidityChecker.cs b/Penumbra/Services/ValidityChecker.cs
@@ -38,7 +38,7 @@ public ValidityChecker(DalamudPluginInterface pi)
     public void LogExceptions()
     {
         if( ImcExceptions.Count > 0 )
-            Penumbra.ChatService.NotificationMessage( $"{ImcExceptions} IMC Exceptions thrown during Penumbra load. Please repair your game files.", "Warning", NotificationType.Warning );
+            Penumbra.Chat.NotificationMessage( $"{ImcExceptions} IMC Exceptions thrown during Penumbra load. Please repair your game files.", "Warning", NotificationType.Warning );
     }
 
     // Because remnants of penumbra in devPlugins cause issues, we check for them to warn users to remove them.
diff --git a/Penumbra/UI/AdvancedWindow/FileEditor.cs b/Penumbra/UI/AdvancedWindow/FileEditor.cs
@@ -129,7 +129,7 @@ private void DefaultInput()
                     }
                     catch (Exception e)
                     {
-                        Penumbra.ChatService.NotificationMessage($"Could not export {_defaultPath}:\n{e}", "Error", NotificationType.Error);
+                        Penumbra.Chat.NotificationMessage($"Could not export {_defaultPath}:\n{e}", "Error", NotificationType.Error);
                     }
                 }, _getInitialPath(), false);
 
diff --git a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.MtrlTab.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.MtrlTab.cs
diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs
diff --git a/Penumbra/UI/Classes/Colors.cs b/Penumbra/UI/Classes/Colors.cs
diff --git a/Penumbra/UI/ConfigWindow.cs b/Penumbra/UI/ConfigWindow.cs
diff --git a/Penumbra/UI/Tabs/SettingsTab.cs b/Penumbra/UI/Tabs/SettingsTab.cs
diff --git a/Penumbra/UI/UiHelpers.cs b/Penumbra/UI/UiHelpers.cs

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static bool MigrateIndividualCollections(CollectionStorage storage, Indiv`
`50`	`50`	`{`
`51`	`51`	`if (!storage.ByName(collectionName, out var collection))`
`52`	`52`	`{`
`53`		`- Penumbra.ChatService.NotificationMessage(`
	`53`	`+ Penumbra.Chat.NotificationMessage(`
`54`	`54`	`$"Last choice of <{player}>'s Collection {collectionName} is not available, reset to {ModCollection.Empty.Name}.", "Load Failure",`
`55`	`55`	`NotificationType.Warning);`
`56`	`56`	`dict.Add(player, ModCollection.Empty);`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public bool AddCollection(string name, ModCollection? duplicate)`
`107`	`107`	`{`
`108`	`108`	`if (!CanAddCollection(name, out var fixedName))`
`109`	`109`	`{`
`110`		`- Penumbra.ChatService.NotificationMessage(`
	`110`	`+ Penumbra.Chat.NotificationMessage(`
`111`	`111`	`$"The new collection {name} would lead to the same path {fixedName} as one that already exists.", "Warning",`
`112`	`112`	`NotificationType.Warning);`
`113`	`113`	`return false;`
`@@ -118,7 +118,7 @@ public bool AddCollection(string name, ModCollection? duplicate)`
`118`	`118`	`_collections.Add(newCollection);`
`119`	`119`
`120`	`120`	`_saveService.ImmediateSave(new ModCollectionSave(_modStorage, newCollection));`
`121`		`- Penumbra.ChatService.NotificationMessage($"Created new collection {newCollection.AnonymizedName}.", "Success",`
	`121`	`+ Penumbra.Chat.NotificationMessage($"Created new collection {newCollection.AnonymizedName}.", "Success",`
`122`	`122`	`NotificationType.Success);`
`123`	`123`	`_communicator.CollectionChange.Invoke(CollectionType.Inactive, null, newCollection, string.Empty);`
`124`	`124`	`return true;`
`@@ -131,13 +131,13 @@ public bool RemoveCollection(ModCollection collection)`
`131`	`131`	`{`
`132`	`132`	`if (collection.Index <= ModCollection.Empty.Index \|\| collection.Index >= _collections.Count)`
`133`	`133`	`{`
`134`		`- Penumbra.ChatService.NotificationMessage("Can not remove the empty collection.", "Error", NotificationType.Error);`
	`134`	`+ Penumbra.Chat.NotificationMessage("Can not remove the empty collection.", "Error", NotificationType.Error);`
`135`	`135`	`return false;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if (collection.Index == DefaultNamed.Index)`
`139`	`139`	`{`
`140`		`- Penumbra.ChatService.NotificationMessage("Can not remove the default collection.", "Error", NotificationType.Error);`
	`140`	`+ Penumbra.Chat.NotificationMessage("Can not remove the default collection.", "Error", NotificationType.Error);`
`141`	`141`	`return false;`
`142`	`142`	`}`
`143`	`143`
`@@ -147,7 +147,7 @@ public bool RemoveCollection(ModCollection collection)`
`147`	`147`	`for (var i = collection.Index; i < Count; ++i)`
`148`	`148`	`_collections[i].Index = i;`
`149`	`149`
`150`		`- Penumbra.ChatService.NotificationMessage($"Deleted collection {collection.AnonymizedName}.", "Success", NotificationType.Success);`
	`150`	`+ Penumbra.Chat.NotificationMessage($"Deleted collection {collection.AnonymizedName}.", "Success", NotificationType.Success);`
`151`	`151`	`_communicator.CollectionChange.Invoke(CollectionType.Inactive, collection, null, string.Empty);`
`152`	`152`	`return true;`
`153`	`153`	`}`
`@@ -190,22 +190,22 @@ private void ReadCollections(out ModCollection defaultNamedCollection)`
`190`	`190`	`if (!IsValidName(name))`
`191`	`191`	`{`
`192`	`192`	`// TODO: handle better.`
`193`		`- Penumbra.ChatService.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.",`
	`193`	`+ Penumbra.Chat.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.",`
`194`	`194`	`"Warning", NotificationType.Warning);`
`195`	`195`	`continue;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`if (ByName(name, out _))`
`199`	`199`	`{`
`200`		`- Penumbra.ChatService.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",`
	`200`	`+ Penumbra.Chat.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",`
`201`	`201`	`"Warning", NotificationType.Warning);`
`202`	`202`	`continue;`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`var collection = ModCollection.CreateFromData(_saveService, _modStorage, name, version, Count, settings, inheritance);`
`206`	`206`	`var correctName = _saveService.FileNames.CollectionFile(collection);`
`207`	`207`	`if (file.FullName != correctName)`
`208`		`- Penumbra.ChatService.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Name}.", "Warning",`
	`208`	`+ Penumbra.Chat.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Name}.", "Warning",`
`209`	`209`	`NotificationType.Warning);`
`210`	`210`	`_collections.Add(collection);`
`211`	`211`	`}`
`@@ -226,7 +226,7 @@ private ModCollection SetDefaultNamedCollection()`
`226`	`226`	`if (AddCollection(ModCollection.DefaultCollectionName, null))`
`227`	`227`	`return _collections[^1];`
`228`	`228`
`229`		`- Penumbra.ChatService.NotificationMessage(`
	`229`	`+ Penumbra.Chat.NotificationMessage(`
`230`	`230`	`$"Unknown problem creating a collection with the name {ModCollection.DefaultCollectionName}, which is required to exist.", "Error",`
`231`	`231`	`NotificationType.Error);`
`232`	`232`	`return Count > 1 ? _collections[1] : _collections[0];`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)`
`57`	`57`	`if (group.Length == 0 \|\| group.Any(i => !i.IsValid))`
`58`	`58`	`{`
`59`	`59`	`changes = true;`
`60`		`- Penumbra.ChatService.NotificationMessage("Could not load an unknown individual collection, removed.", "Load Failure",`
	`60`	`+ Penumbra.Chat.NotificationMessage("Could not load an unknown individual collection, removed.", "Load Failure",`
`61`	`61`	`NotificationType.Warning);`
`62`	`62`	`continue;`
`63`	`63`	`}`
`@@ -66,7 +66,7 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)`
`66`	`66`	`if (collectionName.Length == 0 \|\| !storage.ByName(collectionName, out var collection))`
`67`	`67`	`{`
`68`	`68`	`changes = true;`
`69`		`- Penumbra.ChatService.NotificationMessage(`
	`69`	`+ Penumbra.Chat.NotificationMessage(`
`70`	`70`	`$"Could not load the collection \"{collectionName}\" as individual collection for {identifier}, set to None.",`
`71`	`71`	`"Load Failure",`
`72`	`72`	`NotificationType.Warning);`
`@@ -76,15 +76,15 @@ private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)`
`76`	`76`	`if (!Add(group, collection))`
`77`	`77`	`{`
`78`	`78`	`changes = true;`
`79`		`- Penumbra.ChatService.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",`
	`79`	`+ Penumbra.Chat.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",`
`80`	`80`	`"Load Failure",`
`81`	`81`	`NotificationType.Warning);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`catch (Exception e)`
`85`	`85`	`{`
`86`	`86`	`changes = true;`
`87`		`- Penumbra.ChatService.NotificationMessage($"Could not load an unknown individual collection, removed:\n{e}", "Load Failure",`
	`87`	`+ Penumbra.Chat.NotificationMessage($"Could not load an unknown individual collection, removed:\n{e}", "Load Failure",`
`88`	`88`	`NotificationType.Error);`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -124,7 +124,7 @@ static bool FindDataId(string name, IReadOnlyDictionary<uint, string> data, out`
`124`	`124`	`if (Add($"{_actorService.AwaitedService.Data.ToName(kind, dataId)} ({kind.ToName()})", group, collection))`
`125`	`125`	`Penumbra.Log.Information($"Migrated {name} ({kind.ToName()}) to NPC Identifiers [{ids}].");`
`126`	`126`	`else`
`127`		`- Penumbra.ChatService.NotificationMessage(`
	`127`	`+ Penumbra.Chat.NotificationMessage(`
`128`	`128`	`$"Could not migrate {name} ({collection.AnonymizedName}) which was assumed to be a {kind.ToName()} with IDs [{ids}], please look through your individual collections.",`
`129`	`129`	`"Migration Failure", NotificationType.Error);`
`130`	`130`	`}`
`@@ -140,13 +140,13 @@ static bool FindDataId(string name, IReadOnlyDictionary<uint, string> data, out`
`140`	`140`	`}, collection))`
`141`	`141`	`Penumbra.Log.Information($"Migrated {shortName} ({collection.AnonymizedName}) to Player Identifier.");`
`142`	`142`	`else`
`143`		`- Penumbra.ChatService.NotificationMessage(`
	`143`	`+ Penumbra.Chat.NotificationMessage(`
`144`	`144`	`$"Could not migrate {shortName} ({collection.AnonymizedName}), please look through your individual collections.",`
`145`	`145`	`"Migration Failure", NotificationType.Error);`
`146`	`146`	`}`
`147`	`147`	`else`
`148`	`148`	`{`
`149`		`- Penumbra.ChatService.NotificationMessage(`
	`149`	`+ Penumbra.Chat.NotificationMessage(`
`150`	`150`	`$"Could not migrate {name} ({collection.AnonymizedName}), which can not be a player name nor is it a known NPC name, please look through your individual collections.",`
`151`	`151`	`"Migration Failure", NotificationType.Error);`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,12 @@ private void ApplyInheritances()`
`146`	`146`	`continue;`
`147`	`147`
`148`	`148`	`changes = true;`
`149`		`- Penumbra.ChatService.NotificationMessage($"{collection.Name} can not inherit from {subCollection.Name}, removed.", "Warning",`
	`149`	`+ Penumbra.Chat.NotificationMessage($"{collection.Name} can not inherit from {subCollection.Name}, removed.", "Warning",`
`150`	`150`	`NotificationType.Warning);`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- Penumbra.ChatService.NotificationMessage(`
	`154`	`+ Penumbra.Chat.NotificationMessage(`
`155`	`155`	`$"Inherited collection {subCollectionName} for {collection.AnonymizedName} does not exist, it was removed.", "Warning",`
`156`	`156`	`NotificationType.Warning);`
`157`	`157`	`changes = true;`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void Merge()`
`84`	`84`	`catch (Exception ex)`
`85`	`85`	`{`
`86`	`86`	`Error = ex;`
`87`		`- Penumbra.ChatService.NotificationMessage(`
	`87`	`+ Penumbra.Chat.NotificationMessage(`
`88`	`88`	`$"Could not merge {MergeFromMod!.Name} into {MergeToMod!.Name}, cleaning up changes.:\n{ex}", "Failure",`
`89`	`89`	`NotificationType.Error);`
`90`	`90`	`FailureCleanup();`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private void NormalizeSync()`
`77`	`77`	`}`
`78`	`78`	`catch (Exception e)`
`79`	`79`	`{`
`80`		`- Penumbra.ChatService.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);`
	`80`	`+ Penumbra.Chat.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);`
`81`	`81`	`}`
`82`	`82`	`finally`
`83`	`83`	`{`
`@@ -90,15 +90,15 @@ private bool CheckDirectories()`
`90`	`90`	`{`
`91`	`91`	`if (Directory.Exists(_normalizationDirName))`
`92`	`92`	`{`
`93`		`- Penumbra.ChatService.NotificationMessage("Could not normalize mod:\n"`
	`93`	`+ Penumbra.Chat.NotificationMessage("Could not normalize mod:\n"`
`94`	`94`	`+ "The directory TmpNormalization may not already exist when normalizing a mod.", "Failure",`
`95`	`95`	`NotificationType.Error);`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (Directory.Exists(_oldDirName))`
`100`	`100`	`{`
`101`		`- Penumbra.ChatService.NotificationMessage("Could not normalize mod:\n"`
	`101`	`+ Penumbra.Chat.NotificationMessage("Could not normalize mod:\n"`
`102`	`102`	`+ "The directory TmpNormalizationOld may not already exist when normalizing a mod.", "Failure",`
`103`	`103`	`NotificationType.Error);`
`104`	`104`	`return false;`
`@@ -204,7 +204,7 @@ private bool CopyNewFiles()`
`204`	`204`	`}`
`205`	`205`	`catch (Exception e)`
`206`	`206`	`{`
`207`		`- Penumbra.ChatService.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);`
	`207`	`+ Penumbra.Chat.NotificationMessage($"Could not normalize mod:\n{e}", "Failure", NotificationType.Error);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`return false;`
`@@ -232,7 +232,7 @@ private bool MoveOldFiles()`
`232`	`232`	`}`
`233`	`233`	`catch (Exception e)`
`234`	`234`	`{`
`235`		`- Penumbra.ChatService.NotificationMessage($"Could not move old files out of the way while normalizing mod mod:\n{e}", "Failure",`
	`235`	`+ Penumbra.Chat.NotificationMessage($"Could not move old files out of the way while normalizing mod mod:\n{e}", "Failure",`
`236`	`236`	`NotificationType.Error);`
`237`	`237`	`}`
`238`	`238`
`@@ -256,7 +256,7 @@ private bool MoveNewFiles()`
`256`	`256`	`}`
`257`	`257`	`catch (Exception e)`
`258`	`258`	`{`
`259`		`- Penumbra.ChatService.NotificationMessage($"Could not move new files into the mod while normalizing mod mod:\n{e}", "Failure",`
	`259`	`+ Penumbra.Chat.NotificationMessage($"Could not move new files into the mod while normalizing mod mod:\n{e}", "Failure",`
`260`	`260`	`NotificationType.Error);`
`261`	`261`	`foreach (var dir in Mod.ModPath.EnumerateDirectories())`
`262`	`262`	`{`