Clean some things up

- Remove unnecessary PathMap from csproj - Clean up duplicate import in SetupNag - Fix deprecations in CollectionStrategy
KazWolfe · Feb 19, 2024 · f33552c · f33552c
1 parent 9527fe2
commit f33552c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/FFXIVPlugin/ActionExecutor/Strategies/CollectionStrategy.cs b/FFXIVPlugin/ActionExecutor/Strategies/CollectionStrategy.cs
@@ -11,7 +11,7 @@
 
 namespace XIVDeck.FFXIVPlugin.ActionExecutor.Strategies; 
 
-[ActionStrategy(HotbarSlotType.Collection)]
+[ActionStrategy(HotbarSlotType.McGuffin)]
 public class CollectionStrategy : IActionStrategy {
     private static readonly ExcelSheet<McGuffin> Sheet = Injections.DataManager.Excel.GetSheet<McGuffin>()!;
 
@@ -23,7 +23,7 @@ private static ExecutableAction GetExecutableAction(McGuffin mcguffin) {
             ActionName = uiData.Name.ToString(), 
             IconId = (int) uiData.Icon,
             Category = null,
-            HotbarSlotType = HotbarSlotType.Collection,
+            HotbarSlotType = HotbarSlotType.McGuffin,
             SortOrder = uiData.Order
         };
     }
@@ -52,7 +52,7 @@ public void Execute(uint actionId, ActionPayload? _) {
         }
 
         Injections.Framework.RunOnFrameworkThread(delegate {
-            HotbarManager.ExecuteHotbarAction(HotbarSlotType.Collection, actionId);
+            HotbarManager.ExecuteHotbarAction(HotbarSlotType.McGuffin, actionId);
         });
     }
 

diff --git a/FFXIVPlugin/UI/Windows/Nags/SetupNag.cs b/FFXIVPlugin/UI/Windows/Nags/SetupNag.cs
@@ -1,10 +1,8 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Utility;
 using ImGuiNET;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
-using XIVDeck.FFXIVPlugin.Resources.Localization;
 using XIVDeck.FFXIVPlugin.Utils;
 
 namespace XIVDeck.FFXIVPlugin.UI.Windows.Nags; 

diff --git a/FFXIVPlugin/XIVDeck.FFXIVPlugin.csproj b/FFXIVPlugin/XIVDeck.FFXIVPlugin.csproj
@@ -12,7 +12,6 @@
         <Copyright>(c) 2023, KazWolfe. Licensed under AGPL-3.0.</Copyright>
         <IsPackable>false</IsPackable>
         <NeutralLanguage>en</NeutralLanguage>
-        <Nullable>enable</Nullable>
         <PackageLicenseExpression>AGPL-3.0</PackageLicenseExpression>
     </PropertyGroup>
 
@@ -36,11 +35,7 @@
     </PropertyGroup>
     <PropertyGroup Label="Feature">
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-
-    <!-- Anonymize and shorten build paths for release -->
-    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-        <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=S:\</PathMap>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup>