- Update for 3.9.0

- Disable GroupPoint patches, BSG refactored that area of code - Normalize sandbox maps to a single navmesh
DrakiaXYZ · Jul 6, 2024 · 54a8900 · 54a8900
1 parent 2ae0a27
commit 54a8900
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 48 deletions.
diff --git a/Components/BotZoneDebugComponent.cs b/Components/BotZoneDebugComponent.cs
@@ -1,14 +1,10 @@
-using Aki.Reflection.Utils;
-using Comfort.Common;
+using Comfort.Common;
 using DrakiaXYZ.Waypoints.Helpers;
 using EFT;
 using EFT.Game.Spawning;
-using HarmonyLib;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using UnityEngine;
 
 namespace DrakiaXYZ.Waypoints.Components

diff --git a/DrakiaXYZ-Waypoints.csproj b/DrakiaXYZ-Waypoints.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DrakiaXYZ.Waypoints</RootNamespace>
     <AssemblyName>DrakiaXYZ-Waypoints</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -35,14 +35,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\BepInEx\core\0Harmony.dll</HintPath>
     </Reference>
-    <Reference Include="aki-custom">
-      <HintPath>..\..\BepInEx\plugins\aki-custom.dll</HintPath>
+    <Reference Include="spt-custom">
+      <HintPath>..\..\BepInEx\plugins\spt\spt-custom.dll</HintPath>
     </Reference>
-    <Reference Include="Aki.Reflection">
-      <HintPath>..\..\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll</HintPath>
+    <Reference Include="spt-common">
+      <HintPath>..\..\BepInEx\plugins\spt\spt-common.dll</HintPath>
     </Reference>
-    <Reference Include="aki_PrePatch">
-      <HintPath>..\..\BepInEx\patchers\aki_PrePatch.dll</HintPath>
+    <Reference Include="spt-reflection">
+      <HintPath>..\..\BepInEx\plugins\spt\spt-reflection.dll</HintPath>
+    </Reference>
+    <Reference Include="spt-prepatch">
+      <HintPath>..\..\BepInEx\patchers\spt-prepatch.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll</HintPath>

diff --git a/Patches/BotVoxelesPersonalActivatePatch.cs b/Patches/BotVoxelesPersonalActivatePatch.cs
@@ -1,7 +1,5 @@
-using Aki.Reflection.Patching;
-using EFT;
+using SPT.Reflection.Patching;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Reflection;
 
 namespace DrakiaXYZ.Waypoints.Patches

diff --git a/Patches/DebugPatch.cs b/Patches/DebugPatch.cs
@@ -1,13 +1,7 @@
-using Aki.Reflection.Patching;
-using Comfort.Common;
+using SPT.Reflection.Patching;
 using DrakiaXYZ.Waypoints.Components;
-using DrakiaXYZ.Waypoints.Helpers;
 using EFT;
-using EFT.Game.Spawning;
-using System.Collections.Generic;
 using System.Reflection;
-using UnityEngine;
-using UnityEngine.AI;
 
 namespace DrakiaXYZ.Waypoints.Patches
 {

diff --git a/Patches/DoorLinkPatch.cs b/Patches/DoorLinkPatch.cs
@@ -1,11 +1,8 @@
-using Aki.Reflection.Patching;
-using Comfort.Common;
+using SPT.Reflection.Patching;
 using EFT;
 using EFT.Interactive;
 using HarmonyLib;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.AI;

diff --git a/Patches/DoorLinkStateChangePatch.cs b/Patches/DoorLinkStateChangePatch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using EFT.Interactive;
 using HarmonyLib;
 using System.Reflection;

diff --git a/Patches/ExfilDoorBlockerPatch.cs b/Patches/ExfilDoorBlockerPatch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using EFT;
 using EFT.Interactive;
 using System.Collections.Generic;

diff --git a/Patches/FindPathPatch.cs b/Patches/FindPathPatch.cs
@@ -1,5 +1,5 @@
-using Aki.Reflection.Patching;
-using Aki.Reflection.Utils;
+using SPT.Reflection.Patching;
+using SPT.Reflection.Utils;
 using HarmonyLib;
 using System;
 using System.Linq;

diff --git a/Patches/GroupPointCachePatch.cs b/Patches/GroupPointCachePatch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using Comfort.Common;
 using EFT;
 using System.Collections.Generic;

diff --git a/Patches/GroupPointGetByIdPatch.cs b/Patches/GroupPointGetByIdPatch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using System.Collections.Generic;
 using System.Reflection;
 

diff --git a/Patches/SwitchDoorBlockerPatch.cs b/Patches/SwitchDoorBlockerPatch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using EFT;
 using EFT.Interactive;
 using System.Linq;

diff --git a/Patches/WaypointPatch.cs b/Patches/WaypointPatch.cs
@@ -1,19 +1,13 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using Comfort.Common;
 using DrakiaXYZ.Waypoints.Helpers;
 using EFT;
 using HarmonyLib;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.AI;
-using Random = UnityEngine.Random;
 
 namespace DrakiaXYZ.Waypoints.Patches
 {
@@ -63,6 +57,11 @@ private static void InjectNavmesh(GameWorld gameWorld)
             {
                 mapName = "factory4";
             }
+            // Standardize Ground Zero
+            if (mapName.StartsWith("sandbox"))
+            {
+                mapName = "sandbox";
+            }
 
             string navMeshFilename = mapName + "-navmesh.bundle";
             string navMeshPath = Path.Combine(new string[] { WaypointsPlugin.NavMeshFolder, navMeshFilename });

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.3.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
-[assembly: TarkovVersion(29197)]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: TarkovVersion(30626)]
diff --git a/WaypointsPlugin.cs b/WaypointsPlugin.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using BepInEx;
 using DrakiaXYZ.Helpers;
 using DrakiaXYZ.Waypoints.Helpers;
@@ -14,7 +14,8 @@
 
 namespace DrakiaXYZ.Waypoints
 {
-    [BepInPlugin("xyz.drakia.waypoints", "DrakiaXYZ-Waypoints", "1.4.3")]
+    [BepInPlugin("xyz.drakia.waypoints", "DrakiaXYZ-Waypoints", "1.5.0")]
+    [BepInDependency("com.SPT.core", "3.9.0")]
     public class WaypointsPlugin : BaseUnityPlugin
     {
         public static string PluginFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -45,9 +46,9 @@ private void Awake()
                 new SwitchDoorBlockerPatch().Enable();
                 new ExfilDoorBlockerPatch().Enable();
                 new FindPathPatch().Enable();
-                new GroupPointCachePatch().Enable();
-                new BotVoxelesPersonalActivatePatch().Enable();
-                new GroupPointGetByIdPatch().Enable();
+                //new GroupPointCachePatch().Enable();
+                //new BotVoxelesPersonalActivatePatch().Enable();
+                //new GroupPointGetByIdPatch().Enable();
 
                 // Debug perf timing output
                 //new PerfTimingPatch().Enable();