Refactor

sailro · Apr 28, 2024 · f19e356 · f19e356
1 parent 1a5018f
commit f19e356
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 34 deletions.
diff --git a/ConsoleCommands/BaseListCommand.cs b/ConsoleCommands/BaseListCommand.cs
@@ -1,19 +1,19 @@
-using EFT.InventoryLogic;
-using EFT.Trainer.Extensions;
-using EFT.Trainer.Features;
-using JsonType;
+using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Comfort.Common;
 using EFT.Interactive;
+using EFT.InventoryLogic;
+using EFT.Trainer.Extensions;
+using EFT.Trainer.Features;
+using JsonType;
 
 #nullable enable
 
 namespace EFT.Trainer.ConsoleCommands;
 
-internal abstract class BaseListCommand : LootItemsRelatedCommand
+internal abstract class BaseListCommand : ConsoleCommandWithArgument
 {
 	public override string Pattern => OptionalArgumentPattern;
 	protected virtual ELootRarity? Rarity => null;

diff --git a/ConsoleCommands/BaseTemplateCommand.cs b/ConsoleCommands/BaseTemplateCommand.cs
@@ -1,8 +1,8 @@
 using System;
-using EFT.InventoryLogic;
 using System.Collections.Generic;
 using System.Linq;
 using Comfort.Common;
+using EFT.InventoryLogic;
 
 #nullable enable
 

diff --git a/ConsoleCommands/BaseTrackCommand.cs b/ConsoleCommands/BaseTrackCommand.cs
@@ -1,14 +1,13 @@
-using EFT.Trainer.Configuration;
-using EFT.Trainer.Extensions;
+using System.Text.RegularExpressions;
+using EFT.Trainer.Configuration;
 using JsonType;
-using System.Text.RegularExpressions;
 using UnityEngine;
 
 #nullable enable
 
 namespace EFT.Trainer.ConsoleCommands;
 
-internal abstract class BaseTrackCommand : LootItemsRelatedCommand
+internal abstract class BaseTrackCommand : ConsoleCommandWithArgument
 {
 	private static string ColorNames => string.Join("|", ColorConverter.ColorNames());
 	public override string Pattern => $"(?<{ValueGroup}>.+?)(?<{ExtraGroup}> ({ColorNames}|\\[[\\.,\\d ]*\\]{{1}}))?";

diff --git a/ConsoleCommands/BaseTrackListCommand.cs b/ConsoleCommands/BaseTrackListCommand.cs
@@ -6,7 +6,7 @@
 
 namespace EFT.Trainer.ConsoleCommands;
 
-internal abstract class BaseTrackListCommand : LootItemsRelatedCommand
+internal abstract class BaseTrackListCommand : ConsoleCommandWithArgument
 {
 	public override string Pattern => RequiredArgumentPattern;
 

diff --git a/ConsoleCommands/ConsoleCommand.cs b/ConsoleCommands/ConsoleCommand.cs
@@ -1,11 +1,15 @@
-using EFT.UI;
+using System;
+using EFT.UI;
 
 #nullable enable
 
 namespace EFT.Trainer.ConsoleCommands;
 
 internal abstract class ConsoleCommand
 {
+	private readonly Lazy<Features.LootItems> _lootItems = new(() => Features.FeatureFactory.GetFeature<Features.LootItems>()!);
+	protected Features.LootItems LootItemsFeature => _lootItems.Value;
+
 	public abstract string Name { get; }
 
 	internal void AddConsoleLog(string log)

diff --git a/ConsoleCommands/List.cs b/ConsoleCommands/List.cs
@@ -1,5 +1,4 @@
 using JetBrains.Annotations;
-using JsonType;
 
 #nullable enable
 

diff --git a/ConsoleCommands/LootItemsRelatedCommand.cs b/ConsoleCommands/LootItemsRelatedCommand.cs
diff --git a/ConsoleCommands/TrackList.cs b/ConsoleCommands/TrackList.cs
@@ -1,5 +1,4 @@
-using System;
-using EFT.Trainer.Extensions;
+using EFT.Trainer.Extensions;
 using JetBrains.Annotations;
 
 #nullable enable
@@ -11,11 +10,6 @@ internal class TrackList : ConsoleCommandWithoutArgument
 {
 	public override string Name => "tracklist";
 
-	// Unfortunately we cannot use BaseTrackCommand or LootItemsRelatedCommand here
-	private readonly Lazy<Features.LootItems> _lootItems = new(() => Features.FeatureFactory.GetFeature<Features.LootItems>()!);
-	private Features.LootItems LootItems => _lootItems.Value;
-
-
 	public override void Execute()
 	{
 		ShowTrackList(this, LootItems);

diff --git a/NLog.EFT.Trainer.csproj b/NLog.EFT.Trainer.csproj
@@ -130,7 +130,6 @@
     <Compile Include="ConsoleCommands\ListRare.cs" />
     <Compile Include="ConsoleCommands\ListSuperRare.cs" />
     <Compile Include="ConsoleCommands\LoadTrackList.cs" />
-    <Compile Include="ConsoleCommands\LootItemsRelatedCommand.cs" />
     <Compile Include="ConsoleCommands\SaveTrackList.cs" />
     <Compile Include="ConsoleCommands\Spawn.cs" />
     <Compile Include="ConsoleCommands\Status.cs" />