Minor code style changes

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 729f81b6a19b3dd340958c62367ee0a47f7ec233..2e7016cb5e70ebd3632d42e4ddf572ba78131e06 100644 (file)
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
-        <Version>4.16</Version>
+        <Version>4.17</Version>
     </PropertyGroup>
 </Project>

diff --git a/Questionable/.editorconfig b/Questionable/.editorconfig
index 140b119dd538107a6a520b9ec85e25eb76f801b5..1eba5c1bb38007785d7a1e9eb79a5944f7f6ef59 100644 (file)
--- a/Questionable/.editorconfig
+++ b/Questionable/.editorconfig
@@ -1015,3 +1015,7 @@ csharp_style_inlined_variable_declaration = true:suggestion
 csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+resharper_arrange_trailing_comma_in_multiline_lists_highlighting = none
+resharper_redundant_if_else_block_highlighting = none
+resharper_convert_to_primary_constructor_highlighting = hint

diff --git a/Questionable/Controller/GameUi/InteractionUiController.cs b/Questionable/Controller/GameUi/InteractionUiController.cs
index c5aa27c392c5e5cf14c6d55d904309e82b4e4e41..45333c2b754d9c6b8efa33f89abc75ee530ea8f4 100644 (file)
--- a/Questionable/Controller/GameUi/InteractionUiController.cs
+++ b/Questionable/Controller/GameUi/InteractionUiController.cs
@@ -7,7 +7,6 @@ using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Plugin.Services;
-using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Event;
 using FFXIVClientStructs.FFXIV.Client.Game.InstanceContent;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
@@ -22,11 +21,8 @@ using Questionable.Controller.Steps.Interactions;
 using Questionable.Data;
 using Questionable.Functions;
 using Questionable.Model;
-using Questionable.Model.Common;
 using Questionable.Model.Gathering;
 using Questionable.Model.Questing;
-using AethernetShortcut = Questionable.Controller.Steps.Shared.AethernetShortcut;
-using EAetheryteLocationExtensions = Questionable.Model.Common.EAetheryteLocationExtensions;
 using Quest = Questionable.Model.Quest;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
@@ -634,7 +630,7 @@ internal sealed class InteractionUiController : IDisposable
     }
 
     private unsafe bool HandleDefaultYesNo(AddonSelectYesno* addonSelectYesno, Quest quest,
-        IList<DialogueChoice> dialogueChoices, string actualPrompt)
+        List<DialogueChoice> dialogueChoices, string actualPrompt)
     {
         _logger.LogTrace("DefaultYesNo: Choice count: {Count}", dialogueChoices.Count);
         foreach (var dialogueChoice in dialogueChoices)

diff --git a/Questionable/Controller/Steps/TaskCreator.cs b/Questionable/Controller/Steps/TaskCreator.cs
index b96ed5bec85489d245ec31b97cb5fe91000388ad..915f7d57095448028bf3e6f85b4d55fdcc8f37cf 100644 (file)
--- a/Questionable/Controller/Steps/TaskCreator.cs
+++ b/Questionable/Controller/Steps/TaskCreator.cs
@@ -25,7 +25,7 @@ internal sealed class TaskCreator
         var newTasks = scope.ServiceProvider.GetRequiredService<IEnumerable<ITaskFactory>>()
             .SelectMany(x =>
             {
-                IList<ITask> tasks = x.CreateAllTasks(quest, sequence, step).ToList();
+                List<ITask> tasks = x.CreateAllTasks(quest, sequence, step).ToList();
 
                 if (tasks.Count > 0 && _logger.IsEnabled(LogLevel.Trace))
                 {

diff --git a/Questionable/Windows/OneTimeSetupWindow.cs b/Questionable/Windows/OneTimeSetupWindow.cs
index 3db85089d79fe2a46787053a7f5c8428c93167c9..128a2f1a4d5d42fadfeef2bbac1231fcba69b62c 100644 (file)
--- a/Questionable/Windows/OneTimeSetupWindow.cs
+++ b/Questionable/Windows/OneTimeSetupWindow.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
@@ -8,7 +9,6 @@ using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
 using Dalamud.Utility;
 using ImGuiNET;
-using LLib;
 using LLib.ImGui;
 using Microsoft.Extensions.Logging;
 using Questionable.External;
@@ -44,7 +44,7 @@ internal sealed class OneTimeSetupWindow : LWindow
             new Uri("https://github.com/NightmareXIV/MyDalamudPlugins/raw/main/pluginmaster.json")),
     ];
 
-    private static readonly IReadOnlyDictionary<Configuration.ECombatModule, PluginInfo> CombatPlugins = new Dictionary<Configuration.ECombatModule, PluginInfo>
+    private static readonly ReadOnlyDictionary<Configuration.ECombatModule, PluginInfo> CombatPlugins = new Dictionary<Configuration.ECombatModule, PluginInfo>
     {
         {
             Configuration.ECombatModule.BossMod,