Some glamourer related changes.

Author: Ottermandias

Penumbra.GameData/Data/StainData.cs

@@ -34,7 +34,9 @@ protected override void DisposeInternal()
     }
 
     public IEnumerator<KeyValuePair<StainId, Stain>> GetEnumerator()
-        => Data.Select(kvp => new KeyValuePair<StainId, Stain>(new StainId(kvp.Key), new Stain())).GetEnumerator();
+        => Data.Select(kvp
+                => new KeyValuePair<StainId, Stain>(new StainId(kvp.Key), new Stain(kvp.Value.Name, kvp.Value.Dye, kvp.Key, kvp.Value.Gloss)))
+            .GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator()
         => GetEnumerator();

Penumbra.GameData/Enums/FullEquipType.cs

@@ -365,17 +365,28 @@ public static FullEquipType ToEquipType(this WeaponCategory category, bool mainh
     public static FullEquipType Offhand(this FullEquipType type)
         => type switch
         {
-            FullEquipType.Fists   => FullEquipType.FistsOff,
-            FullEquipType.Sword   => FullEquipType.Shield,
-            FullEquipType.Wand    => FullEquipType.Shield,
-            FullEquipType.Daggers => FullEquipType.DaggersOff,
-            FullEquipType.Gun     => FullEquipType.GunOff,
-            FullEquipType.Orrery  => FullEquipType.OrreryOff,
-            FullEquipType.Rapier  => FullEquipType.RapierOff,
-            FullEquipType.Glaives => FullEquipType.GlaivesOff,
-            FullEquipType.Bow     => FullEquipType.BowOff,
-            FullEquipType.Katana  => FullEquipType.KatanaOff,
-            _                     => FullEquipType.Unknown,
+            FullEquipType.Fists           => FullEquipType.FistsOff,
+            FullEquipType.Sword           => FullEquipType.Shield,
+            FullEquipType.Wand            => FullEquipType.Shield,
+            FullEquipType.Daggers         => FullEquipType.DaggersOff,
+            FullEquipType.Gun             => FullEquipType.GunOff,
+            FullEquipType.Orrery          => FullEquipType.OrreryOff,
+            FullEquipType.Rapier          => FullEquipType.RapierOff,
+            FullEquipType.Glaives         => FullEquipType.GlaivesOff,
+            FullEquipType.Bow             => FullEquipType.BowOff,
+            FullEquipType.Katana          => FullEquipType.KatanaOff,
+            FullEquipType.Saw             => FullEquipType.ClawHammer,
+            FullEquipType.CrossPeinHammer => FullEquipType.File,
+            FullEquipType.RaisingHammer   => FullEquipType.Pliers,
+            FullEquipType.LapidaryHammer  => FullEquipType.GrindingWheel,
+            FullEquipType.Knife           => FullEquipType.Awl,
+            FullEquipType.Needle          => FullEquipType.SpinningWheel,
+            FullEquipType.Alembic         => FullEquipType.Mortar,
+            FullEquipType.Frypan          => FullEquipType.CulinaryKnife,
+            FullEquipType.Pickaxe         => FullEquipType.Sledgehammer,
+            FullEquipType.Hatchet         => FullEquipType.GardenScythe,
+            FullEquipType.FishingRod      => FullEquipType.Gig,
+            _                             => FullEquipType.Unknown,
         };
 
     internal static string OffhandTypeSuffix(this FullEquipType type)

Penumbra.GameData/Structs/CustomizeData.cs

@@ -65,7 +65,7 @@ public override int GetHashCode()
         }
     }
 
-    public string WriteBase64()
+    public readonly string WriteBase64()
     {
         fixed( byte* ptr = Data )
         {

Penumbra/Configuration.cs

@@ -110,14 +110,13 @@ public class Configuration : IPluginConfiguration, ISavable
     /// Load the current configuration.
     /// Includes adding new colors and migrating from old versions.
     /// </summary>
-    public Configuration(CharacterUtility utility, FilenameService fileNames, ConfigMigrationService migrator, SaveService saveService)
+    public Configuration(CharacterUtility utility, ConfigMigrationService migrator, SaveService saveService)
     {
         _saveService = saveService;
-        Load(utility, fileNames, migrator);
-        UI.Classes.Colors.SetColors(this);
+        Load(utility, migrator);
     }
 
-    public void Load(CharacterUtility utility, FilenameService fileNames, ConfigMigrationService migrator)
+    public void Load(CharacterUtility utility, ConfigMigrationService migrator)
     {
         static void HandleDeserializationError(object? sender, ErrorEventArgs errorArgs)
         {
@@ -126,10 +125,10 @@ static void HandleDeserializationError(object? sender, ErrorEventArgs errorArgs)
             errorArgs.ErrorContext.Handled = true;
         }
 
-        if (File.Exists(fileNames.ConfigFile))
+        if (File.Exists(_saveService.FileNames.ConfigFile))
             try
             {
-                var text = File.ReadAllText(fileNames.ConfigFile);
+                var text = File.ReadAllText(_saveService.FileNames.ConfigFile);
                 JsonConvert.PopulateObject(text, this, new JsonSerializerSettings
                 {
                     Error = HandleDeserializationError,

Penumbra/Services/ConfigMigrationService.cs

@@ -12,7 +12,6 @@
 using Penumbra.Mods.Editor;
 using Penumbra.Mods.Manager;
 using Penumbra.UI.Classes;
-using Penumbra.Util;
 
 namespace Penumbra.Services;
 
@@ -48,6 +47,8 @@ private static void AddColors(Configuration config, bool forceSave)
 
         if (save || forceSave)
             config.Save();
+
+        Colors.SetColors(config);
     }
 
     public void Migrate(CharacterUtility utility, Configuration config)