Merge pull request #30 from SlejmUr/master

From SIT.Core to StayInTarkov
stayintarkov · Nov 20, 2023 · 41dd516 · 41dd516
2 parents 61803ce + df5cf69
commit 41dd516
Show file tree

Hide file tree

Showing 199 changed files with 315 additions and 567 deletions.
diff --git a/.github/workflows/stay-in-tarkov-client.yml b/.github/workflows/stay-in-tarkov-client.yml
@@ -65,9 +65,6 @@ jobs:
     - name: Remove unnecessary files
       run: |
           del ${{ env.SolutionName }}-${{ matrix.configuration }}\StayInTarkov.pdb
-          del ${{ env.SolutionName }}-${{ matrix.configuration }}\PresentationFramework.xml
-          del ${{ env.SolutionName }}-${{ matrix.configuration }}\PresentationFramework.dll
-          del ${{ env.SolutionName }}-${{ matrix.configuration }}\Newtonsoft.Json.dll
 
     - name: Zip remaining files
       run: |

diff --git a/Source/AI/AIProcessLookAtPoints.cs b/Source/AI/AIProcessLookAtPoints.cs
@@ -1,7 +1,7 @@
 using EFT;
 using UnityEngine;
 
-namespace SIT.Core.AI
+namespace StayInTarkov.AI
 {
     /// <summary>
     /// Created by: DrakiaXYZ 

diff --git a/Source/AI/PMCLogic/AIArchetypeAssigner.cs b/Source/AI/PMCLogic/AIArchetypeAssigner.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SIT.Core.AI.PMCLogic
+namespace StayInTarkov.AI.PMCLogic
 {
     /// <summary>
     /// Paulov: TODO: Work in Progress - Stubbed for later use

diff --git a/Source/AI/PMCLogic/Friendly/Companion/SITCompanionComponent.cs b/Source/AI/PMCLogic/Friendly/Companion/SITCompanionComponent.cs
@@ -1,7 +1,7 @@
 using BepInEx.Logging;
 using Comfort.Common;
 using EFT;
-using SIT.Core.Coop;
+using StayInTarkov.Coop;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,7 +10,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-namespace SIT.Core.AI.PMCLogic.Friendly.Companion
+namespace StayInTarkov.AI.PMCLogic.Friendly.Companion
 {
     /// <summary>
     /// Created by: Paulov

diff --git a/Source/AI/PMCLogic/Roaming/RoamingLayer.cs b/Source/AI/PMCLogic/Roaming/RoamingLayer.cs
@@ -3,7 +3,7 @@
 using EFT;
 using UnityEngine;
 
-namespace SIT.Core.AI.PMCLogic.Roaming
+namespace StayInTarkov.AI.PMCLogic.Roaming
 {
     /// <summary>
     /// Created by: DrakiaXYZ

diff --git a/Source/AI/PMCLogic/Roaming/RoamingLogic.cs b/Source/AI/PMCLogic/Roaming/RoamingLogic.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-namespace SIT.Core.AI.PMCLogic.Roaming
+namespace StayInTarkov.AI.PMCLogic.Roaming
 {
     /// <summary>
     /// Created by: DrakiaXYZ

diff --git a/Source/AI/PMCLogic/RushSpawn/PMCRushSpawnLayer.cs b/Source/AI/PMCLogic/RushSpawn/PMCRushSpawnLayer.cs
@@ -3,7 +3,7 @@
 using EFT;
 using UnityEngine;
 
-namespace SIT.Core.AI.PMCLogic.RushSpawn
+namespace StayInTarkov.AI.PMCLogic.RushSpawn
 {
     /// <summary>
     /// Created by: Paulov

diff --git a/Source/AI/PMCLogic/RushSpawn/PMCRushSpawnLogic.cs b/Source/AI/PMCLogic/RushSpawn/PMCRushSpawnLogic.cs
@@ -4,9 +4,9 @@
 using UnityEngine.AI;
 using UnityEngine;
 using Comfort.Common;
-using SIT.Core.Coop;
+using StayInTarkov.Coop;
 
-namespace SIT.Core.AI.PMCLogic.RushSpawn
+namespace StayInTarkov.AI.PMCLogic.RushSpawn
 {
     /// <summary>
     /// Created by: Paulov

diff --git a/Source/AkiSupport/Airdrops/AirdropBox.cs b/Source/AkiSupport/Airdrops/AirdropBox.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace SIT.Core.AkiSupport.Airdrops
+namespace StayInTarkov.AkiSupport.Airdrops
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Source/AkiSupport/Airdrops/AirdropPlane.cs b/Source/AkiSupport/Airdrops/AirdropPlane.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace SIT.Core.AkiSupport.Airdrops
+namespace StayInTarkov.AkiSupport.Airdrops
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Source/AkiSupport/Airdrops/AirdropsManager.cs b/Source/AkiSupport/Airdrops/AirdropsManager.cs
@@ -2,11 +2,11 @@
 using Aki.Custom.Airdrops.Utils;
 using Comfort.Common;
 using EFT;
-using SIT.Core.AkiSupport.Airdrops.Models;
-using SIT.Core.AkiSupport.Airdrops.Utils;
-using SIT.Core.AkiSupport.Airdrops;
 using UnityEngine;
 using BepInEx.Logging;
+using StayInTarkov.AkiSupport.Airdrops.Models;
+using StayInTarkov.AkiSupport.Airdrops;
+using StayInTarkov.AkiSupport.Airdrops.Utils;
 
 namespace Aki.Custom.Airdrops
 {

diff --git a/Source/AkiSupport/Airdrops/Models/AirdropParametersModel.cs b/Source/AkiSupport/Airdrops/Models/AirdropParametersModel.cs
@@ -1,6 +1,6 @@
 using Aki.Custom.Airdrops.Models;
 
-namespace SIT.Core.AkiSupport.Airdrops.Models
+namespace StayInTarkov.AkiSupport.Airdrops.Models
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Source/AkiSupport/Airdrops/Patches/AirdropFlarePatch.cs b/Source/AkiSupport/Airdrops/Patches/AirdropFlarePatch.cs
@@ -1,8 +1,7 @@
 using Comfort.Common;
 using EFT;
 using EFT.Airdrop;
-using SIT.Core.AkiSupport.Airdrops;
-using SIT.Tarkov.Core;
+using StayInTarkov;
 using System.Linq;
 using System.Reflection;
 

diff --git a/Source/AkiSupport/Airdrops/Patches/AirdropPatch.cs b/Source/AkiSupport/Airdrops/Patches/AirdropPatch.cs
@@ -2,11 +2,11 @@
 using Comfort.Common;
 using EFT;
 using EFT.Airdrop;
-using SIT.Tarkov.Core;
+using StayInTarkov;
 using System.Linq;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.Airdrops
+namespace StayInTarkov.AkiSupport.Airdrops
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Source/AkiSupport/Airdrops/Utils/AirdropUtil.cs b/Source/AkiSupport/Airdrops/Utils/AirdropUtil.cs
@@ -2,15 +2,15 @@
 using EFT;
 using EFT.Airdrop;
 using Newtonsoft.Json;
-using SIT.Core.AkiSupport.Airdrops.Models;
+using StayInTarkov.AkiSupport.Airdrops.Models;
 using StayInTarkov.Networking;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace SIT.Core.AkiSupport.Airdrops.Utils
+namespace StayInTarkov.AkiSupport.Airdrops.Utils
 {
     public static class AirdropUtil
     {

diff --git a/Source/AkiSupport/Airdrops/Utils/ItemFactoryUtil.cs b/Source/AkiSupport/Airdrops/Utils/ItemFactoryUtil.cs
@@ -5,7 +5,6 @@
 using EFT.InventoryLogic;
 using Newtonsoft.Json;
 using System.Linq;
-using SIT.Core.AkiSupport.Airdrops;
 using Aki.Custom.Airdrops.Models;
 using StayInTarkov.Networking;
 

diff --git a/Source/AkiSupport/Core/Patches/BattlEyePatch.cs b/Source/AkiSupport/Core/Patches/BattlEyePatch.cs
@@ -1,4 +1,4 @@
-using SIT.Tarkov.Core;
+using StayInTarkov;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -8,6 +8,7 @@ namespace Aki.Core.Patches
     /// <summary>
     /// Credit: BattlEyePatch from SPT-Aki https://dev.sp-tarkov.com/SPT-AKI/Modules/src/branch/master/project/Aki.Core/Patches/BattlEyePatch.cs
     /// </summary>
+    /// WE ARE NOT PATHCING WITH THIS - TO BE REMOVED
     public class BattlEyePatch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()

diff --git a/Source/AkiSupport/Core/Patches/ConsistencyMultiPatch.cs b/Source/AkiSupport/Core/Patches/ConsistencyMultiPatch.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace SIT.Tarkov.Core
+namespace StayInTarkov
 {
     /// <summary>
     /// Credit: SPT-Aki ConsistencyMultiPatch - https://dev.sp-tarkov.com/SPT-AKI/Modules/src/branch/master/project/Aki.Core/Patches/ConsistencyMultiPatch.cs

diff --git a/Source/AkiSupport/Core/Patches/ConsistencySinglePatch.cs b/Source/AkiSupport/Core/Patches/ConsistencySinglePatch.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace SIT.Tarkov.Core
+namespace StayInTarkov
 {
     /// <summary>
     /// Credit: SPT-Aki ConsistencySinglePatch - https://dev.sp-tarkov.com/SPT-AKI/Modules/src/branch/master/project/Aki.Core/Patches/ConsistencySinglePatch.cs

diff --git a/Source/AkiSupport/Core/Patches/DataHandlerDebugPatch.cs b/Source/AkiSupport/Core/Patches/DataHandlerDebugPatch.cs
@@ -6,7 +6,7 @@
 using FilesChecker;
 using HarmonyLib;
 using System;
-using SIT.Tarkov.Core;
+using StayInTarkov;
 
 namespace Aki.Core.Patches
 {

diff --git a/Source/AkiSupport/Core/Patches/SslCertificatePatch.cs b/Source/AkiSupport/Core/Patches/SslCertificatePatch.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Reflection;
 using UnityEngine.Networking;
-using SIT.Tarkov.Core;
+using StayInTarkov;
 
 namespace Aki.Core.Patches
 {

diff --git a/Source/AkiSupport/Core/Patches/UnityWebRequestPatch.cs b/Source/AkiSupport/Core/Patches/UnityWebRequestPatch.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using UnityEngine.Networking;
-using SIT.Tarkov.Core;
+using StayInTarkov;
 
 namespace Aki.Core.Patches
 {

diff --git a/Source/AkiSupport/Core/Patches/WebSocketPatch.cs b/Source/AkiSupport/Core/Patches/WebSocketPatch.cs
@@ -1,4 +1,4 @@
-using SIT.Tarkov.Core;
+using StayInTarkov;
 using System;
 using System.Linq;
 using System.Reflection;
@@ -8,6 +8,7 @@ namespace Aki.Core.Patches
     /// <summary>
     /// Credit: WebSocketPatch from SPT-Aki https://dev.sp-tarkov.com/SPT-AKI/Modules/src/branch/master/project/Aki.Core/Patches/
     /// </summary>
+    /// WE ARE NOT PATHCING WITH THIS - TO BE REMOVED
     public class WebSocketPatch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()

diff --git a/Source/AkiSupport/Custom/AddEnemyToAllGroupsInBotZonePatch.cs b/Source/AkiSupport/Custom/AddEnemyToAllGroupsInBotZonePatch.cs
@@ -1,10 +1,9 @@
 using EFT;
-using SIT.Tarkov.Core;
 using System;
 using System.Linq;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.Custom
+namespace StayInTarkov.AkiSupport.Custom
 {
     /// <summary>
     /// Created by: SPT-Aki

diff --git a/Source/AkiSupport/Custom/BotDifficultyPatch.cs b/Source/AkiSupport/Custom/BotDifficultyPatch.cs
@@ -1,5 +1,4 @@
 using EFT;
-using SIT.Tarkov.Core;
 using StayInTarkov.Networking;
 using System.Linq;
 using System.Reflection;

diff --git a/Source/AkiSupport/Custom/CheckAndAddEnemyPatch.cs b/Source/AkiSupport/Custom/CheckAndAddEnemyPatch.cs
@@ -1,11 +1,10 @@
 using EFT;
-using SIT.Tarkov.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.Custom
+namespace StayInTarkov.AkiSupport.Custom
 {
     /// <summary>
     /// Created by: SPT-Aki

diff --git a/Source/AkiSupport/Custom/CoreDifficultyPatch.cs b/Source/AkiSupport/Custom/CoreDifficultyPatch.cs
@@ -1,4 +1,3 @@
-using SIT.Tarkov.Core;
 using StayInTarkov.Networking;
 using System.Linq;
 using System.Reflection;

diff --git a/Source/AkiSupport/Custom/LocationLootCacheBustingPatch.cs b/Source/AkiSupport/Custom/LocationLootCacheBustingPatch.cs
@@ -1,5 +1,4 @@
-using SIT.Tarkov.Core;
-using StayInTarkov;
+using StayInTarkov;
 using System;
 using System.Linq;
 using System.Reflection;

diff --git a/Source/AkiSupport/Custom/PmcFirstAidPatch.cs b/Source/AkiSupport/Custom/PmcFirstAidPatch.cs
@@ -1,5 +1,4 @@
 using EFT;
-using SIT.Tarkov.Core;
 using StayInTarkov;
 using System.Reflection;
 

diff --git a/Source/AkiSupport/Custom/QTEPatch.cs b/Source/AkiSupport/Custom/QTEPatch.cs
@@ -1,9 +1,8 @@
 using EFT;
-using SIT.Tarkov.Core;
 using StayInTarkov.Networking;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.Custom
+namespace StayInTarkov.AkiSupport.Custom
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Source/AkiSupport/Custom/SpawnProcessNegativeValuePatch.cs b/Source/AkiSupport/Custom/SpawnProcessNegativeValuePatch.cs
@@ -1,9 +1,7 @@
 using EFT;
-using SIT.Tarkov.Core;
-using StayInTarkov;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.Custom
+namespace StayInTarkov.AkiSupport.Custom
 {
 
     /// <summary>

diff --git a/Source/AkiSupport/SITFixes/BotSettingsRepoClassIsFollowerFixPatch.cs b/Source/AkiSupport/SITFixes/BotSettingsRepoClassIsFollowerFixPatch.cs
@@ -1,10 +1,8 @@
 using EFT;
-using SIT.Tarkov.Core;
-using StayInTarkov;
 using System.Linq;
 using System.Reflection;
 
-namespace SIT.Core.AkiSupport.SITFixes
+namespace StayInTarkov.AkiSupport.SITFixes
 {
     /// <summary>
     /// Created by: Paulov

diff --git a/Source/AkiSupport/Singleplayer/Patches/Healing/PostRaidHealScreenPatch.cs b/Source/AkiSupport/Singleplayer/Patches/Healing/PostRaidHealScreenPatch.cs
@@ -1,5 +1,4 @@
 using EFT;
-using SIT.Tarkov.Core;
 using System.Reflection;
 
 namespace StayInTarkov.AkiSupport.Singleplayer.Patches.Healing

diff --git a/Source/AkiSupport/Singleplayer/Patches/MainMenu/InsuranceScreenPatch.cs b/Source/AkiSupport/Singleplayer/Patches/MainMenu/InsuranceScreenPatch.cs
@@ -1,5 +1,4 @@
 using EFT;
-using SIT.Tarkov.Core;
 using System.Reflection;
 using UnityEngine;
 

diff --git a/Source/AkiSupport/Singleplayer/Patches/Progression/ExperienceGainPatch.cs b/Source/AkiSupport/Singleplayer/Patches/Progression/ExperienceGainPatch.cs
@@ -1,7 +1,5 @@
 using EFT;
 using EFT.UI.SessionEnd;
-using SIT.Core.Coop;
-using SIT.Tarkov.Core;
 using System.Linq;
 using System.Reflection;
 

diff --git a/Source/AkiSupport/Singleplayer/Patches/Progression/LighthouseBridgePatch.cs b/Source/AkiSupport/Singleplayer/Patches/Progression/LighthouseBridgePatch.cs
@@ -1,6 +1,5 @@
 using Comfort.Common;
 using EFT;
-using SIT.Tarkov.Core;
 using StayInTarkov.AkiSupport.Singleplayer.Components;
 using System.Reflection;
 

diff --git a/Source/AkiSupport/Singleplayer/Patches/Progression/LighthouseTransmitterPatch.cs b/Source/AkiSupport/Singleplayer/Patches/Progression/LighthouseTransmitterPatch.cs
@@ -1,6 +1,5 @@
 using Comfort.Common;
 using EFT;
-using SIT.Tarkov.Core;
 using System.Reflection;
 
 namespace StayInTarkov.AkiSupport.Singleplayer.Patches.Progression

diff --git a/Source/AkiSupport/Singleplayer/Patches/Quests/DogtagPatch.cs b/Source/AkiSupport/Singleplayer/Patches/Quests/DogtagPatch.cs
@@ -1,6 +1,5 @@
 using EFT;
 using EFT.InventoryLogic;
-using SIT.Tarkov.Core;
 using System;
 using System.Reflection;
 

diff --git a/Source/AkiSupport/Singleplayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs b/Source/AkiSupport/Singleplayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs
@@ -1,5 +1,4 @@
 using EFT;
-using SIT.Tarkov.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/Source/AkiSupport/Singleplayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs b/Source/AkiSupport/Singleplayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs
@@ -3,7 +3,6 @@
 using Comfort.Common;
 using EFT;
 using HarmonyLib;
-using SIT.Tarkov.Core;
 
 namespace StayInTarkov.AkiSupport.Singleplayer.Patches.RaidFix
 {

diff --git a/Source/AkiSupport/Singleplayer/Patches/RaidFix/PostRaidHealingPricePatch.cs b/Source/AkiSupport/Singleplayer/Patches/RaidFix/PostRaidHealingPricePatch.cs
@@ -1,6 +1,5 @@
 using EFT;
 using HarmonyLib;
-using SIT.Tarkov.Core;
 using System;
 using System.Reflection;