use prim ctor and fixed warnings: QuestCallbacks, RagfairCallbacks, RepairCallbacks, SaveCallbacks

This commit is contained in:
CWX
2025-01-18 13:48:09 +00:00
parent 48a7c2b4e6
commit 2bb7a97f48
4 changed files with 26 additions and 77 deletions
+6 -20
View File
@@ -1,8 +1,6 @@
using Core.Annotations;
using Core.Controllers;
using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Tables;
using Core.Models.Eft.HttpResponse;
using Core.Models.Eft.ItemEvent;
using Core.Models.Eft.Quests;
using Core.Utils;
@@ -10,24 +8,12 @@ using Core.Utils;
namespace Core.Callbacks;
[Injectable]
public class QuestCallbacks
public class QuestCallbacks(
HttpResponseUtil _httpResponseUtil,
QuestController _questController,
RepeatableQuestController _repeatableQuestController
)
{
protected HttpResponseUtil _httpResponseUtil;
protected QuestController _questController;
protected RepeatableQuestController _repeatableQuestController;
public QuestCallbacks
(
HttpResponseUtil httpResponseUtil,
QuestController questController,
RepeatableQuestController repeatableQuestController
)
{
_httpResponseUtil = httpResponseUtil;
_questController = questController;
_repeatableQuestController = repeatableQuestController;
}
/// <summary>
/// Handle RepeatableQuestChange event
/// </summary>
@@ -53,7 +39,7 @@ public class QuestCallbacks
{
if (info.Type == "repeatable")
return _questController.AcceptRepeatableQuest(pmcData, info, sessionID);
return _questController.AcceptQuest(pmcData, info, sessionID);
}
+8 -26
View File
@@ -4,7 +4,6 @@ using Core.DI;
using Core.Models.Eft.Common;
using Core.Models.Eft.ItemEvent;
using Core.Models.Eft.Ragfair;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Servers;
using Core.Services;
@@ -15,32 +14,15 @@ namespace Core.Callbacks;
[Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.RagfairCallbacks)]
[Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.RagfairCallbacks)]
[Injectable(InjectableTypeOverride = typeof(RagfairCallbacks))]
public class RagfairCallbacks : OnLoad, OnUpdate
public class RagfairCallbacks(
HttpResponseUtil _httpResponseUtil,
// RagfairServer _ragfairServer
RagfairController _ragfairController,
RagfairTaxService _ragfairTaxService,
ConfigServer _configServer
) : OnLoad, OnUpdate
{
protected HttpResponseUtil _httpResponseUtil;
// protected RagfairServer _ragfairServer;
protected RagfairController _ragfairController;
protected RagfairTaxService _ragfairTaxService;
protected ConfigServer _configServer;
private RagfairConfig _ragfairConfig;
public RagfairCallbacks
(
HttpResponseUtil httpResponseUtil,
// RagfairServer ragfairServer,
RagfairController ragfairController,
RagfairTaxService ragfairTaxService,
ConfigServer configServer
)
{
_httpResponseUtil = httpResponseUtil;
// _ragfairServer = ragfairServer;
_ragfairController = ragfairController;
_ragfairTaxService = ragfairTaxService;
_configServer = configServer;
_ragfairConfig = _configServer.GetConfig<RagfairConfig>();
}
private RagfairConfig _ragfairConfig = _configServer.GetConfig<RagfairConfig>();
public async Task OnLoad()
{
+1 -11
View File
@@ -7,18 +7,8 @@ using Core.Models.Eft.Repair;
namespace Core.Callbacks;
[Injectable]
public class RepairCallbacks
public class RepairCallbacks(RepairController _repairController)
{
protected RepairController _repairController;
public RepairCallbacks
(
RepairController repairController
)
{
_repairController = repairController;
}
/// <summary>
/// Handle TraderRepair event
/// use trader to repair item
+11 -20
View File
@@ -1,6 +1,5 @@
using Core.Annotations;
using Core.DI;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Servers;
using Core.Services;
@@ -9,38 +8,30 @@ namespace Core.Callbacks;
[Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.SaveCallbacks)]
[Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.SaveCallbacks)]
public class SaveCallbacks : OnLoad, OnUpdate
{
protected SaveServer _saveServer;
protected CoreConfig _coreConfig;
protected BackupService _backupService;
public SaveCallbacks(
SaveServer saveServer,
ConfigServer configServer,
BackupService backupService
public class SaveCallbacks(
SaveServer _saveServer,
ConfigServer _configServer,
BackupService _backupService
)
{
_saveServer = saveServer;
_coreConfig = configServer.GetConfig<CoreConfig>();
_backupService = backupService;
}
: OnLoad, OnUpdate
{
private readonly CoreConfig _coreConfig = _configServer.GetConfig<CoreConfig>();
public async Task OnLoad()
{
_backupService.InitAsync();
await _backupService.InitAsync();
_saveServer.Load();
}
public async Task<bool> OnUpdate(long SecondsSinceLastRun)
public Task<bool> OnUpdate(long SecondsSinceLastRun)
{
if (SecondsSinceLastRun > _coreConfig.ProfileSaveIntervalInSeconds)
{
_saveServer.Save();
return true;
return Task.FromResult(true);
}
return false;
return Task.FromResult(false);
}
public string GetRoute()