Support for EFT 0.16.1.35392 and SPT-AKI 3.11.1 (#674)

* Initial port

* Fix project

* Update plugin as well

* Restore spawnbot feature

* Refactor

* Style

* Whitelist this plugin for spt-aki beta releases

* Use EftBulletClass now

* Apply latest be-testing fixes

* Bump packages

* Introduce defines

* Code gardening

* Remove watermark

* Refactor getting static fields, given sp-tarkov/modules#29

* Use SpawnBotByTypeForce

* Use collection expressions

* Fix NoMalfunctions

* Remove Reflection wrappers

* Rename SPT-AKI into SPT

* Update version

* More renames

Author: sailro

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,8 +6,8 @@ labels: ''
 assignees: ''
 ---
 
-**Please do not submit bugs for unsupported EFT or unstable SPT-AKI versions**
-Double check the [main page](https://github.com/sailro/EscapeFromTarkov-Trainer) for the latest EFT and SPT-AKI versions we support. 
+**Please do not submit bugs for unsupported EFT or unstable SPT versions**
+Double check the [main page](https://github.com/sailro/EscapeFromTarkov-Trainer) for the latest EFT and SPT versions we support. 
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/RELEASE_TEMPLATE/content.md

@@ -19,21 +19,21 @@ This is an universal installer for the trainer. In most cases you just need to r
 - Still not working? It will then try to disable faulting features.
 - No need for SDKs, third party dependencies or Visual Studio, the Installer is self-contained. 
 - Before EscapeFromTarkov `0.13.0.21531`, it should work for `live` (do not do that, you'll be detected & banned!).
-- Given EscapeFromTarkov `0.13.0.21531`  or later prevent this trainer to be loaded using NLog configuration. It is now mandatory to use `SPT-AKI/BepInEx` for recent versions.
-- **Important**: if you are using `SPT-AKI`, please make sure you have run the game at least once before installing the trainer. `SPT-AKI` is patching binaries during the first run, and we need to compile against those patched binaries. If you install this trainer on stock binaries, the game will freeze at the startup screen.
+- Given EscapeFromTarkov `0.13.0.21531`  or later prevent this trainer to be loaded using NLog configuration. It is now mandatory to use `SPT/BepInEx` for recent versions.
+- **Important**: if you are using `SPT`, please make sure you have run the game at least once before installing the trainer. `SPT` is patching binaries during the first run, and we need to compile against those patched binaries. If you install this trainer on stock binaries, the game will freeze at the startup screen.
 
 ![image](https://user-images.githubusercontent.com/638167/146071436-401b4f80-f4bb-4dfb-8cdc-23ef5bfc79c3.png)
 
 ## 3- It will copy all needed files for you.
 - The freshly-compiled trainer bits will be copied to `EscapeFromTarkov_Data\Managed\NLog.EFT.Trainer.dll`.
 - The outline shader will be copied to `EscapeFromTarkov_Data\outline`
 - `EscapeFromTarkov_Data\Managed\NLog.dll.nlog` will be created or patched, depending on the content. (This is for legacy EscapeFromTarkov versions, before `0.13.0.21531`).
-- It will compile a SPT-AKI/BepInEx plugin named `aki-efttrainer.dll` in `BepInEx\plugins` 
+- It will compile a SPT/BepInEx plugin named `spt-efttrainer.dll` in `BepInEx\plugins` 
 
 ![image](https://user-images.githubusercontent.com/638167/211163262-e49bca08-642c-4512-b92f-c2c1de4bead1.png)
 
 ## Troubleshooting:
-- The game is stuck after installing the trainer : if you are using `SPT-AKI`, please make sure you have run the game at least once before installing the trainer. `SPT-AKI` is patching binaries during the first run, and we need to compile against those patched binaries. If you install this trainer on stock binaries, the game will freeze at the startup screen.
+- The game is stuck after installing the trainer : if you are using `SPT`, please make sure you have run the game at least once before installing the trainer. `SPT` is patching binaries during the first run, and we need to compile against those patched binaries. If you install this trainer on stock binaries, the game will freeze at the startup screen.
 - The trainer is not loaded : are you sure you are running the proper EFT instance? you can double check with the file `%LOCALAPPDATA%Low\Battlestate Games\EscapeFromTarkov\Player.log`, search for an installation path (often along with `Fallback handler could not load library` errors). Perhaps you forgot to update your shortcuts to `server.exe`/`launcher.exe` files.
 - The installer is unable to compile the trainer for an old EFT version : sorry I do not plan to support old versions, please upgrade.
 - The installer is unable to compile the trainer for a new EFT version : please file an [issue](https://github.com/sailro/EscapeFromTarkov-Trainer/issues/new/choose).

BepInExPlugin/AkiEftTrainerPlugin.cs

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{00C66BBD-ED7F-4E01-B7E4-0388F76FD31C}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AssemblyName>aki-efttrainer</AssemblyName>
+    <AssemblyName>spt-efttrainer</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <LangVersion>latest</LangVersion>
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -37,9 +37,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <!-- Framework -->
     <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
+    <Reference Include="System.Core" />
+    <Reference Include="netstandard">
+      <HintPath>$(EFTManagedPath)\netstandard.dll</HintPath>
+    </Reference>
     <!-- Unity -->
     <Reference Include="UnityEngine">
       <HintPath>$(EFTManagedPath)\UnityEngine.dll</HintPath>
@@ -53,7 +56,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AkiEftTrainerPlugin.cs" />
+    <Compile Include="SptEftTrainerPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

BepInExPlugin/BepInExPlugin.csproj

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using BepInEx;
+using EFT.Trainer;
+using JetBrains.Annotations;
+
+[BepInPlugin(PluginId, "SPT.EftTrainer", "1.0.0")]
+[UsedImplicitly]
+public class SptEftTrainerPlugin : BaseUnityPlugin
+{
+	private const string PluginId = "com.SPT.efttrainer";
+	public static bool Loaded = false;
+
+	[UsedImplicitly]
+	public void Awake()
+	{
+		if (Loaded)
+			return;
+
+		Loader.Load();
+		Loaded = true;
+
+		HandleSptBetaReleases();
+	}
+
+	[UsedImplicitly]
+	public void OnGUI()
+	{
+		if (_commitHash == null)
+			return;
+
+		var hash = _commitHash.GetValue(null) as string;
+		if (hash == string.Empty)
+		{
+			// Stop monitoring
+			_commitHash = null;
+			return;
+		}
+
+		// Suppress this dumb watermark
+		_commitHash.SetValue(null, string.Empty);
+	}
+
+	private static FieldInfo _commitHash;
+	private static void HandleSptBetaReleases()
+	{
+		// Whitelist this plugin for spt beta releases
+		var menuNotificationManager = Type.GetType("SPT.Custom.Utils.MenuNotificationManager, spt-custom", throwOnError: false);
+		if (menuNotificationManager == null)
+			return;
+
+		var hashField = GetStaticField(menuNotificationManager, "whitelistedPlugins");
+		if (hashField == null)
+			return;
+
+		var hashset = hashField.GetValue(null) as HashSet<string>;
+		hashset?.Add(PluginId);
+
+		_commitHash = GetStaticField(menuNotificationManager, "commitHash");
+	}
+
+	private static FieldInfo GetStaticField(Type type, string name)
+	{
+		return type.GetField(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static)
+			   ?? type.GetField(char.ToUpper(name[0]) + name.Substring(1), BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+	}
+}

BepInExPlugin/SptEftTrainerPlugin.cs

@@ -64,10 +64,9 @@ public override bool CanConvert(Type objectType)
 	public static string[] ColorNames()
 	{
 		var colorType = typeof(Color);
-		return colorType
+		return [.. colorType
 			.GetProperties(BindingFlags.Static | BindingFlags.Public)
 			.Where(p => p.PropertyType == colorType)
-			.Select(p => p.Name)
-			.ToArray();
+			.Select(p => p.Name)];
 	}
 }

Configuration/ColorConverter.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-#nullable enable
+#nullable enable
 
 namespace EFT.Trainer.ConsoleCommands;
 

ConsoleCommands/BaseTemplateCommand.cs

@@ -65,10 +65,10 @@ internal static void SpawnTemplate(string template, Player player, ConsoleComman
 
 	private static void SpawnTemplate(ItemTemplate template, Player player, ConsoleCommand command)
 	{
-		var poolManager = Singleton<PoolManager>.Instance;
+		var poolManager = Singleton<PoolManagerClass>.Instance;
 
 		poolManager
-			.LoadBundlesAndCreatePools(PoolManager.PoolsCategory.Raid, PoolManager.AssemblyType.Online, [.. template.AllResources], JobPriority.Immediate)
+			.LoadBundlesAndCreatePools(PoolManagerClass.PoolsCategory.Raid, PoolManagerClass.AssemblyType.Online, [.. template.AllResources], JobPriorityClass.Immediate)
 			.ContinueWith(task =>
 			{
 				AsyncWorker.RunInMainTread(delegate

ConsoleCommands/Spawn.cs

@@ -51,9 +51,13 @@ private static void SpawnBots(string[] bots)
 			return;
 
 		var controller = instance.BotsController;
+		var spawner = controller?.BotSpawner;
+
+		if (spawner == null)
+			return;
 
 		foreach (var bot in bots)
-			controller.SpawnBotDebugServer(EPlayerSide.Savage, false, (WildSpawnType)Enum.Parse(typeof(WildSpawnType), bot), BotDifficulty.normal, true);
+			spawner.SpawnBotByTypeForce(1, (WildSpawnType)Enum.Parse(typeof(WildSpawnType), bot), BotDifficulty.normal, null);
 	}
 
 	private static string[] FindBots(string search)
@@ -70,9 +74,7 @@ private static string[] FindBots(string search)
 		if (exactMatch.Length == 1)
 			return exactMatch;
 
-		return names
-			.Where(n => n.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0)
-			.ToArray();
+		return [.. names.Where(n => n.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0)];
 	}
 
 	private static string[] GetBotNames()

ConsoleCommands/SpawnBot.cs

@@ -35,6 +35,6 @@ public override void Execute()
 			return;
 
 		foreach (var template in templates)
-			Spawn.SpawnTemplate(template, player, this, i => true);
+			Spawn.SpawnTemplate(template, player, this, _ => true);
 	}
 }

ConsoleCommands/SpawnHideoutItems.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Comfort.Common;
 using EFT.InventoryLogic;
 using EFT.Trainer.Properties;
 using JetBrains.Annotations;

Extensions/LootableContainerExtensions.cs

@@ -2,7 +2,6 @@
 using Comfort.Common;
 using EFT.Ballistics;
 using EFT.InventoryLogic;
-using EFT.Trainer.Model;
 using EFT.Trainer.Properties;
 using JetBrains.Annotations;
 
@@ -19,21 +18,20 @@ internal class Ammunition : ToggleFeature
 	public override bool Enabled { get; set; } = false;
 
 	[UsedImplicitly]
-	private static void ShootPostfix(object shot)
+	private static void ShootPostfix(EftBulletClass shot)
 	{
 		var feature = FeatureFactory.GetFeature<Ammunition>();
 		if (feature == null || !feature.Enabled)
 			return;
 
-		var shotWrapper = new ShotWrapper(shot);
-		if (shotWrapper.Weapon is not Weapon weapon)
+		if (shot.Weapon is not Weapon weapon)
 			return;
 
-		var ammo = shotWrapper.Ammo;
+		var ammo = shot.Ammo;
 		if (ammo == null)
 			return;
 
-		var player = shotWrapper.Player;
+		var player = shot.Player.iPlayer;
 		if (player is not { IsYourPlayer: true })
 			return;
 
@@ -75,7 +73,7 @@ protected override void UpdateWhenEnabled()
 	{
 		HarmonyPatchOnce(harmony =>
 		{
-			HarmonyPostfix(harmony, typeof(BallisticsCalculator), nameof(BallisticsCalculator.Shoot), nameof(ShootPostfix));
+			HarmonyPostfix(harmony, typeof(BallisticsCalculator), nameof(BallisticsCalculator.Shoot), nameof(ShootPostfix), [typeof(EftBulletClass)]);
 		});
 	}
 }

Features/AirDrop.cs

@@ -1,5 +1,4 @@
 using EFT.InventoryLogic;
-using EFT.Trainer.ConsoleCommands;
 using EFT.Trainer.Properties;
 using JetBrains.Annotations;
 using static EFT.Player;

Features/Ammunition.cs

@@ -91,16 +91,31 @@ protected void AddConsoleLog(string log)
 			ConsoleScreen.Log(log);
 	}
 
-	public override ETranslateResult TranslateCommand(ECommand command)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ETranslateResult TranslateCommand(ECommand command)
 	{
 		return ETranslateResult.Ignore;
 	}
 
-	public override void TranslateAxes(ref float[] axes)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override void TranslateAxes(ref float[] axes)
 	{
 	}
 
-	public override ECursorResult ShouldLockCursor()
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ECursorResult ShouldLockCursor()
 	{
 		return ECursorResult.Ignore;
 	}

Features/Examine.cs

@@ -9,20 +9,18 @@ namespace EFT.Trainer.Features;
 internal static class FeatureFactory
 {
 	private static GameObject? _gameObject = null;
-	private static readonly Lazy<Type[]> _types = new(() => typeof(FeatureFactory)
+	private static readonly Lazy<Type[]> _types = new(() => [.. typeof(FeatureFactory)
 		.Assembly
 		.GetTypes()
-		.Where(t => t.IsSubclassOf(typeof(Feature)) && !t.IsAbstract)
-		.ToArray());
+		.Where(t => t.IsSubclassOf(typeof(Feature)) && !t.IsAbstract)]);
 
 	public static Feature[] RegisterAllFeatures(GameObject gameObject)
 	{
 		_gameObject = gameObject;
 
-		return GetAllFeatureTypes()
+		return [.. GetAllFeatureTypes()
 			.Select(gameObject.GetOrAddComponent)
-			.OfType<Feature>()
-			.ToArray();
+			.OfType<Feature>()];
 	}
 
 	public static Type[] GetAllFeatureTypes()
@@ -42,16 +40,13 @@ public static Feature[] GetAllFeatures()
 		if (_gameObject == null)
 			return [];
 
-		return GetAllFeatureTypes()
+		return [.. GetAllFeatureTypes()
 			.Select(_gameObject.GetComponent)
-			.OfType<Feature>()
-			.ToArray();
+			.OfType<Feature>()];
 	}
 
 	public static ToggleFeature[] GetAllToggleableFeatures()
 	{
-		return GetAllFeatures()
-			.OfType<ToggleFeature>()
-			.ToArray();
+		return [.. GetAllFeatures().OfType<ToggleFeature>()];
 	}
 }