From 0b4a231b712086bab9ccc63a2603faa08c8ce854 Mon Sep 17 00:00:00 2001 From: CWX Date: Tue, 7 Jan 2025 12:51:59 +0000 Subject: [PATCH] more callbacks --- Core/Callbacks/BotCallbacks.cs | 5 ++ Core/Callbacks/DialogCallbacks.cs | 12 +++-- Core/Callbacks/GameCallbacks.cs | 5 +- Core/Callbacks/HandbookCallbacks.cs | 18 +++++-- Core/Callbacks/HideoutCallbacks.cs | 7 +-- Core/Callbacks/HttpCallbacks.cs | 11 +++- Core/Callbacks/InsuranceCallbacks.cs | 7 +-- Core/Callbacks/InventoryCallbacks.cs | 5 ++ Core/Callbacks/ItemEventCallbacks.cs | 5 ++ Core/Callbacks/LauncherCallbacks.cs | 5 ++ Core/Callbacks/LocationCallbacks.cs | 5 ++ Core/Callbacks/MatchCallbacks.cs | 5 ++ Core/Callbacks/ModCallbacks.cs | 25 ++++------ Core/Callbacks/NoteCallbacks.cs | 11 +++- Core/Callbacks/NotifierCallbacks.cs | 20 ++++++-- Core/Callbacks/PresetBuildCallbacks.cs | 29 ----------- Core/Callbacks/PresetCallbacks.cs | 18 +++++-- Core/Callbacks/PrestigeCallbacks.cs | 23 +++++++++ Core/Callbacks/ProfileCallbacks.cs | 40 +++++++++++---- Core/Callbacks/QuestCallbacks.cs | 11 +++- Core/Callbacks/RagfairCallbacks.cs | 50 ++++++++++++++++--- Core/Callbacks/RepairCallbacks.cs | 11 +++- Core/Callbacks/SaveCallbacks.cs | 23 +++++++-- Core/Callbacks/TradeCallbacks.cs | 18 ++++++- Core/Callbacks/TraderCallbacks.cs | 29 +++++++++-- Core/Callbacks/WeatherCallbacks.cs | 19 ++++++- Core/Callbacks/WishlistCallbacks.cs | 28 +++++++++++ .../Eft/Launcher/GetMiniProfileRequestData.cs | 12 +++++ Core/Models/Eft/Ragfair/SearchRequestData.cs | 1 + Core/Models/Eft/Ws/WsChatMessageReceived.cs | 1 + Core/Models/Eft/Ws/WsFriendListAccept.cs | 1 + .../Models/Eft/Ws/WsGroupMatchInviteAccept.cs | 4 +- Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs | 1 + Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs | 1 + .../Models/Eft/Ws/WsGroupMatchRaidSettings.cs | 1 + Core/Models/Eft/Ws/WsUserConfirmed.cs | 1 + Core/Models/Enums/ProfileStatus.cs | 10 ++++ Core/Models/Enums/RagfairSort.cs | 11 ++++ 38 files changed, 388 insertions(+), 101 deletions(-) delete mode 100644 Core/Callbacks/PresetBuildCallbacks.cs create mode 100644 Core/Callbacks/PrestigeCallbacks.cs create mode 100644 Core/Callbacks/WishlistCallbacks.cs create mode 100644 Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs create mode 100644 Core/Models/Enums/ProfileStatus.cs create mode 100644 Core/Models/Enums/RagfairSort.cs diff --git a/Core/Callbacks/BotCallbacks.cs b/Core/Callbacks/BotCallbacks.cs index 26cded72..be24b8b3 100644 --- a/Core/Callbacks/BotCallbacks.cs +++ b/Core/Callbacks/BotCallbacks.cs @@ -7,6 +7,11 @@ namespace Core.Callbacks; public class BotCallbacks { + public BotCallbacks() + { + + } + public string GetBotLimit(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/DialogCallbacks.cs b/Core/Callbacks/DialogCallbacks.cs index e1d68160..f4ad169e 100644 --- a/Core/Callbacks/DialogCallbacks.cs +++ b/Core/Callbacks/DialogCallbacks.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.DI; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Request; using Core.Models.Eft.Dialog; using Core.Models.Eft.HttpResponse; @@ -6,8 +7,13 @@ using Core.Models.Eft.Profile; namespace Core.Callbacks; -public class DialogCallbacks +public class DialogCallbacks : OnUpdate { + public DialogCallbacks() + { + + } + public GetBodyResponseData GetFriendList(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); @@ -143,7 +149,7 @@ public class DialogCallbacks throw new NotImplementedException(); } - public async Task OnUpdate(int timeSinceLastRun) + public async Task OnUpdate(long timeSinceLastRun) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/GameCallbacks.cs b/Core/Callbacks/GameCallbacks.cs index 81e37135..ee348b91 100644 --- a/Core/Callbacks/GameCallbacks.cs +++ b/Core/Callbacks/GameCallbacks.cs @@ -1,11 +1,12 @@ -using Core.Models.Eft.Common; +using Core.DI; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Request; using Core.Models.Eft.Game; using Core.Models.Eft.HttpResponse; namespace Core.Callbacks; -public class GameCallbacks +public class GameCallbacks : OnLoad { public GameCallbacks() { diff --git a/Core/Callbacks/HandbookCallbacks.cs b/Core/Callbacks/HandbookCallbacks.cs index c96ad773..ae685b43 100644 --- a/Core/Callbacks/HandbookCallbacks.cs +++ b/Core/Callbacks/HandbookCallbacks.cs @@ -1,8 +1,20 @@ -namespace Core.Callbacks; +using Core.DI; -public class HandbookCallbacks +namespace Core.Callbacks; + +public class HandbookCallbacks : OnLoad { - public void Load() + public HandbookCallbacks() + { + + } + + public Task OnLoad() + { + throw new NotImplementedException(); + } + + public string GetRoute() { throw new NotImplementedException(); } diff --git a/Core/Callbacks/HideoutCallbacks.cs b/Core/Callbacks/HideoutCallbacks.cs index fbbc42f1..f7167cf3 100644 --- a/Core/Callbacks/HideoutCallbacks.cs +++ b/Core/Callbacks/HideoutCallbacks.cs @@ -1,11 +1,12 @@ -using Core.Models.Eft.Common; +using Core.DI; +using Core.Models.Eft.Common; using Core.Models.Eft.Hideout; using Core.Models.Eft.ItemEvent; using Core.Models.Spt.Config; namespace Core.Callbacks; -public class HideoutCallbacks +public class HideoutCallbacks : OnUpdate { private HideoutConfig _hideoutConfig; @@ -94,7 +95,7 @@ public class HideoutCallbacks throw new NotImplementedException(); } - public async Task OnUpdate(int timeSinceLastRun) + public async Task OnUpdate(long timeSinceLastRun) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/HttpCallbacks.cs b/Core/Callbacks/HttpCallbacks.cs index 05acc4ff..2f355169 100644 --- a/Core/Callbacks/HttpCallbacks.cs +++ b/Core/Callbacks/HttpCallbacks.cs @@ -1,7 +1,14 @@ -namespace Core.Callbacks; +using Core.DI; -public class HttpCallbacks +namespace Core.Callbacks; + +public class HttpCallbacks : OnLoad { + public HttpCallbacks() + { + + } + public async Task OnLoad() { throw new NotImplementedException(); diff --git a/Core/Callbacks/InsuranceCallbacks.cs b/Core/Callbacks/InsuranceCallbacks.cs index 68aa571b..3bfe0e7f 100644 --- a/Core/Callbacks/InsuranceCallbacks.cs +++ b/Core/Callbacks/InsuranceCallbacks.cs @@ -1,4 +1,5 @@ -using Core.Models.Eft.Common; +using Core.DI; +using Core.Models.Eft.Common; using Core.Models.Eft.HttpResponse; using Core.Models.Eft.Insurance; using Core.Models.Eft.ItemEvent; @@ -6,7 +7,7 @@ using Core.Models.Spt.Config; namespace Core.Callbacks; -public class InsuranceCallbacks +public class InsuranceCallbacks : OnUpdate { private InsuranceConfig _insuranceConfig; @@ -25,7 +26,7 @@ public class InsuranceCallbacks throw new NotImplementedException(); } - public async Task OnUpdate(int secondsSinceLastRun) + public Task OnUpdate(long timeSinceLastRun) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/InventoryCallbacks.cs b/Core/Callbacks/InventoryCallbacks.cs index cdccefb2..69f97ea0 100644 --- a/Core/Callbacks/InventoryCallbacks.cs +++ b/Core/Callbacks/InventoryCallbacks.cs @@ -7,6 +7,11 @@ namespace Core.Callbacks; public class InventoryCallbacks { + public InventoryCallbacks() + { + + } + public ItemEventRouterResponse MoveItem(PmcData pmcData, InventoryMoveRequestData info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/ItemEventCallbacks.cs b/Core/Callbacks/ItemEventCallbacks.cs index df9697ae..fd8ce150 100644 --- a/Core/Callbacks/ItemEventCallbacks.cs +++ b/Core/Callbacks/ItemEventCallbacks.cs @@ -5,6 +5,11 @@ namespace Core.Callbacks; public class ItemEventCallbacks { + public ItemEventCallbacks() + { + + } + public async Task> HandleEvents(string url, ItemEventRouterRequest info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/LauncherCallbacks.cs b/Core/Callbacks/LauncherCallbacks.cs index 9d7ed912..84bee578 100644 --- a/Core/Callbacks/LauncherCallbacks.cs +++ b/Core/Callbacks/LauncherCallbacks.cs @@ -5,6 +5,11 @@ namespace Core.Callbacks; public class LauncherCallbacks { + public LauncherCallbacks() + { + + } + public string Connect() { throw new NotImplementedException(); diff --git a/Core/Callbacks/LocationCallbacks.cs b/Core/Callbacks/LocationCallbacks.cs index 5adc014a..bf3809df 100644 --- a/Core/Callbacks/LocationCallbacks.cs +++ b/Core/Callbacks/LocationCallbacks.cs @@ -7,6 +7,11 @@ namespace Core.Callbacks; public class LocationCallbacks { + public LocationCallbacks() + { + + } + public GetBodyResponseData GetLocationData(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/MatchCallbacks.cs b/Core/Callbacks/MatchCallbacks.cs index d43061bc..d081af3a 100644 --- a/Core/Callbacks/MatchCallbacks.cs +++ b/Core/Callbacks/MatchCallbacks.cs @@ -7,6 +7,11 @@ namespace Core.Callbacks; public class MatchCallbacks { + public MatchCallbacks() + { + + } + public NullResponseData UpdatePing(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/ModCallbacks.cs b/Core/Callbacks/ModCallbacks.cs index 51ed7d55..8c2d0d5d 100644 --- a/Core/Callbacks/ModCallbacks.cs +++ b/Core/Callbacks/ModCallbacks.cs @@ -1,23 +1,20 @@ -namespace Core.Callbacks; +using Core.DI; -public class ModCallbacks +namespace Core.Callbacks; + +public class ModCallbacks : OnLoad { - public void Load() + public ModCallbacks() + { + + } + + public async Task OnLoad() { throw new NotImplementedException(); } - public void SendBundle(string sessionID, object req, object resp, object body) - { - throw new NotImplementedException(); - } - - public string GetBundles(string url, object info, string sessionID) - { - throw new NotImplementedException(); - } - - public string GetBundle(string url, object info, string sessionID) + public string GetRoute() { throw new NotImplementedException(); } diff --git a/Core/Callbacks/NoteCallbacks.cs b/Core/Callbacks/NoteCallbacks.cs index 273811ea..d6b6fe27 100644 --- a/Core/Callbacks/NoteCallbacks.cs +++ b/Core/Callbacks/NoteCallbacks.cs @@ -1,7 +1,16 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.ItemEvent; +using Core.Models.Eft.Notes; + +namespace Core.Callbacks; public class NoteCallbacks { + public NoteCallbacks() + { + + } + public ItemEventRouterResponse AddNote(PmcData pmcData, NoteActionData info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/NotifierCallbacks.cs b/Core/Callbacks/NotifierCallbacks.cs index 30126c9a..05f2e1f4 100644 --- a/Core/Callbacks/NotifierCallbacks.cs +++ b/Core/Callbacks/NotifierCallbacks.cs @@ -1,19 +1,29 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.Common.Request; +using Core.Models.Eft.HttpResponse; +using Core.Models.Eft.Notifier; + +namespace Core.Callbacks; public class NotifierCallbacks { + public NotifierCallbacks() + { + + } + /** * If we don't have anything to send, it's ok to not send anything back * because notification requests can be long-polling. In fact, we SHOULD wait * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - public void SendNotification(string sessionID, object req, object resp, object data) + public void SendNotification(string sessionID, object req, object resp, object data) // TODO: no types were given { throw new NotImplementedException(); } - public GetBodyResponseData> GetNotifier(string url, object info, string sessionID) + public GetBodyResponseData> GetNotifier(string url, object info, string sessionID) // TODO: no types were given { throw new NotImplementedException(); } @@ -23,12 +33,12 @@ public class NotifierCallbacks throw new NotImplementedException(); } - public GetBodyResponseData SelectProfile(string url, UIDRequestData info, string sessionID) + public GetBodyResponseData SelectProfile(string url, UIDRequestData info, string sessionID) { throw new NotImplementedException(); } - public string Notify(string url, object info, string sessionID) + public string Notify(string url, object info, string sessionID) // TODO: no types were given { throw new NotImplementedException(); } diff --git a/Core/Callbacks/PresetBuildCallbacks.cs b/Core/Callbacks/PresetBuildCallbacks.cs deleted file mode 100644 index b978fd09..00000000 --- a/Core/Callbacks/PresetBuildCallbacks.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Core.Callbacks; - -public class PresetBuildCallbacks -{ - public GetBodyResponseData> GetHandbookUserList(string url, object info, string sessionID) - { - throw new NotImplementedException(); - } - - public ItemEventRouterResponse SaveWeaponBuild(PmcData pmcData, PresetBuildActionRequestData info, string sessionID) - { - throw new NotImplementedException(); - } - - public ItemEventRouterResponse RemoveWeaponBuild(PmcData pmcData, PresetBuildActionRequestData info, string sessionID) - { - throw new NotImplementedException(); - } - - public ItemEventRouterResponse SaveEquipmentBuild(PmcData pmcData, PresetBuildActionRequestData info, string sessionID) - { - throw new NotImplementedException(); - } - - public ItemEventRouterResponse RemoveEquipmentBuild(PmcData pmcData, PresetBuildActionRequestData info, string sessionID) - { - throw new NotImplementedException(); - } -} \ No newline at end of file diff --git a/Core/Callbacks/PresetCallbacks.cs b/Core/Callbacks/PresetCallbacks.cs index 1aaec89e..e5de9fff 100644 --- a/Core/Callbacks/PresetCallbacks.cs +++ b/Core/Callbacks/PresetCallbacks.cs @@ -1,8 +1,20 @@ -namespace Core.Callbacks; +using Core.DI; -public class PresetCallbacks +namespace Core.Callbacks; + +public class PresetCallbacks : OnLoad { - public void Load() + public PresetCallbacks() + { + + } + + public async Task OnLoad() + { + throw new NotImplementedException(); + } + + public string GetRoute() { throw new NotImplementedException(); } diff --git a/Core/Callbacks/PrestigeCallbacks.cs b/Core/Callbacks/PrestigeCallbacks.cs new file mode 100644 index 00000000..296999fb --- /dev/null +++ b/Core/Callbacks/PrestigeCallbacks.cs @@ -0,0 +1,23 @@ +using Core.Models.Eft.Common; +using Core.Models.Eft.Common.Tables; +using Core.Models.Eft.HttpResponse; + +namespace Core.Callbacks; + +public class PrestigeCallbacks +{ + public PrestigeCallbacks() + { + + } + + public GetBodyResponseData GetPrestige(string url, EmptyRequestData info, string sessionID) + { + throw new NotImplementedException(); + } + + public GetBodyResponseData ObtainPrestige(string url, EmptyRequestData info, string sessionID) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Callbacks/ProfileCallbacks.cs b/Core/Callbacks/ProfileCallbacks.cs index d2ae3a27..2ba71ef6 100644 --- a/Core/Callbacks/ProfileCallbacks.cs +++ b/Core/Callbacks/ProfileCallbacks.cs @@ -1,17 +1,22 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.HttpResponse; +using Core.Models.Eft.Launcher; +using Core.Models.Eft.Profile; + +namespace Core.Callbacks; public class ProfileCallbacks { - public object OnLoad(string sessionID) + public ProfileCallbacks() + { + + } + + public GetBodyResponseData CreateProfile(string url, ProfileCreateRequestData info, string sessionID) { throw new NotImplementedException(); } - - public GetBodyResponseData CreateProfile(string url, ProfileCreateRequestData info, string sessionID) - { - throw new NotImplementedException(); - } - + public GetBodyResponseData GetProfileData(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); @@ -41,8 +46,13 @@ public class ProfileCallbacks { throw new NotImplementedException(); } - - public GetBodyResponseData GetProfileStatus(string url, EmptyRequestData info, string sessionID) + + public GetBodyResponseData GetOtherProfile(string url, GetOtherProfileRequest info, string sessionID) + { + throw new NotImplementedException(); + } + + public GetBodyResponseData GetProfileSettings(string url, GetProfileSettingsRequest info, string sessionID) { throw new NotImplementedException(); } @@ -51,4 +61,14 @@ public class ProfileCallbacks { throw new NotImplementedException(); } + + public string GetMiniProfile(string url, GetMiniProfileRequestData info, string sessionID) + { + throw new NotImplementedException(); + } + + public string GetAllMiniProfiles(string url, EmptyRequestData info, string sessionID) + { + throw new NotImplementedException(); + } } \ No newline at end of file diff --git a/Core/Callbacks/QuestCallbacks.cs b/Core/Callbacks/QuestCallbacks.cs index f73c6f7e..23d58e38 100644 --- a/Core/Callbacks/QuestCallbacks.cs +++ b/Core/Callbacks/QuestCallbacks.cs @@ -1,9 +1,18 @@ -using Core.Models.Eft.Common.Tables; +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; namespace Core.Callbacks; public class QuestCallbacks { + public QuestCallbacks() + { + + } + public ItemEventRouterResponse ChangeRepeatableQuest(PmcData pmcData, RepeatableQuestChangeRequest info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/RagfairCallbacks.cs b/Core/Callbacks/RagfairCallbacks.cs index d49f9cff..7e4240e5 100644 --- a/Core/Callbacks/RagfairCallbacks.cs +++ b/Core/Callbacks/RagfairCallbacks.cs @@ -1,13 +1,37 @@ -namespace Core.Callbacks; +using Core.DI; +using Core.Models.Eft.Common; +using Core.Models.Eft.HttpResponse; +using Core.Models.Eft.ItemEvent; +using Core.Models.Eft.Ragfair; +using Core.Models.Spt.Config; -public class RagfairCallbacks +namespace Core.Callbacks; + +public class RagfairCallbacks : OnLoad, OnUpdate { - public void Load() + private RagfairConfig _ragfairConfig; + + public RagfairCallbacks() + { + + } + + public async Task OnLoad() { throw new NotImplementedException(); } - public GetBodyResponseData Search(string url, SearchRequestData info, string sessionID) + public string GetRoute() + { + throw new NotImplementedException(); + } + + public async Task OnUpdate(long timeSinceLastRun) + { + throw new NotImplementedException(); + } + + public GetBodyResponseData Search(string url, SearchRequestData info, string sessionID) { throw new NotImplementedException(); } @@ -17,12 +41,12 @@ public class RagfairCallbacks throw new NotImplementedException(); } - public GetBodyResponseData GetItemPrices(string url, EmptyRequestData info, string sessionID) + public ItemEventRouterResponse AddOffer(string url, AddOfferRequestData info, string sessionID) { throw new NotImplementedException(); } - public ItemEventRouterResponse AddOffer(string url, AddOfferRequestData info, string sessionID) + public ItemEventRouterResponse RemoveOffer(string url, RemoveOfferRequestData info, string sessionID) { throw new NotImplementedException(); } @@ -32,12 +56,22 @@ public class RagfairCallbacks throw new NotImplementedException(); } - public bool Update(int timeSinceLastRun) + public GetBodyResponseData> GetFleaPrices(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); } - public bool UpdatePlayer(int timeSinceLastRun) + public NullResponseData SendReport(string url, SendRagfairReportRequestData info, string sessionID) + { + throw new NotImplementedException(); + } + + public NullResponseData StorePlayerOfferTaxAmount(string url, StorePlayerOfferTaxAmountRequestData info, string sessionID) + { + throw new NotImplementedException(); + } + + public GetBodyResponseData GetFleaOfferById(string url, GetRagfairOfferByIdRequest info, string sessionID) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/RepairCallbacks.cs b/Core/Callbacks/RepairCallbacks.cs index aabe0a89..af547f47 100644 --- a/Core/Callbacks/RepairCallbacks.cs +++ b/Core/Callbacks/RepairCallbacks.cs @@ -1,7 +1,16 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.ItemEvent; +using Core.Models.Eft.Repair; + +namespace Core.Callbacks; public class RepairCallbacks { + public RepairCallbacks() + { + + } + public ItemEventRouterResponse TraderRepair(PmcData pmcData, TraderRepairActionDataRequest info, string sessionID) { throw new NotImplementedException(); diff --git a/Core/Callbacks/SaveCallbacks.cs b/Core/Callbacks/SaveCallbacks.cs index 2658de03..63ff188c 100644 --- a/Core/Callbacks/SaveCallbacks.cs +++ b/Core/Callbacks/SaveCallbacks.cs @@ -1,13 +1,28 @@ -namespace Core.Callbacks; +using Core.DI; +using Core.Models.Spt.Config; -public class SaveCallbacks +namespace Core.Callbacks; + +public class SaveCallbacks : OnLoad, OnUpdate { - public void Load() + private CoreConfig _coreConfig; + + public SaveCallbacks() + { + + } + + public async Task OnLoad() { throw new NotImplementedException(); } - public bool Update(int SecondsSinceLastRun) + public async Task OnUpdate(long SecondsSinceLastRun) + { + throw new NotImplementedException(); + } + + public string GetRoute() { throw new NotImplementedException(); } diff --git a/Core/Callbacks/TradeCallbacks.cs b/Core/Callbacks/TradeCallbacks.cs index a234400c..8a62a3fc 100644 --- a/Core/Callbacks/TradeCallbacks.cs +++ b/Core/Callbacks/TradeCallbacks.cs @@ -1,8 +1,17 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.ItemEvent; +using Core.Models.Eft.Trade; + +namespace Core.Callbacks; public class TradeCallbacks { - public ItemEventRouterReponse ProcessTrade(PmcData pmcData, ProcessBaseTradeRequestData info, string sessionID) + public TradeCallbacks() + { + + } + + public ItemEventRouterResponse ProcessTrade(PmcData pmcData, ProcessBaseTradeRequestData info, string sessionID) { throw new NotImplementedException(); } @@ -11,4 +20,9 @@ public class TradeCallbacks { throw new NotImplementedException(); } + + public ItemEventRouterResponse SellAllFromSavage(PmcData pmcData, SellScavItemsToFenceRequestData info, string sessionID) + { + throw new NotImplementedException(); + } } \ No newline at end of file diff --git a/Core/Callbacks/TraderCallbacks.cs b/Core/Callbacks/TraderCallbacks.cs index da66dc57..7551c929 100644 --- a/Core/Callbacks/TraderCallbacks.cs +++ b/Core/Callbacks/TraderCallbacks.cs @@ -1,12 +1,33 @@ -namespace Core.Callbacks; +using Core.DI; +using Core.Models.Eft.Common; +using Core.Models.Eft.Common.Tables; +using Core.Models.Eft.HttpResponse; +using Core.Models.Spt.Config; -public class TraderCallbacks +namespace Core.Callbacks; + +public class TraderCallbacks : OnLoad, OnUpdate { - public void Load() + public TraderCallbacks() + { + + } + + public async Task OnLoad() { throw new NotImplementedException(); } + public async Task OnUpdate(long _) + { + throw new NotImplementedException(); + } + + public string GetRoute() + { + throw new NotImplementedException(); + } + public GetBodyResponseData> GetTraderSettings(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); @@ -22,7 +43,7 @@ public class TraderCallbacks throw new NotImplementedException(); } - public bool Update() + public GetBodyResponseData GetModdedTraderData(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/WeatherCallbacks.cs b/Core/Callbacks/WeatherCallbacks.cs index a53b8c9c..df26965d 100644 --- a/Core/Callbacks/WeatherCallbacks.cs +++ b/Core/Callbacks/WeatherCallbacks.cs @@ -1,8 +1,23 @@ -namespace Core.Callbacks; +using Core.Models.Eft.Common; +using Core.Models.Eft.HttpResponse; +using Core.Models.Eft.Weather; +using Core.Models.Spt.Weather; + +namespace Core.Callbacks; public class WeatherCallbacks { - public GetBodyResponseData GetWeather(string url, EmptyRequestData info, string sessionID) + public WeatherCallbacks() + { + + } + + public GetBodyResponseData GetWeather(string url, EmptyRequestData info, string sessionID) + { + throw new NotImplementedException(); + } + + public GetBodyResponseData GetLocalWeather(string url, EmptyRequestData info, string sessionID) { throw new NotImplementedException(); } diff --git a/Core/Callbacks/WishlistCallbacks.cs b/Core/Callbacks/WishlistCallbacks.cs new file mode 100644 index 00000000..ed03271c --- /dev/null +++ b/Core/Callbacks/WishlistCallbacks.cs @@ -0,0 +1,28 @@ +using Core.Models.Eft.Common; +using Core.Models.Eft.ItemEvent; +using Core.Models.Eft.Wishlist; + +namespace Core.Callbacks; + +public class WishlistCallbacks +{ + public WishlistCallbacks() + { + + } + + public ItemEventRouterResponse AddToWishlist(PmcData pmcData, AddToWishlistRequest info, string sessionID) + { + throw new NotImplementedException(); + } + + public ItemEventRouterResponse RemoveFromWishlist(PmcData pmcData, RemoveFromWishlistRequest info, string sessionID) + { + throw new NotImplementedException(); + } + + public ItemEventRouterResponse ChangeWishlistItemCategory(PmcData pmcData, ChangeWishlistItemCategoryRequest info, string sessionID) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs new file mode 100644 index 00000000..5b08e548 --- /dev/null +++ b/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace Core.Models.Eft.Launcher; + +public class GetMiniProfileRequestData +{ + [JsonPropertyName("username")] + public string Username { get; set; } + + [JsonPropertyName("password")] + public string Password { get; set; } +} \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/SearchRequestData.cs b/Core/Models/Eft/Ragfair/SearchRequestData.cs index 35928abf..fa37c184 100644 --- a/Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Enums; namespace Core.Models.Eft.Ragfair; diff --git a/Core/Models/Eft/Ws/WsChatMessageReceived.cs b/Core/Models/Eft/Ws/WsChatMessageReceived.cs index 7b00d922..da50426b 100644 --- a/Core/Models/Eft/Ws/WsChatMessageReceived.cs +++ b/Core/Models/Eft/Ws/WsChatMessageReceived.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Match; using Core.Models.Eft.Profile; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Eft/Ws/WsFriendListAccept.cs b/Core/Models/Eft/Ws/WsFriendListAccept.cs index 4161fa15..9d38d90e 100644 --- a/Core/Models/Eft/Ws/WsFriendListAccept.cs +++ b/Core/Models/Eft/Ws/WsFriendListAccept.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Profile; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs b/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs index dd213c6b..6adf16e2 100644 --- a/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs +++ b/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs @@ -1,5 +1,7 @@ +using Core.Models.Eft.Match; + namespace Core.Models.Eft.Ws; -public class WsGroupMatchInviteAccept : WsNotificationEvent, IGroupCharacter +public class WsGroupMatchInviteAccept : WsNotificationEvent, GroupCharacter // TODOL trying to inherit multiTypes { } \ No newline at end of file diff --git a/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs b/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs index 2364870d..21624403 100644 --- a/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs +++ b/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Match; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs b/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs index 4fddf596..f2f38ad6 100644 --- a/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs +++ b/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Match; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs b/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs index fb2dabf6..2559b72d 100644 --- a/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs +++ b/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Match; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Eft/Ws/WsUserConfirmed.cs b/Core/Models/Eft/Ws/WsUserConfirmed.cs index 9ed46840..6b814341 100644 --- a/Core/Models/Eft/Ws/WsUserConfirmed.cs +++ b/Core/Models/Eft/Ws/WsUserConfirmed.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Enums; namespace Core.Models.Eft.Ws; diff --git a/Core/Models/Enums/ProfileStatus.cs b/Core/Models/Enums/ProfileStatus.cs new file mode 100644 index 00000000..b9fc1774 --- /dev/null +++ b/Core/Models/Enums/ProfileStatus.cs @@ -0,0 +1,10 @@ +namespace Core.Models.Enums; + +public enum ProfileStatus +{ + FREE, + MATCH_WAIT, + BUSY, + LEAVING, + TRANSFER, +} \ No newline at end of file diff --git a/Core/Models/Enums/RagfairSort.cs b/Core/Models/Enums/RagfairSort.cs new file mode 100644 index 00000000..52b499c2 --- /dev/null +++ b/Core/Models/Enums/RagfairSort.cs @@ -0,0 +1,11 @@ +namespace Core.Models.Enums; + +public enum RagfairSort +{ + ID = 0, + BARTER = 2, + RATING = 3, + OFFER_TITLE = 4, + PRICE = 5, + EXPIRY = 6, +} \ No newline at end of file