Skip to content

Commit 14b5bd6

Browse files
committed
Minor warnings/lints
1 parent d10332f commit 14b5bd6

6 files changed

Lines changed: 17 additions & 6 deletions

File tree

Craftimizer/ImGuiUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ private sealed class SearchableComboData<T> where T : IEquatable<T>
356356

357357
public SearchableComboData(IEnumerable<T> items, T selectedItem, Func<T, string> getString)
358358
{
359-
this.items = items.ToImmutableArray();
359+
this.items = [.. items];
360360
filteredItems = [selectedItem];
361361
this.selectedItem = selectedItem;
362362
this.getString = getString;

Craftimizer/Windows/MacroClipboard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public sealed class MacroClipboard : Window, IDisposable
1919

2020
public MacroClipboard(IEnumerable<string> macros) : base("Macro Clipboard", WindowFlags)
2121
{
22-
Macros = new(macros);
22+
Macros = [.. macros];
2323

2424
IsOpen = true;
2525
AllowPinning = false;

Craftimizer/Windows/MacroEditor.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,19 @@ private readonly struct RecipeWrapper(Recipe recipe) : IEquatable<RecipeWrapper>
719719

720720
public bool Equals(RecipeWrapper other) =>
721721
Recipe.RowId == other.Recipe.RowId;
722+
723+
public override bool Equals(object? obj)
724+
{
725+
return obj is RecipeWrapper other && Equals(other);
726+
}
727+
728+
public override int GetHashCode()
729+
{
730+
return unchecked((int)Recipe.RowId);
731+
}
722732
}
723733

724-
private readonly List<RecipeWrapper> searchableRecipes = LuminaSheets.RecipeSheet.Where(r => r.RecipeLevelTable.RowId != 0 && r.ItemResult.RowId != 0).Select(r => new RecipeWrapper(r)).ToList();
734+
private readonly List<RecipeWrapper> searchableRecipes = [.. LuminaSheets.RecipeSheet.Where(r => r.RecipeLevelTable.RowId != 0 && r.ItemResult.RowId != 0).Select(r => new RecipeWrapper(r))];
725735

726736
private bool DrawRecipeParams()
727737
{

Craftimizer/Windows/MacroList.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ private void RefreshSearch()
343343
{
344344
if (string.IsNullOrWhiteSpace(searchText))
345345
{
346-
sortedMacros = new(Macros);
346+
sortedMacros = [.. Macros];
347347
isUnsorted = true;
348348
return;
349349
}

Craftimizer/Windows/RecipeNote.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ private void CalculateSavedMacro()
11911191
config = config.FilterSpecialistActions();
11921192
var mctsConfig = new MCTSConfig(config);
11931193
var simulator = new SimulatorNoRandom();
1194-
List<Macro> macros = new(Service.Configuration.Macros);
1194+
List<Macro> macros = [.. Service.Configuration.Macros];
11951195

11961196
token.ThrowIfCancellationRequested();
11971197

Craftimizer/Windows/Settings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ private static void DrawOption<T>(string label, string tooltip, T value, T min,
7777
{
7878
ImGui.SetNextItemWidth(OptionWidth);
7979
var text = value.ToString();
80+
ArgumentNullException.ThrowIfNull(text, nameof(value));
8081
if (ImGui.InputText(label, ref text, 8, ImGuiInputTextFlags.AutoSelectAll | ImGuiInputTextFlags.CharsDecimal))
8182
{
8283
if (T.TryParse(text, null, out var newValue))
@@ -791,7 +792,7 @@ private static void DrawActionPool(ref ActionType[] actionPool, float poolWidth,
791792
isDirty = false;
792793

793794
var recipeData = Service.Plugin.GetDefaultStats().Recipe;
794-
HashSet<ActionType> pool = new(actionPool);
795+
HashSet<ActionType> pool = [.. actionPool];
795796

796797
var imageSize = ImGui.GetFrameHeight() * 2;
797798
var spacing = ImGui.GetStyle().ItemSpacing.Y;

0 commit comments

Comments
 (0)