Glamourer.Api

@@ -1 +1 @@
-Subproject commit 3bfd1db3a471f6e808c4d981485a08f58a4bf6cd
+Subproject commit 7e8505cd6f8dbc5bcf41b72e16785d62b4d218f3

Glamourer/Api/ApiHelpers.cs

@@ -1,13 +1,13 @@
 using Glamourer.Api.Enums;
 using Glamourer.Designs;
 using Glamourer.State;
+using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Interop;
-using Penumbra.GameData.Structs;
 using Penumbra.String;
 
 namespace Glamourer.Api;
@@ -15,24 +15,15 @@ namespace Glamourer.Api;
 public class ApiHelpers(ActorObjectManager objects, StateManager stateManager, ActorManager actors) : IApiService
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    internal IEnumerable<ActorState> FindExistingStates(string actorName, ushort worldId = ushort.MaxValue)
+    internal IEnumerable<ActorState> FindExistingStates(string actorName)
     {
         if (actorName.Length == 0 || !ByteString.FromString(actorName, out var byteString))
             yield break;
 
-        if (worldId == WorldId.AnyWorld.Id)
-        {
         foreach (var state in stateManager.Values.Where(state
                      => state.Identifier.Type is IdentifierType.Player && state.Identifier.PlayerName == byteString))
             yield return state;
     }
-        else
-        {
-            var identifier = actors.CreatePlayer(byteString, worldId);
-            if (stateManager.TryGetValue(identifier, out var state))
-                yield return state;
-        }
-    }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     internal GlamourerApiEc FindExistingState(int objectIndex, out ActorState? state)

Glamourer/Api/GlamourerApi.cs

@@ -6,7 +6,7 @@ namespace Glamourer.Api;
 public class GlamourerApi(DesignsApi designs, StateApi state, ItemsApi items) : IGlamourerApi, IApiService
 {
     public const int CurrentApiVersionMajor = 1;
-    public const int CurrentApiVersionMinor = 7;
+    public const int CurrentApiVersionMinor = 6;
 
     public (int Major, int Minor) ApiVersion
         => (CurrentApiVersionMajor, CurrentApiVersionMinor);

Glamourer/Api/IpcProviders.cs

@@ -54,7 +54,6 @@ public sealed class IpcProviders : IDisposable, IApiService
             IpcSubscribers.RevertStateName.Provider(pi, api.State),
             IpcSubscribers.UnlockState.Provider(pi, api.State),
             IpcSubscribers.UnlockStateName.Provider(pi, api.State),
-            IpcSubscribers.DeletePlayerState.Provider(pi, api.State),
             IpcSubscribers.UnlockAll.Provider(pi, api.State),
             IpcSubscribers.RevertToAutomation.Provider(pi, api.State),
             IpcSubscribers.RevertToAutomationName.Provider(pi, api.State),

Glamourer/Api/StateApi.cs

@@ -8,7 +8,6 @@ using Glamourer.State;
 using Newtonsoft.Json.Linq;
 using OtterGui.Services;
 using Penumbra.GameData.Interop;
-using Penumbra.GameData.Structs;
 using StateChanged = Glamourer.Events.StateChanged;
 
 namespace Glamourer.Api;
@@ -18,6 +17,7 @@ public sealed class StateApi : IGlamourerApiState, IApiService, IDisposable
     private readonly ApiHelpers         _helpers;
     private readonly StateManager       _stateManager;
     private readonly DesignConverter    _converter;
+    private readonly Configuration      _config;
     private readonly AutoDesignApplier  _autoDesigns;
     private readonly ActorObjectManager _objects;
     private readonly StateChanged       _stateChanged;
@@ -27,6 +27,7 @@ public sealed class StateApi : IGlamourerApiState, IApiService, IDisposable
     public StateApi(ApiHelpers helpers,
         StateManager stateManager,
         DesignConverter converter,
+        Configuration config,
         AutoDesignApplier autoDesigns,
         ActorObjectManager objects,
         StateChanged stateChanged,
@@ -36,6 +37,7 @@ public sealed class StateApi : IGlamourerApiState, IApiService, IDisposable
         _helpers        = helpers;
         _stateManager   = stateManager;
         _converter      = converter;
+        _config         = config;
         _autoDesigns    = autoDesigns;
         _objects        = objects;
         _stateChanged   = stateChanged;
@@ -200,27 +202,6 @@ public sealed class StateApi : IGlamourerApiState, IApiService, IDisposable
         return ApiHelpers.Return(GlamourerApiEc.Success, args);
     }
 
-    public GlamourerApiEc DeletePlayerState(string playerName, ushort worldId, uint key)
-    {
-        var args   = ApiHelpers.Args("Name", playerName, "World", worldId, "Key", key);
-        var states = _helpers.FindExistingStates(playerName).ToList();
-        if (states.Count is 0)
-            return ApiHelpers.Return(GlamourerApiEc.NothingDone, args);
-
-        var anyLocked = false;
-        foreach (var state in states)
-        {
-            if (state.CanUnlock(key))
-                _stateManager.DeleteState(state.Identifier);
-            else
-                anyLocked = true;
-        }
-
-        return ApiHelpers.Return(anyLocked
-            ? GlamourerApiEc.InvalidKey
-            : GlamourerApiEc.Success, args);
-    }
-
     public int UnlockAll(uint key)
         => _stateManager.Values.Count(state => state.Unlock(key));
 

Glamourer/Designs/Design.cs

@@ -100,7 +100,7 @@ public sealed class Design : DesignBase, ISavable, IDesignStandIn
 
     public new JObject JsonSerialize()
     {
-        var ret = new JObject
+        var ret = new JObject()
         {
             ["FileVersion"]            = FileVersion,
             ["Identifier"]             = Identifier,
@@ -131,17 +131,12 @@ public sealed class Design : DesignBase, ISavable, IDesignStandIn
         var ret = new JArray();
         foreach (var (mod, settings) in AssociatedMods)
         {
-            var obj = new JObject
+            var obj = new JObject()
             {
                 ["Name"]      = mod.Name,
                 ["Directory"] = mod.DirectoryName,
+                ["Enabled"]   = settings.Enabled,
             };
-            if (settings.Remove)
-                obj["Remove"] = true;
-            else if (settings.ForceInherit)
-                obj["Inherit"] = true;
-            else
-                obj["Enabled"] = settings.Enabled;
             if (settings.Enabled)
             {
                 obj["Priority"] = settings.Priority;

Glamourer/Designs/DesignManager.cs

@@ -557,7 +557,7 @@ public sealed class DesignManager : DesignEditor
         try
         {
             File.Move(SaveService.FileNames.MigrationDesignFile,
-                Path.ChangeExtension(SaveService.FileNames.MigrationDesignFile, ".json.bak"), true);
+                Path.ChangeExtension(SaveService.FileNames.MigrationDesignFile, ".json.bak"));
             Glamourer.Log.Information($"Moved migrated design file {SaveService.FileNames.MigrationDesignFile} to backup file.");
         }
         catch (Exception ex)

Glamourer/Glamourer.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Dalamud.NET.Sdk/14.0.0">
+<Project Sdk="Dalamud.NET.Sdk/13.1.0">
   <PropertyGroup>
     <RootNamespace>Glamourer</RootNamespace>
     <AssemblyName>Glamourer</AssemblyName>

Glamourer/Gui/PenumbraChangedItemTooltip.cs

@@ -22,12 +22,11 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
     private readonly CustomizeService   _customize;
     private readonly GPoseService       _gpose;
 
-    private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2 + BonusExtensions.AllFlags.Count];
+    private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2];
 
-    public IEnumerable<KeyValuePair<object, EquipItem>> LastItems
+    public IEnumerable<KeyValuePair<EquipSlot, EquipItem>> LastItems
-        => EquipSlotExtensions.EqdpSlots.Cast<object>().Append(EquipSlot.MainHand).Append(EquipSlot.OffHand)
+        => EquipSlotExtensions.EqdpSlots.Append(EquipSlot.MainHand).Append(EquipSlot.OffHand).Zip(_lastItems)
-            .Concat(BonusExtensions.AllFlags.Cast<object>()).Zip(_lastItems)
+            .Select(p => new KeyValuePair<EquipSlot, EquipItem>(p.First, p.Second));
-            .Select(p => new KeyValuePair<object, EquipItem>(p.First, p.Second));
 
     public ChangedItemType LastType    { get; private set; } = ChangedItemType.None;
     public uint            LastId      { get; private set; }
@@ -73,21 +72,6 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
         if (!Player())
             return;
 
-        var bonusSlot = item.Type.ToBonus();
-        if (bonusSlot is not BonusItemFlag.Unknown)
-        {
-            // + 2 due to weapons.
-            var glasses = _lastItems[bonusSlot.ToSlot() + 2];
-            using (_ = !openTooltip ? null : ImRaii.Tooltip())
-            {
-                ImGui.TextUnformatted($"{prefix}Right-Click to apply to current actor.");
-                if (glasses.Valid)
-                    ImGui.TextUnformatted($"{prefix}Control + Right-Click to re-apply {glasses.Name} to current actor.");
-            }
-
-            return;
-        }
-
         var slot = item.Type.ToSlot();
         var last = _lastItems[slot.ToIndex()];
         switch (slot)
@@ -125,27 +109,6 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
 
     public void ApplyItem(ActorState state, EquipItem item)
     {
-        var bonusSlot = item.Type.ToBonus();
-        if (bonusSlot is not BonusItemFlag.Unknown)
-        {
-            // + 2 due to weapons.
-            var glasses = _lastItems[bonusSlot.ToSlot() + 2];
-            if (ImGui.GetIO().KeyCtrl && glasses.Valid)
-            {
-                Glamourer.Log.Debug($"Re-Applying {glasses.Name} to {bonusSlot.ToName()}.");
-                SetLastItem(bonusSlot, default, state);
-                _stateManager.ChangeBonusItem(state, bonusSlot, glasses, ApplySettings.Manual);
-            }
-            else
-            {
-                Glamourer.Log.Debug($"Applying {item.Name} to {bonusSlot.ToName()}.");
-                SetLastItem(bonusSlot, item, state);
-                _stateManager.ChangeBonusItem(state, bonusSlot, item, ApplySettings.Manual);
-            }
-
-            return;
-        }
-
         var slot = item.Type.ToSlot();
         var last = _lastItems[slot.ToIndex()];
         switch (slot)
@@ -302,22 +265,7 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
         {
             var oldItem = state.ModelData.Item(slot);
             if (oldItem.Id != item.Id)
-                last = oldItem;
+                _lastItems[slot.ToIndex()] = oldItem;
-        }
-    }
-
-    private void SetLastItem(BonusItemFlag slot, EquipItem item, ActorState state)
-    {
-        ref var last = ref _lastItems[slot.ToSlot() + 2];
-        if (!item.Valid)
-        {
-            last = default;
-        }
-        else
-        {
-            var oldItem = state.ModelData.BonusItem(slot);
-            if (oldItem.Id != item.Id)
-                last = oldItem;
         }
     }
 

Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs

@@ -89,13 +89,7 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
         ImGui.Separator();
         foreach (var (slot, item) in _penumbraTooltip.LastItems)
         {
-            switch (slot)
+            ImGuiUtil.DrawTableColumn($"{slot.ToName()} Revert-Item");
-            {
-                case EquipSlot e:     ImGuiUtil.DrawTableColumn($"{e.ToName()} Revert-Item"); break;
-                case BonusItemFlag f: ImGuiUtil.DrawTableColumn($"{f.ToName()} Revert-Item"); break;
-                default:              ImGuiUtil.DrawTableColumn("Unk Revert-Item"); break;
-            }
-
             ImGuiUtil.DrawTableColumn(item.Valid ? item.Name : "None");
             ImGui.TableNextColumn();
         }

Glamourer/State/StateApplier.cs

@@ -385,7 +385,7 @@ public class StateApplier(
         var actors = ChangeMetaState(state, MetaIndex.Wetness, true);
         if (redraw)
         {
-            if (withLock && actors.Valid)
+            if (withLock)
                 state.TempLock();
             ForceRedraw(actors);
         }

Glamourer/packages.lock.json

@@ -1,18 +1,18 @@
 {
   "version": 1,
   "dependencies": {
-    "net10.0-windows7.0": {
+    "net9.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[14.0.0, )",
+        "requested": "[13.1.0, )",
-        "resolved": "14.0.0",
+        "resolved": "13.1.0",
-        "contentHash": "9c1q/eAeAs82mkQWBOaCvbt3GIQxAIadz5b/7pCXDIy9nHPtnRc+tDXEvKR+M36Wvi7n+qBTevRupkLUQp6DFA=="
+        "contentHash": "XdoNhJGyFby5M/sdcRhnc5xTop9PHy+H50PTWpzLhJugjB19EDBiHD/AsiDF66RETM+0qKUdJBZrNuebn7qswQ=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
-        "requested": "[1.2.39, )",
+        "requested": "[1.2.25, )",
-        "resolved": "1.2.39",
+        "resolved": "1.2.25",
-        "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
+        "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
       },
       "Vortice.Direct3D11": {
         "type": "Direct",
@@ -32,7 +32,10 @@
       "FlatSharp.Runtime": {
         "type": "Transitive",
         "resolved": "7.9.0",
-        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw=="
+        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw==",
+        "dependencies": {
+          "System.Memory": "4.5.5"
+        }
       },
       "JetBrains.Annotations": {
         "type": "Transitive",
@@ -65,6 +68,11 @@
           "SharpGen.Runtime": "2.1.2-beta"
         }
       },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+      },
       "Vortice.DirectX": {
         "type": "Transitive",
         "resolved": "3.4.2-beta",
@@ -108,7 +116,7 @@
           "FlatSharp.Compiler": "[7.9.0, )",
           "FlatSharp.Runtime": "[7.9.0, )",
           "OtterGui": "[1.0.0, )",
-          "Penumbra.Api": "[5.13.0, )",
+          "Penumbra.Api": "[5.10.0, )",
           "Penumbra.String": "[1.0.6, )"
         }
       },

OtterGui

@@ -1 +1 @@
-Subproject commit 6f3236453b1edfaa25c8edcc8b39a9d9b2fc18ac
+Subproject commit f354444776591ae423e2d8374aae346308d81424

Penumbra.Api

@@ -1 +1 @@
-Subproject commit e4934ccca0379f22dadf989ab2d34f30b3c5c7ea
+Subproject commit 648b6fc2ce600a95ab2b2ced27e1639af2b04502

Penumbra.GameData

@@ -1 +1 @@
-Subproject commit 2ff50e68f7c951f0f8b25957a400a2e32ed9d6dc
+Subproject commit 3baace73c828271dcb71a8156e3e7b91e1dd12ae

Penumbra.String

@@ -1 +1 @@
-Subproject commit 0315144ab5614c11911e2a4dddf436fb18c5d7e3
+Subproject commit c8611a0c546b6b2ec29214ab319fc2c38fe74793

repo.json

@@ -17,8 +17,8 @@
       "Character"
     ],
     "InternalName": "Glamourer",
-    "AssemblyVersion": "1.5.1.5",
+    "AssemblyVersion": "1.5.1.2",
-    "TestingAssemblyVersion": "1.5.1.5",
+    "TestingAssemblyVersion": "1.5.1.2",
     "RepoUrl": "https://github.com/Ottermandias/Glamourer",
     "ApplicableVersion": "any",
     "DalamudApiLevel": 13,
@@ -27,9 +27,9 @@
     "IsTestingExclusive": "False",
     "DownloadCount": 1,
     "LastUpdate": 1618608322,
-    "DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.5/Glamourer.zip",
+    "DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
-    "DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.5/Glamourer.zip",
+    "DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
-    "DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.5/Glamourer.zip",
+    "DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
     "IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
   }
 ]