From d9c5c70c46c057f0dcf5b436dd6b54710339607c Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:06:29 -0400 Subject: [PATCH] Remove legacy modloader code --- .../Loaders/PostDBModLoader.cs | 26 ------------------- .../Loaders/PostSptModLoader.cs | 26 ------------------- .../Models/External/IPostDBLoadModAsync.cs | 23 ---------------- .../Models/External/IPostSptLoadModAsync.cs | 23 ---------------- 4 files changed, 98 deletions(-) delete mode 100644 Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs delete mode 100644 Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs delete mode 100644 Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadModAsync.cs delete mode 100644 Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadModAsync.cs diff --git a/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs deleted file mode 100644 index 4b5f92c2..00000000 --- a/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs +++ /dev/null @@ -1,26 +0,0 @@ -using SPTarkov.DI.Annotations; -using SPTarkov.Server.Core.DI; -using SPTarkov.Server.Core.Models.External; -using SPTarkov.Server.Core.Models.Utils; -using SPTarkov.Server.Core.Utils; - -namespace SPTarkov.Server.Core.Loaders; - -[Obsolete("This mod loader is obsolete and will be removed in 4.1.0. See documentation in IPostDBLoadModAsync for more information.")] -[Injectable(TypePriority = OnLoadOrder.PostDBModLoader)] -public class PostDBModLoader(ISptLogger logger, IEnumerable postDbLoadMods) : IOnLoad -{ - public async Task OnLoad() - { - if (ProgramStatics.MODS()) - { - logger.Info("Loading PostDBMods..."); - foreach (var postDbLoadMod in postDbLoadMods) - { - await postDbLoadMod.PostDBLoadAsync(); - } - - logger.Info("Finished loading PostDBMods..."); - } - } -} diff --git a/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs deleted file mode 100644 index 2ebf638c..00000000 --- a/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs +++ /dev/null @@ -1,26 +0,0 @@ -using SPTarkov.DI.Annotations; -using SPTarkov.Server.Core.DI; -using SPTarkov.Server.Core.Models.External; -using SPTarkov.Server.Core.Models.Utils; -using SPTarkov.Server.Core.Utils; - -namespace SPTarkov.Server.Core.Loaders; - -[Obsolete("This mod loader is obsolete and will be removed in 4.1.0. See documentation in IPostSptLoadModAsync for more information.")] -[Injectable(TypePriority = OnLoadOrder.PostSptModLoader)] -public class PostSptModLoader(ISptLogger logger, IEnumerable postSptLoadMods) : IOnLoad -{ - public async Task OnLoad() - { - if (ProgramStatics.MODS()) - { - logger.Info("Loading PostSptMods..."); - foreach (var postSptLoadMod in postSptLoadMods) - { - await postSptLoadMod.PostSptLoadAsync(); - } - - logger.Info("Finished loading PostSptMods..."); - } - } -} diff --git a/Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadModAsync.cs b/Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadModAsync.cs deleted file mode 100644 index 095c189f..00000000 --- a/Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadModAsync.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace SPTarkov.Server.Core.Models.External; - -/// -/// This interface used to be used in TS to load mods after the database finished loading. -/// This class is now deprecated and should not be used, see code example below for replacement. -/// -/// -/// [Injectable(TypePriority = OnLoadOrder.Database + 1)] -/// public class MyMod : IOnLoad -/// { -/// // ... implementation -/// } -/// -/// -/// DEPRECATED, see code example above for replacement! -/// -[Obsolete( - "This interface is obsolete and will be removed in 4.1.0, please use IOnLoad instead with the desired Injectable(TypePriority). See class documentation for examples." -)] -public interface IPostDBLoadModAsync -{ - Task PostDBLoadAsync(); -} diff --git a/Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadModAsync.cs b/Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadModAsync.cs deleted file mode 100644 index 3e4765f4..00000000 --- a/Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadModAsync.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace SPTarkov.Server.Core.Models.External; - -/// -/// This interface used to be used in TS to load mods after SPT finished loading. -/// This class is now deprecated and should not be used, see code example below for replacement. -/// -/// -/// [Injectable(TypePriority = OnLoadOrder.RagfairCallbacks + 1)] -/// public class MyMod : IOnLoad -/// { -/// // ... implementation -/// } -/// -/// -/// DEPRECATED, see code example above for replacement! -/// -[Obsolete( - "This interface is obsolete and will be removed in 4.1.0, please use IOnLoad instead with the desired Injectable(TypePriority). See class documentation for examples." -)] -public interface IPostSptLoadModAsync -{ - Task PostSptLoadAsync(); -}