From 31f2d9f8dca072b4e739fac60b05a941d914160a Mon Sep 17 00:00:00 2001 From: clodan Date: Tue, 21 Jan 2025 12:57:57 +0000 Subject: [PATCH] desync the itemeventrouter --- .../Core/Callbacks/ItemEventCallbacks.cs | 4 +- Libraries/Core/DI/Router.cs | 2 +- Libraries/Core/Routers/ItemEventRouter.cs | 4 +- .../CustomizationItemEventRouter.cs | 6 +-- .../ItemEvents/HealthItemEventRouter.cs | 8 ++-- .../ItemEvents/HideoutItemEventRouter.cs | 34 ++++++------- .../ItemEvents/InsuranceItemEventRouter.cs | 4 +- .../ItemEvents/InventoryItemEventRouter.cs | 48 +++++++++---------- .../Routers/ItemEvents/NoteItemEventRouter.cs | 8 ++-- .../ItemEvents/QuestItemEventRouter.cs | 10 ++-- .../ItemEvents/RagfairItemEventRouter.cs | 8 ++-- .../ItemEvents/RepairItemEventRouter.cs | 6 +-- .../ItemEvents/TradeItemEventRouter.cs | 8 ++-- .../ItemEvents/WishlistItemEventRouter.cs | 8 ++-- 14 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Libraries/Core/Callbacks/ItemEventCallbacks.cs b/Libraries/Core/Callbacks/ItemEventCallbacks.cs index 38d9cf26..ba203475 100644 --- a/Libraries/Core/Callbacks/ItemEventCallbacks.cs +++ b/Libraries/Core/Callbacks/ItemEventCallbacks.cs @@ -9,9 +9,9 @@ namespace Core.Callbacks; [Injectable] public class ItemEventCallbacks(HttpResponseUtil _httpResponseUtil, ItemEventRouter _itemEventRouter) { - public async Task HandleEvents(string url, ItemEventRouterRequest info, string sessionID) + public string HandleEvents(string url, ItemEventRouterRequest info, string sessionID) { - var eventResponse = await _itemEventRouter.HandleEvents(info, sessionID); + var eventResponse = _itemEventRouter.HandleEvents(info, sessionID); var result = IsCriticalError(eventResponse.Warnings) ? _httpResponseUtil.GetBody(eventResponse, GetErrorCode(eventResponse.Warnings), eventResponse.Warnings[0].ErrorMessage) : _httpResponseUtil.GetBody(eventResponse); diff --git a/Libraries/Core/DI/Router.cs b/Libraries/Core/DI/Router.cs index ce09ddb4..03112f87 100644 --- a/Libraries/Core/DI/Router.cs +++ b/Libraries/Core/DI/Router.cs @@ -101,7 +101,7 @@ public abstract class DynamicRouter : Router // So instead I added the definition public abstract class ItemEventRouterDefinition : Router { - public abstract Task? HandleItemEvent(string url, + public abstract ItemEventRouterResponse? HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, diff --git a/Libraries/Core/Routers/ItemEventRouter.cs b/Libraries/Core/Routers/ItemEventRouter.cs index ff091b08..6563f9ed 100644 --- a/Libraries/Core/Routers/ItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEventRouter.cs @@ -42,7 +42,7 @@ namespace Core.Routers _cloner = cloner; } - public async Task HandleEvents(ItemEventRouterRequest info, string sessionID) + public ItemEventRouterResponse HandleEvents(ItemEventRouterRequest info, string sessionID) { var output = _eventOutputHolder.GetOutput(sessionID); @@ -59,7 +59,7 @@ namespace Core.Routers } _logger.Debug($"event: { body.Action}"); - await eventRouter.HandleItemEvent(body.Action, pmcData, body, sessionID, output); + eventRouter.HandleItemEvent(body.Action, pmcData, body, sessionID, output); if (output.Warnings.Count > 0) { break; } diff --git a/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs index f9599509..65d5a9d8 100644 --- a/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs @@ -34,14 +34,14 @@ public class CustomizationItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "CustomizationBuy": - return Task.FromResult(_customizationCallbacks.BuyCustomisation(pmcData, body as BuyClothingRequestData, sessionID)); + return _customizationCallbacks.BuyCustomisation(pmcData, body as BuyClothingRequestData, sessionID); case "CustomizationSet": - return Task.FromResult(_customizationCallbacks.SetClothing(pmcData, body as CustomizationSetRequest, sessionID)); + return _customizationCallbacks.SetClothing(pmcData, body as CustomizationSetRequest, sessionID); default: throw new Exception($"CustomizationItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs index 796b727a..d878eacd 100644 --- a/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs @@ -31,16 +31,16 @@ public class HealthItemEventRouter : ItemEventRouterDefinition ]; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "Eat": - return Task.FromResult(_healthCallbacks.OffraidEat(pmcData, body as OffraidEatRequestData, sessionID)); + return _healthCallbacks.OffraidEat(pmcData, body as OffraidEatRequestData, sessionID); case "Heal": - return Task.FromResult(_healthCallbacks.OffraidHeal(pmcData, body as OffraidHealRequestData, sessionID)); + return _healthCallbacks.OffraidHeal(pmcData, body as OffraidHealRequestData, sessionID); case "RestoreHealth": - return Task.FromResult(_healthCallbacks.HealthTreatment(pmcData, body as HealthTreatmentRequestData, sessionID)); + return _healthCallbacks.HealthTreatment(pmcData, body as HealthTreatmentRequestData, sessionID); default: throw new Exception($"HealthItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs index 5a37a0cb..11c5a3fb 100644 --- a/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs @@ -44,41 +44,41 @@ public class HideoutItemEventRouter : ItemEventRouterDefinition ]; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case HideoutEventActions.HIDEOUT_UPGRADE: - return Task.FromResult(_hideoutCallbacks.Upgrade(pmcData, body as HideoutUpgradeRequestData, sessionID, output)); + return _hideoutCallbacks.Upgrade(pmcData, body as HideoutUpgradeRequestData, sessionID, output); case HideoutEventActions.HIDEOUT_UPGRADE_COMPLETE: - return Task.FromResult(_hideoutCallbacks.UpgradeComplete(pmcData, body as HideoutUpgradeCompleteRequestData, sessionID, output)); + return _hideoutCallbacks.UpgradeComplete(pmcData, body as HideoutUpgradeCompleteRequestData, sessionID, output); case HideoutEventActions.HIDEOUT_PUT_ITEMS_IN_AREA_SLOTS: - return Task.FromResult(_hideoutCallbacks.PutItemsInAreaSlots(pmcData, body as HideoutPutItemInRequestData, sessionID)); + return _hideoutCallbacks.PutItemsInAreaSlots(pmcData, body as HideoutPutItemInRequestData, sessionID); case HideoutEventActions.HIDEOUT_TAKE_ITEMS_FROM_AREA_SLOTS: - return Task.FromResult(_hideoutCallbacks.TakeItemsFromAreaSlots(pmcData, body as HideoutTakeItemOutRequestData, sessionID)); + return _hideoutCallbacks.TakeItemsFromAreaSlots(pmcData, body as HideoutTakeItemOutRequestData, sessionID); case HideoutEventActions.HIDEOUT_TOGGLE_AREA: - return Task.FromResult(_hideoutCallbacks.ToggleArea(pmcData, body as HideoutToggleAreaRequestData, sessionID)); + return _hideoutCallbacks.ToggleArea(pmcData, body as HideoutToggleAreaRequestData, sessionID); case HideoutEventActions.HIDEOUT_SINGLE_PRODUCTION_START: - return Task.FromResult(_hideoutCallbacks.SingleProductionStart(pmcData, body as HideoutSingleProductionStartRequestData, sessionID)); + return _hideoutCallbacks.SingleProductionStart(pmcData, body as HideoutSingleProductionStartRequestData, sessionID); case HideoutEventActions.HIDEOUT_SCAV_CASE_PRODUCTION_START: - return Task.FromResult(_hideoutCallbacks.ScavCaseProductionStart(pmcData, body as HideoutScavCaseStartRequestData, sessionID)); + return _hideoutCallbacks.ScavCaseProductionStart(pmcData, body as HideoutScavCaseStartRequestData, sessionID); case HideoutEventActions.HIDEOUT_CONTINUOUS_PRODUCTION_START: - return Task.FromResult(_hideoutCallbacks.ContinuousProductionStart(pmcData, body as HideoutContinuousProductionStartRequestData, sessionID)); + return _hideoutCallbacks.ContinuousProductionStart(pmcData, body as HideoutContinuousProductionStartRequestData, sessionID); case HideoutEventActions.HIDEOUT_TAKE_PRODUCTION: - return Task.FromResult(_hideoutCallbacks.TakeProduction(pmcData, body as HideoutTakeProductionRequestData, sessionID)); + return _hideoutCallbacks.TakeProduction(pmcData, body as HideoutTakeProductionRequestData, sessionID); case HideoutEventActions.HIDEOUT_RECORD_SHOOTING_RANGE_POINTS: - return Task.FromResult(_hideoutCallbacks.RecordShootingRangePoints(pmcData, body as RecordShootingRangePoints, sessionID, output)); + return _hideoutCallbacks.RecordShootingRangePoints(pmcData, body as RecordShootingRangePoints, sessionID, output); case HideoutEventActions.HIDEOUT_IMPROVE_AREA: - return Task.FromResult(_hideoutCallbacks.ImproveArea(pmcData, body as HideoutImproveAreaRequestData, sessionID)); + return _hideoutCallbacks.ImproveArea(pmcData, body as HideoutImproveAreaRequestData, sessionID); case HideoutEventActions.HIDEOUT_CANCEL_PRODUCTION_COMMAND: - return Task.FromResult(_hideoutCallbacks.CancelProduction(pmcData, body as HideoutImproveAreaRequestData, sessionID)); + return _hideoutCallbacks.CancelProduction(pmcData, body as HideoutImproveAreaRequestData, sessionID); case HideoutEventActions.HIDEOUT_CIRCLE_OF_CULTIST_PRODUCTION_START: - return Task.FromResult(_hideoutCallbacks.CicleOfCultistProductionStart(pmcData, body as HideoutCircleOfCultistProductionStartRequestData, sessionID)); + return _hideoutCallbacks.CicleOfCultistProductionStart(pmcData, body as HideoutCircleOfCultistProductionStartRequestData, sessionID); case HideoutEventActions.HIDEOUT_DELETE_PRODUCTION_COMMAND: - return Task.FromResult(_hideoutCallbacks.HideoutDeleteProductionCommand(pmcData, body as HideoutDeleteProductionRequestData, sessionID)); + return _hideoutCallbacks.HideoutDeleteProductionCommand(pmcData, body as HideoutDeleteProductionRequestData, sessionID); case HideoutEventActions.HIDEOUT_CUSTOMIZATION_APPLY_COMMAND: - return Task.FromResult(_hideoutCallbacks.HideoutCustomizationApplyCommand(pmcData, body as HideoutCustomizationApplyRequestData, sessionID)); + return _hideoutCallbacks.HideoutCustomizationApplyCommand(pmcData, body as HideoutCustomizationApplyRequestData, sessionID); case HideoutEventActions.HIDEOUT_CUSTOMIZATION_SET_MANNEQUIN_POSE: - return Task.FromResult(_hideoutCallbacks.HideoutCustomizationSetMannequinPose(pmcData, body as HideoutCustomizationSetMannequinPoseRequest, sessionID)); + return _hideoutCallbacks.HideoutCustomizationSetMannequinPose(pmcData, body as HideoutCustomizationSetMannequinPoseRequest, sessionID); default: throw new Exception($"HideoutItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs index df170d1d..719189a4 100644 --- a/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs @@ -29,12 +29,12 @@ public class InsuranceItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "Insure": - return Task.FromResult(_insuranceCallbacks.Insure(pmcData, body as InsureRequestData, sessionID)); + return _insuranceCallbacks.Insure(pmcData, body as InsureRequestData, sessionID); default: throw new Exception($"InsuranceItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs index 7c6f64c1..2e4c82dd 100644 --- a/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs @@ -57,55 +57,55 @@ public class InventoryItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case ItemEventActions.MOVE: - return Task.FromResult(_inventoryCallbacks.MoveItem(pmcData, body as InventoryMoveRequestData, sessionID, output)); + return _inventoryCallbacks.MoveItem(pmcData, body as InventoryMoveRequestData, sessionID, output); case ItemEventActions.REMOVE: - return Task.FromResult(_inventoryCallbacks.RemoveItem(pmcData, body as InventoryRemoveRequestData, sessionID, output)); + return _inventoryCallbacks.RemoveItem(pmcData, body as InventoryRemoveRequestData, sessionID, output); case ItemEventActions.SPLIT: - return Task.FromResult(_inventoryCallbacks.SplitItem(pmcData, body as InventorySplitRequestData, sessionID, output)); + return _inventoryCallbacks.SplitItem(pmcData, body as InventorySplitRequestData, sessionID, output); case ItemEventActions.MERGE: - return Task.FromResult(_inventoryCallbacks.MergeItem(pmcData, body as InventoryMergeRequestData, sessionID, output)); + return _inventoryCallbacks.MergeItem(pmcData, body as InventoryMergeRequestData, sessionID, output); case ItemEventActions.TRANSFER: - return Task.FromResult(_inventoryCallbacks.TransferItem(pmcData, body as InventoryTransferRequestData, sessionID, output)); + return _inventoryCallbacks.TransferItem(pmcData, body as InventoryTransferRequestData, sessionID, output); case ItemEventActions.SWAP: - return Task.FromResult(_inventoryCallbacks.SwapItem(pmcData, body as InventorySwapRequestData, sessionID)); + return _inventoryCallbacks.SwapItem(pmcData, body as InventorySwapRequestData, sessionID); case ItemEventActions.FOLD: - return Task.FromResult(_inventoryCallbacks.FoldItem(pmcData, body as InventoryFoldRequestData, sessionID)); + return _inventoryCallbacks.FoldItem(pmcData, body as InventoryFoldRequestData, sessionID); case ItemEventActions.TOGGLE: - return Task.FromResult(_inventoryCallbacks.ToggleItem(pmcData, body as InventoryToggleRequestData, sessionID)); + return _inventoryCallbacks.ToggleItem(pmcData, body as InventoryToggleRequestData, sessionID); case ItemEventActions.TAG: - return Task.FromResult(_inventoryCallbacks.TagItem(pmcData, body as InventoryTagRequestData, sessionID)); + return _inventoryCallbacks.TagItem(pmcData, body as InventoryTagRequestData, sessionID); case ItemEventActions.BIND: - return Task.FromResult(_inventoryCallbacks.BindItem(pmcData, body as InventoryBindRequestData, sessionID, output)); + return _inventoryCallbacks.BindItem(pmcData, body as InventoryBindRequestData, sessionID, output); case ItemEventActions.UNBIND: - return Task.FromResult(_inventoryCallbacks.UnBindItem(pmcData, body as InventoryBindRequestData, sessionID, output)); + return _inventoryCallbacks.UnBindItem(pmcData, body as InventoryBindRequestData, sessionID, output); case ItemEventActions.EXAMINE: - return Task.FromResult(_inventoryCallbacks.ExamineItem(pmcData, body as InventoryExamineRequestData, sessionID, output)); + return _inventoryCallbacks.ExamineItem(pmcData, body as InventoryExamineRequestData, sessionID, output); case ItemEventActions.READ_ENCYCLOPEDIA: - return Task.FromResult(_inventoryCallbacks.ReadEncyclopedia(pmcData, body as InventoryReadEncyclopediaRequestData, sessionID)); + return _inventoryCallbacks.ReadEncyclopedia(pmcData, body as InventoryReadEncyclopediaRequestData, sessionID); case ItemEventActions.APPLY_INVENTORY_CHANGES: - return Task.FromResult(_inventoryCallbacks.SortInventory(pmcData, body as InventorySortRequestData, sessionID, output)); + return _inventoryCallbacks.SortInventory(pmcData, body as InventorySortRequestData, sessionID, output); case ItemEventActions.CREATE_MAP_MARKER: - return Task.FromResult(_inventoryCallbacks.CreateMapMarker(pmcData, body as InventoryCreateMarkerRequestData, sessionID, output)); + return _inventoryCallbacks.CreateMapMarker(pmcData, body as InventoryCreateMarkerRequestData, sessionID, output); case ItemEventActions.DELETE_MAP_MARKER: - return Task.FromResult(_inventoryCallbacks.DeleteMapMarker(pmcData, body as InventoryDeleteMarkerRequestData, sessionID, output)); + return _inventoryCallbacks.DeleteMapMarker(pmcData, body as InventoryDeleteMarkerRequestData, sessionID, output); case ItemEventActions.EDIT_MAP_MARKER: - return Task.FromResult(_inventoryCallbacks.EditMapMarker(pmcData, body as InventoryEditMarkerRequestData, sessionID, output)); + return _inventoryCallbacks.EditMapMarker(pmcData, body as InventoryEditMarkerRequestData, sessionID, output); case ItemEventActions.OPEN_RANDOM_LOOT_CONTAINER: - return Task.FromResult(_inventoryCallbacks.OpenRandomLootContainer(pmcData, body as OpenRandomLootContainerRequestData, sessionID, output)); + return _inventoryCallbacks.OpenRandomLootContainer(pmcData, body as OpenRandomLootContainerRequestData, sessionID, output); case ItemEventActions.HIDEOUT_QTE_EVENT: - return Task.FromResult(_hideoutCallbacks.HandleQTEEvent(pmcData, body as HandleQTEEventRequestData, sessionID, output)); + return _hideoutCallbacks.HandleQTEEvent(pmcData, body as HandleQTEEventRequestData, sessionID, output); case ItemEventActions.REDEEM_PROFILE_REWARD: - return Task.FromResult(_inventoryCallbacks.RedeemProfileReward(pmcData, body as RedeemProfileRequestData, sessionID, output)); + return _inventoryCallbacks.RedeemProfileReward(pmcData, body as RedeemProfileRequestData, sessionID, output); case ItemEventActions.SET_FAVORITE_ITEMS: - return Task.FromResult(_inventoryCallbacks.SetFavoriteItem(pmcData, body as SetFavoriteItems, sessionID, output)); + return _inventoryCallbacks.SetFavoriteItem(pmcData, body as SetFavoriteItems, sessionID, output); case ItemEventActions.QUEST_FAIL: - return Task.FromResult(_inventoryCallbacks.FailQuest(pmcData, body as FailQuestRequestData, sessionID, output)); + return _inventoryCallbacks.FailQuest(pmcData, body as FailQuestRequestData, sessionID, output); case ItemEventActions.PIN_LOCK: - return Task.FromResult(_inventoryCallbacks.PinOrLock(pmcData, body as PinOrLockItemRequest, sessionID, output)); + return _inventoryCallbacks.PinOrLock(pmcData, body as PinOrLockItemRequest, sessionID, output); default: throw new Exception($"InventoryItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs index ba68f7eb..bf0b8cef 100644 --- a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs @@ -31,16 +31,16 @@ public class NoteItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "AddNote": - return Task.FromResult(_noteCallbacks.AddNote(pmcData, body as NoteActionData, sessionID)); + return _noteCallbacks.AddNote(pmcData, body as NoteActionData, sessionID); case "EditNote": - return Task.FromResult(_noteCallbacks.EditNote(pmcData, body as NoteActionData, sessionID)); + return _noteCallbacks.EditNote(pmcData, body as NoteActionData, sessionID); case "DeleteNote": - return Task.FromResult(_noteCallbacks.DeleteNote(pmcData, body as NoteActionData, sessionID)); + return _noteCallbacks.DeleteNote(pmcData, body as NoteActionData, sessionID); default: throw new Exception($"NoteItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs index a27aabca..c0bb08ca 100644 --- a/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs @@ -33,17 +33,17 @@ public class QuestItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "QuestAccept": - return Task.FromResult(_questCallbacks.AcceptQuest(pmcData, body as AcceptQuestRequestData, sessionID)); + return _questCallbacks.AcceptQuest(pmcData, body as AcceptQuestRequestData, sessionID); case "QuestComplete": - return Task.FromResult(_questCallbacks.CompleteQuest(pmcData, body as CompleteQuestRequestData, sessionID)); + return _questCallbacks.CompleteQuest(pmcData, body as CompleteQuestRequestData, sessionID); case "QuestHandover": - return Task.FromResult(_questCallbacks.HandoverQuest(pmcData, body as HandoverQuestRequestData, sessionID)); + return _questCallbacks.HandoverQuest(pmcData, body as HandoverQuestRequestData, sessionID); case "RepeatableQuestChange": - return Task.FromResult(_questCallbacks.ChangeRepeatableQuest(pmcData, body as RepeatableQuestChangeRequest, sessionID)); + return _questCallbacks.ChangeRepeatableQuest(pmcData, body as RepeatableQuestChangeRequest, sessionID); default: throw new Exception($"QuestItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs index 80205f24..c7ea6b42 100644 --- a/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs @@ -31,15 +31,15 @@ public class RagfairItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "RagFairAddOffer": - return Task.FromResult(_ragfairCallbacks.AddOffer(pmcData, body as AddOfferRequestData, sessionID)); + return _ragfairCallbacks.AddOffer(pmcData, body as AddOfferRequestData, sessionID); case "RagFairRemoveOffer": - return Task.FromResult(_ragfairCallbacks.RemoveOffer(pmcData, body as RemoveOfferRequestData, sessionID)); + return _ragfairCallbacks.RemoveOffer(pmcData, body as RemoveOfferRequestData, sessionID); case "RagFairRenewOffer": - return Task.FromResult(_ragfairCallbacks.ExtendOffer(pmcData, body as ExtendOfferRequestData, sessionID)); + return _ragfairCallbacks.ExtendOffer(pmcData, body as ExtendOfferRequestData, sessionID); default: throw new Exception($"CustomizationItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs index 6eec5201..e30f23cd 100644 --- a/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs @@ -30,13 +30,13 @@ public class RepairItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "Repair": - return Task.FromResult(_repairCallbacks.Repair(pmcData, body as RepairActionDataRequest, sessionID)); + return _repairCallbacks.Repair(pmcData, body as RepairActionDataRequest, sessionID); case "TraderRepair": - return Task.FromResult(_repairCallbacks.TraderRepair(pmcData, body as TraderRepairActionDataRequest, sessionID)); + return _repairCallbacks.TraderRepair(pmcData, body as TraderRepairActionDataRequest, sessionID); default: throw new Exception($"RepairItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs index fe9fbe98..f846b91d 100644 --- a/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs @@ -31,15 +31,15 @@ public class TradeItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "TradingConfirm": - return Task.FromResult(_tradeCallbacks.ProcessTrade(pmcData, body as ProcessBaseTradeRequestData, sessionID)); + return _tradeCallbacks.ProcessTrade(pmcData, body as ProcessBaseTradeRequestData, sessionID); case "RagFairBuyOffer": - return Task.FromResult(_tradeCallbacks.ProcessRagfairTrade(pmcData, body as ProcessRagfairTradeRequestData, sessionID)); + return _tradeCallbacks.ProcessRagfairTrade(pmcData, body as ProcessRagfairTradeRequestData, sessionID); case "SellAllFromSavage": - return Task.FromResult(_tradeCallbacks.SellAllFromSavage(pmcData, body as SellScavItemsToFenceRequestData, sessionID)); + return _tradeCallbacks.SellAllFromSavage(pmcData, body as SellScavItemsToFenceRequestData, sessionID); default: throw new Exception($"TradeItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs index 8cfba847..ad2c9b41 100644 --- a/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs @@ -31,16 +31,16 @@ public class WishlistItemEventRouter : ItemEventRouterDefinition }; } - public override Task HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) + public override ItemEventRouterResponse HandleItemEvent(string url, PmcData pmcData, BaseInteractionRequestData body, string sessionID, ItemEventRouterResponse output) { switch (url) { case "AddToWishList": - return Task.FromResult(_wishlistCallbacks.AddToWishlist(pmcData, body as AddToWishlistRequest, sessionID)); + return _wishlistCallbacks.AddToWishlist(pmcData, body as AddToWishlistRequest, sessionID); case "RemoveFromWishList": - return Task.FromResult(_wishlistCallbacks.RemoveFromWishlist(pmcData, body as RemoveFromWishlistRequest, sessionID)); + return _wishlistCallbacks.RemoveFromWishlist(pmcData, body as RemoveFromWishlistRequest, sessionID); case "ChangeWishlistItemCategory": - return Task.FromResult(_wishlistCallbacks.ChangeWishlistItemCategory(pmcData, body as ChangeWishlistItemCategoryRequest, sessionID)); + return _wishlistCallbacks.ChangeWishlistItemCategory(pmcData, body as ChangeWishlistItemCategoryRequest, sessionID); default: throw new Exception($"CustomizationItemEventRouter being used when it cant handle route {url}"); }