From 372e3874eb54a90098ed260de964329f1d4116d6 Mon Sep 17 00:00:00 2001 From: Lacyway <20912169+Lacyway@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:44:07 +0100 Subject: [PATCH 1/3] Prefix abstract classes with "Abstract" --- ...tController.cs => AbstractItemEventController.cs} | 4 ++-- .../Controllers/AccountGamesController.cs | 2 +- .../Controllers/AccountLogoutController.cs | 2 +- Fuyu.Backend.Core/Controllers/PingController.cs | 2 +- ...tpController.cs => AbstractCoreHttpController.cs} | 8 ++++---- .../Controllers/Http/AchievementListController.cs | 2 +- .../Http/AchievementStatisticController.cs | 2 +- .../Controllers/Http/BuildsListController.cs | 2 +- .../Controllers/Http/CheckVersionController.cs | 2 +- .../Controllers/Http/ClientItemsPriceController.cs | 2 +- .../Controllers/Http/CustomizationController.cs | 2 +- .../Http/CustomizationStorageController.cs | 2 +- Fuyu.Backend.EFT/Controllers/Http/FilesController.cs | 2 +- .../Controllers/Http/FriendListController.cs | 2 +- .../Http/FriendRequestListInboxController.cs | 2 +- .../Http/FriendRequestListOutboxController.cs | 2 +- .../Controllers/Http/GameConfigController.cs | 2 +- .../Controllers/Http/GameKeepaliveController.cs | 2 +- .../Controllers/Http/GameLogoutController.cs | 2 +- .../Controllers/Http/GameProfileListController.cs | 2 +- .../Http/GameProfileNicknameReservedController.cs | 2 +- .../Controllers/Http/GameProfileSelectController.cs | 2 +- .../Controllers/Http/GameStartController.cs | 2 +- .../Http/GameVersionValidateController.cs | 2 +- .../Controllers/Http/GetMetricsConfigController.cs | 2 +- .../Controllers/Http/GetTraderAssortController.cs | 2 +- .../Controllers/Http/GlobalsController.cs | 2 +- .../Controllers/Http/HandbookTemplatesController.cs | 2 +- .../Controllers/Http/HideoutAreasController.cs | 2 +- .../Http/HideoutCustomizationOferListController.cs | 2 +- .../Http/HideoutProductionRecipesController.cs | 2 +- .../Controllers/Http/HideoutQteListController.cs | 2 +- .../Controllers/Http/HideoutSettingsController.cs | 2 +- Fuyu.Backend.EFT/Controllers/Http/ItemsController.cs | 2 +- .../Controllers/Http/LanguagesController.cs | 2 +- .../Controllers/Http/LocalGameWeatherController.cs | 2 +- .../Controllers/Http/LocaleController.cs | 2 +- .../Controllers/Http/LocationsController.cs | 2 +- .../Controllers/Http/MailDialogListController.cs | 2 +- .../Controllers/Http/MatchGroupCurrentController.cs | 2 +- .../Http/MatchGroupExitFromMenuController.cs | 2 +- .../Http/MatchGroupInviteCancelAllController.cs | 2 +- .../Controllers/Http/MenuLocaleController.cs | 2 +- .../Http/NotifierChannelCreateController.cs | 2 +- .../Controllers/Http/PrestigeListController.cs | 2 +- .../Controllers/Http/ProfileSettingsController.cs | 2 +- .../Controllers/Http/ProfileStatusController.cs | 2 +- .../Controllers/Http/PutMetricsController.cs | 2 +- .../Controllers/Http/QuestListController.cs | 2 +- .../Controllers/Http/RaidConfigurationController.cs | 2 +- .../Http/RepeatableQuestActivityPeriodsController.cs | 2 +- .../Controllers/Http/ServerListController.cs | 2 +- .../Controllers/Http/SettingsController.cs | 2 +- .../Controllers/Http/SurveyController.cs | 2 +- .../Controllers/Http/TraderSettingsController.cs | 2 +- .../Controllers/Http/WeatherController.cs | 2 +- .../ItemEvents/AddNoteItemEventController.cs | 2 +- .../ItemEvents/AddToWishListItemEventController.cs | 2 +- .../ApplyInventoryChangesItemEventController.cs | 2 +- .../ItemEvents/BindItemEventController.cs | 2 +- .../ChangeWishlistItemCategoryItemEventController.cs | 2 +- .../CustomizationBuyItemEventController.cs | 2 +- .../ItemEvents/DeleteNoteItemEventController.cs | 2 +- .../Controllers/ItemEvents/EatItemEventController.cs | 2 +- .../ItemEvents/EditNoteItemEventController.cs | 2 +- .../ItemEvents/ExamineItemEventController.cs | 2 +- .../ItemEvents/FoldItemEventController.cs | 2 +- .../ItemEvents/InsureItemEventController.cs | 2 +- .../ItemEvents/InterGameTransferEventController.cs | 2 +- .../ItemEvents/MoveItemEventController.cs | 2 +- .../ReadEncyclopediaItemEventController.cs | 2 +- .../ItemEvents/RecodeItemEventController.cs | 2 +- .../RemoveFromWishListItemEventController.cs | 2 +- .../ItemEvents/RemoveItemEventController.cs | 2 +- .../SellAllFromSavageItemEventController.cs | 2 +- .../Controllers/ItemEvents/TagItemEventController.cs | 2 +- .../ItemEvents/ToggleItemEventController.cs | 2 +- .../ItemEvents/TraderRepairItemEventController.cs | 2 +- .../ItemEvents/TradingConfirmItemEventController.cs | 2 +- .../ItemEvents/UnbindItemEventController.cs | 2 +- ...ttpController.cs => AbstractEftHttpController.cs} | 8 ++++---- .../{HttpController.cs => AbstractHttpController.cs} | 8 ++++---- .../{WebController.cs => AbstractWebController.cs} | 6 +++--- Fuyu.Common/Networking/HttpRouter.cs | 2 +- Fuyu.Common/Networking/WsController.cs | 2 +- Fuyu.DependencyInjection/DependencyContainer.cs | 12 ++++++------ ...stration.cs => AbstractDependencyRegistration.cs} | 2 +- .../Registrations/SingletonRegistration.cs | 2 +- .../Registrations/TransientRegistration.cs | 2 +- Fuyu.Modding/{Mod.cs => AbstractMod.cs} | 2 +- Fuyu.Modding/Extensions.cs | 4 ++-- Fuyu.Modding/ModManager.cs | 8 ++++---- Fuyu.Plugin.Arena/ArenaMod.cs | 6 +++--- Fuyu.Plugin.Arena/Patches/BattleEyePatch.cs | 2 +- Fuyu.Plugin.Arena/Patches/ConsistencyGeneralPatch.cs | 2 +- .../Reflection/{APatch.cs => AbstractPatch.cs} | 4 ++-- Fuyu.Plugin.EFT/EFTMod.cs | 6 +++--- Fuyu.Plugin.EFT/Patches/BattleEyePatch.cs | 2 +- Fuyu.Plugin.EFT/Patches/ConsistencyGeneralPatch.cs | 2 +- 99 files changed, 125 insertions(+), 125 deletions(-) rename Fuyu.Backend.BSG/Networking/{ItemEventController.cs => AbstractItemEventController.cs} (77%) rename Fuyu.Backend.Core/Networking/{CoreHttpController.cs => AbstractCoreHttpController.cs} (82%) rename Fuyu.Backend.EFT/Networking/{EftHttpController.cs => AbstractEftHttpController.cs} (82%) rename Fuyu.Common/Networking/{HttpController.cs => AbstractHttpController.cs} (79%) rename Fuyu.Common/Networking/{WebController.cs => AbstractWebController.cs} (65%) rename Fuyu.DependencyInjection/Registrations/{DependencyRegistration.cs => AbstractDependencyRegistration.cs} (71%) rename Fuyu.Modding/{Mod.cs => AbstractMod.cs} (96%) rename Fuyu.Plugin.Common/Reflection/{APatch.cs => AbstractPatch.cs} (94%) diff --git a/Fuyu.Backend.BSG/Networking/ItemEventController.cs b/Fuyu.Backend.BSG/Networking/AbstractItemEventController.cs similarity index 77% rename from Fuyu.Backend.BSG/Networking/ItemEventController.cs rename to Fuyu.Backend.BSG/Networking/AbstractItemEventController.cs index fa6336fc..2edf1422 100644 --- a/Fuyu.Backend.BSG/Networking/ItemEventController.cs +++ b/Fuyu.Backend.BSG/Networking/AbstractItemEventController.cs @@ -3,11 +3,11 @@ namespace Fuyu.Backend.BSG.Networking { - public abstract class ItemEventController : IItemEventController where TEvent : BaseItemEvent + public abstract class AbstractItemEventController : IItemEventController where TEvent : BaseItemEvent { public string Action { get; private set; } - public ItemEventController(string action) + public AbstractItemEventController(string action) { Action = action; } diff --git a/Fuyu.Backend.Core/Controllers/AccountGamesController.cs b/Fuyu.Backend.Core/Controllers/AccountGamesController.cs index a48cf2d3..948a44a6 100644 --- a/Fuyu.Backend.Core/Controllers/AccountGamesController.cs +++ b/Fuyu.Backend.Core/Controllers/AccountGamesController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.Core.Controllers { - public class AccountGamesController : CoreHttpController + public class AccountGamesController : AbstractCoreHttpController { public AccountGamesController() : base("/account/games") { diff --git a/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs b/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs index 7ec302ac..657cd5b7 100644 --- a/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs +++ b/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.Core.Controllers { - public class AccountLogoutController : CoreHttpController + public class AccountLogoutController : AbstractCoreHttpController { public AccountLogoutController() : base("/account/logout") { diff --git a/Fuyu.Backend.Core/Controllers/PingController.cs b/Fuyu.Backend.Core/Controllers/PingController.cs index da17b44d..ae7471c1 100644 --- a/Fuyu.Backend.Core/Controllers/PingController.cs +++ b/Fuyu.Backend.Core/Controllers/PingController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.Core.Controllers { - public class PingController : CoreHttpController + public class PingController : AbstractCoreHttpController { public PingController() : base("/ping") { diff --git a/Fuyu.Backend.Core/Networking/CoreHttpController.cs b/Fuyu.Backend.Core/Networking/AbstractCoreHttpController.cs similarity index 82% rename from Fuyu.Backend.Core/Networking/CoreHttpController.cs rename to Fuyu.Backend.Core/Networking/AbstractCoreHttpController.cs index d38f4fc1..83644020 100644 --- a/Fuyu.Backend.Core/Networking/CoreHttpController.cs +++ b/Fuyu.Backend.Core/Networking/AbstractCoreHttpController.cs @@ -5,14 +5,14 @@ namespace Fuyu.Backend.Core.Networking { - public abstract class CoreHttpController : HttpController + public abstract class AbstractCoreHttpController : AbstractHttpController { - protected CoreHttpController(Regex pattern) : base(pattern) + protected AbstractCoreHttpController(Regex pattern) : base(pattern) { // match dynamic paths } - protected CoreHttpController(string path) : base(path) + protected AbstractCoreHttpController(string path) : base(path) { // match static paths } @@ -26,7 +26,7 @@ public override Task RunAsync(HttpContext context) public abstract Task RunAsync(CoreHttpContext context); } - public abstract class CoreHttpController : CoreHttpController where TRequest : class + public abstract class CoreHttpController : AbstractCoreHttpController where TRequest : class { protected CoreHttpController(Regex pattern) : base(pattern) { diff --git a/Fuyu.Backend.EFT/Controllers/Http/AchievementListController.cs b/Fuyu.Backend.EFT/Controllers/Http/AchievementListController.cs index 42fc4465..c8f051e1 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/AchievementListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/AchievementListController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class AchievementListController : EftHttpController + public class AchievementListController : AbstractEftHttpController { public AchievementListController() : base("/client/achievement/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/AchievementStatisticController.cs b/Fuyu.Backend.EFT/Controllers/Http/AchievementStatisticController.cs index a6396b25..b6bf260e 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/AchievementStatisticController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/AchievementStatisticController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class AchievementStatisticController : EftHttpController + public class AchievementStatisticController : AbstractEftHttpController { public AchievementStatisticController() : base("/client/achievement/statistic") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/BuildsListController.cs b/Fuyu.Backend.EFT/Controllers/Http/BuildsListController.cs index b603b621..4e3f888c 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/BuildsListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/BuildsListController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class BuildsListController : EftHttpController + public class BuildsListController : AbstractEftHttpController { private readonly ResponseBody _response; diff --git a/Fuyu.Backend.EFT/Controllers/Http/CheckVersionController.cs b/Fuyu.Backend.EFT/Controllers/Http/CheckVersionController.cs index cbf06fbd..657c4af8 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/CheckVersionController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/CheckVersionController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class CheckVersionController : EftHttpController + public class CheckVersionController : AbstractEftHttpController { public CheckVersionController() : base("/client/checkVersion") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/ClientItemsPriceController.cs b/Fuyu.Backend.EFT/Controllers/Http/ClientItemsPriceController.cs index 61cfe6da..f8d4aee2 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/ClientItemsPriceController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/ClientItemsPriceController.cs @@ -12,7 +12,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public partial class ClientItemsPriceController : EftHttpController + public partial class ClientItemsPriceController : AbstractEftHttpController { [GeneratedRegex(@"^/client/items/prices(/(?[A-Za-z0-9]+))?$")] private static partial Regex PathExpression(); diff --git a/Fuyu.Backend.EFT/Controllers/Http/CustomizationController.cs b/Fuyu.Backend.EFT/Controllers/Http/CustomizationController.cs index 620c92f6..f9e502a8 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/CustomizationController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/CustomizationController.cs @@ -7,7 +7,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class CustomizationController : EftHttpController + public class CustomizationController : AbstractEftHttpController { public CustomizationController() : base("/client/customization") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/CustomizationStorageController.cs b/Fuyu.Backend.EFT/Controllers/Http/CustomizationStorageController.cs index 0abaaa6e..18244920 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/CustomizationStorageController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/CustomizationStorageController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class CustomizationStorageController : EftHttpController + public class CustomizationStorageController : AbstractEftHttpController { public CustomizationStorageController() : base("/client/customization/storage") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/FilesController.cs b/Fuyu.Backend.EFT/Controllers/Http/FilesController.cs index 87d202c2..6ef72a02 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/FilesController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/FilesController.cs @@ -7,7 +7,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public partial class FilesController : EftHttpController + public partial class FilesController : AbstractEftHttpController { [GeneratedRegex(@"^/files/(?.+)$")] private static partial Regex PathExpression(); diff --git a/Fuyu.Backend.EFT/Controllers/Http/FriendListController.cs b/Fuyu.Backend.EFT/Controllers/Http/FriendListController.cs index 82e6be99..50c5120f 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/FriendListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/FriendListController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class FriendListController : EftHttpController + public class FriendListController : AbstractEftHttpController { public FriendListController() : base("/client/friend/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListInboxController.cs b/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListInboxController.cs index 21e11644..2c18c51e 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListInboxController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListInboxController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class FriendRequestListInboxController : EftHttpController + public class FriendRequestListInboxController : AbstractEftHttpController { public FriendRequestListInboxController() : base("/client/friend/request/list/inbox") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListOutboxController.cs b/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListOutboxController.cs index bff1c9b4..dd11b6ce 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListOutboxController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/FriendRequestListOutboxController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class FriendRequestListOutboxController : EftHttpController + public class FriendRequestListOutboxController : AbstractEftHttpController { public FriendRequestListOutboxController() : base("/client/friend/request/list/outbox") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameConfigController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameConfigController.cs index 6b1e63d0..27535b45 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameConfigController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameConfigController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameConfigController : EftHttpController + public class GameConfigController : AbstractEftHttpController { public GameConfigController() : base("/client/game/config") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameKeepaliveController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameKeepaliveController.cs index c4a9673b..9d812a13 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameKeepaliveController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameKeepaliveController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameKeepaliveController : EftHttpController + public class GameKeepaliveController : AbstractEftHttpController { public GameKeepaliveController() : base("/client/game/keepalive") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameLogoutController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameLogoutController.cs index b5e9dd23..72ec909c 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameLogoutController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameLogoutController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameLogoutController : EftHttpController + public class GameLogoutController : AbstractEftHttpController { public GameLogoutController() : base("/client/game/logout") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileListController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileListController.cs index 04184f11..6d917e60 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameProfileListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameProfileListController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameProfileListController : EftHttpController + public class GameProfileListController : AbstractEftHttpController { public GameProfileListController() : base("/client/game/profile/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameReservedController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameReservedController.cs index f2240ae1..754e7647 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameReservedController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameReservedController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameProfileNicknameReservedController : EftHttpController + public class GameProfileNicknameReservedController : AbstractEftHttpController { public GameProfileNicknameReservedController() : base("/client/game/profile/nickname/reserved") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileSelectController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileSelectController.cs index 3fe91708..08232b08 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameProfileSelectController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameProfileSelectController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameProfileSelectController : EftHttpController + public class GameProfileSelectController : AbstractEftHttpController { public GameProfileSelectController() : base("/client/game/profile/select") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameStartController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameStartController.cs index e6a71e67..90d988ce 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameStartController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameStartController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameStartController : EftHttpController + public class GameStartController : AbstractEftHttpController { public GameStartController() : base("/client/game/start") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs index fe9c0902..22652930 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GameVersionValidateController.cs @@ -18,7 +18,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GameVersionValidateController : EftHttpController + public class GameVersionValidateController : AbstractEftHttpController { public GameVersionValidateController() : base("/client/game/version/validate") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GetMetricsConfigController.cs b/Fuyu.Backend.EFT/Controllers/Http/GetMetricsConfigController.cs index 33a8de8f..656c845b 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GetMetricsConfigController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GetMetricsConfigController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GetMetricsConfigController : EftHttpController + public class GetMetricsConfigController : AbstractEftHttpController { public GetMetricsConfigController() : base("/client/getMetricsConfig") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/GetTraderAssortController.cs b/Fuyu.Backend.EFT/Controllers/Http/GetTraderAssortController.cs index ed88c1b9..1ff2b0d2 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GetTraderAssortController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GetTraderAssortController.cs @@ -7,7 +7,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public partial class GetTraderAssortController : EftHttpController + public partial class GetTraderAssortController : AbstractEftHttpController { [GeneratedRegex("/client/trading/api/getTraderAssort/(?[A-Za-z0-9]+)")] private static partial Regex PathExpression(); diff --git a/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs b/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs index 16efab84..6bfda9ba 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/GlobalsController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class GlobalsController : EftHttpController + public class GlobalsController : AbstractEftHttpController { public GlobalsController() : base("/client/globals") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HandbookTemplatesController.cs b/Fuyu.Backend.EFT/Controllers/Http/HandbookTemplatesController.cs index 8233878c..701446f7 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HandbookTemplatesController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HandbookTemplatesController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HandbookTemplatesController : EftHttpController + public class HandbookTemplatesController : AbstractEftHttpController { public HandbookTemplatesController() : base("/client/handbook/templates") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HideoutAreasController.cs b/Fuyu.Backend.EFT/Controllers/Http/HideoutAreasController.cs index 5332141e..ff8e9b23 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HideoutAreasController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HideoutAreasController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HideoutAreasController : EftHttpController + public class HideoutAreasController : AbstractEftHttpController { public HideoutAreasController() : base("/client/hideout/areas") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HideoutCustomizationOferListController.cs b/Fuyu.Backend.EFT/Controllers/Http/HideoutCustomizationOferListController.cs index 2efcd917..03873e69 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HideoutCustomizationOferListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HideoutCustomizationOferListController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HideoutCustomizationOfferListController : EftHttpController + public class HideoutCustomizationOfferListController : AbstractEftHttpController { public HideoutCustomizationOfferListController() : base("/client/hideout/customization/offer/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HideoutProductionRecipesController.cs b/Fuyu.Backend.EFT/Controllers/Http/HideoutProductionRecipesController.cs index be94f091..c5e8dc17 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HideoutProductionRecipesController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HideoutProductionRecipesController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HideoutProductionRecipesController : EftHttpController + public class HideoutProductionRecipesController : AbstractEftHttpController { public HideoutProductionRecipesController() : base("/client/hideout/production/recipes") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HideoutQteListController.cs b/Fuyu.Backend.EFT/Controllers/Http/HideoutQteListController.cs index 57a694c8..f601ba58 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HideoutQteListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HideoutQteListController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HideoutQteListController : EftHttpController + public class HideoutQteListController : AbstractEftHttpController { public HideoutQteListController() : base("/client/hideout/qte/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/HideoutSettingsController.cs b/Fuyu.Backend.EFT/Controllers/Http/HideoutSettingsController.cs index b511a524..0e1d42de 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/HideoutSettingsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/HideoutSettingsController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class HideoutSettingsController : EftHttpController + public class HideoutSettingsController : AbstractEftHttpController { public HideoutSettingsController() : base("/client/hideout/settings") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/ItemsController.cs b/Fuyu.Backend.EFT/Controllers/Http/ItemsController.cs index 38d24d11..ee450eed 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/ItemsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/ItemsController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class ItemsController : EftHttpController + public class ItemsController : AbstractEftHttpController { public ItemsController() : base("/client/items") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/LanguagesController.cs b/Fuyu.Backend.EFT/Controllers/Http/LanguagesController.cs index 8174e81d..8a15d7d3 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/LanguagesController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/LanguagesController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class LanguagesController : EftHttpController + public class LanguagesController : AbstractEftHttpController { public LanguagesController() : base("/client/languages") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/LocalGameWeatherController.cs b/Fuyu.Backend.EFT/Controllers/Http/LocalGameWeatherController.cs index 6b75485e..4fb4b254 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/LocalGameWeatherController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/LocalGameWeatherController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class LocalGameWeatherController : EftHttpController + public class LocalGameWeatherController : AbstractEftHttpController { public LocalGameWeatherController() : base("/client/localGame/weather") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/LocaleController.cs b/Fuyu.Backend.EFT/Controllers/Http/LocaleController.cs index c33b72f4..21f9dfca 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/LocaleController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/LocaleController.cs @@ -7,7 +7,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public partial class LocaleController : EftHttpController + public partial class LocaleController : AbstractEftHttpController { [GeneratedRegex("^/client/locale/(?[a-z]+(-[a-z]+)?)$")] private static partial Regex PathExpression(); diff --git a/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs b/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs index 31a7de26..7a609354 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/LocationsController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class LocationsController : EftHttpController + public class LocationsController : AbstractEftHttpController { public LocationsController() : base("/client/locations") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/MailDialogListController.cs b/Fuyu.Backend.EFT/Controllers/Http/MailDialogListController.cs index b7a96301..2d8cb357 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/MailDialogListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/MailDialogListController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class MailDialogListController : EftHttpController + public class MailDialogListController : AbstractEftHttpController { public MailDialogListController() : base("/client/mail/dialog/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupCurrentController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupCurrentController.cs index 68f930ae..cf6374fb 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupCurrentController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupCurrentController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class MatchGroupCurrentController : EftHttpController + public class MatchGroupCurrentController : AbstractEftHttpController { public MatchGroupCurrentController() : base("/client/match/group/current") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupExitFromMenuController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupExitFromMenuController.cs index 5cf52f3a..6b8db933 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupExitFromMenuController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupExitFromMenuController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class MatchGroupExitFromMenuController : EftHttpController + public class MatchGroupExitFromMenuController : AbstractEftHttpController { public MatchGroupExitFromMenuController() : base("/client/match/group/exit_from_menu") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupInviteCancelAllController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupInviteCancelAllController.cs index ed96ad15..ec01d777 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/MatchGroupInviteCancelAllController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/MatchGroupInviteCancelAllController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class MatchGroupInviteCancelAllController : EftHttpController + public class MatchGroupInviteCancelAllController : AbstractEftHttpController { public MatchGroupInviteCancelAllController() : base("/client/match/group/invite/cancel-all") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/MenuLocaleController.cs b/Fuyu.Backend.EFT/Controllers/Http/MenuLocaleController.cs index b2038289..82c4c271 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/MenuLocaleController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/MenuLocaleController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public partial class MenuLocaleController : EftHttpController + public partial class MenuLocaleController : AbstractEftHttpController { [GeneratedRegex("^/client/menu/locale/(?[a-z]+(-[a-z]+)?)$")] private static partial Regex PathExpression(); diff --git a/Fuyu.Backend.EFT/Controllers/Http/NotifierChannelCreateController.cs b/Fuyu.Backend.EFT/Controllers/Http/NotifierChannelCreateController.cs index 3e3d1bd6..e64619eb 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/NotifierChannelCreateController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/NotifierChannelCreateController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class NotifierChannelCreateController : EftHttpController + public class NotifierChannelCreateController : AbstractEftHttpController { public NotifierChannelCreateController() : base("/client/notifier/channel/create") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/PrestigeListController.cs b/Fuyu.Backend.EFT/Controllers/Http/PrestigeListController.cs index 0fdcb8b1..a871a99c 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/PrestigeListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/PrestigeListController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class PrestigeListController : EftHttpController + public class PrestigeListController : AbstractEftHttpController { public PrestigeListController() : base("/client/prestige/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/ProfileSettingsController.cs b/Fuyu.Backend.EFT/Controllers/Http/ProfileSettingsController.cs index ee383fe0..90aa113c 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/ProfileSettingsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/ProfileSettingsController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class ProfileSettingsController : EftHttpController + public class ProfileSettingsController : AbstractEftHttpController { public ProfileSettingsController() : base("/client/profile/settings") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/ProfileStatusController.cs b/Fuyu.Backend.EFT/Controllers/Http/ProfileStatusController.cs index 24863df3..5e720afb 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/ProfileStatusController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/ProfileStatusController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class ProfileStatusController : EftHttpController + public class ProfileStatusController : AbstractEftHttpController { public ProfileStatusController() : base("/client/profile/status") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/PutMetricsController.cs b/Fuyu.Backend.EFT/Controllers/Http/PutMetricsController.cs index 171b6cd5..7b1f7fca 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/PutMetricsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/PutMetricsController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class PutMetricsController : EftHttpController + public class PutMetricsController : AbstractEftHttpController { public PutMetricsController() : base("/client/putMetrics") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/QuestListController.cs b/Fuyu.Backend.EFT/Controllers/Http/QuestListController.cs index 5b7ae502..e6a8cb66 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/QuestListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/QuestListController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class QuestListController : EftHttpController + public class QuestListController : AbstractEftHttpController { public QuestListController() : base("/client/quest/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/RaidConfigurationController.cs b/Fuyu.Backend.EFT/Controllers/Http/RaidConfigurationController.cs index f26f280e..720069ef 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/RaidConfigurationController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/RaidConfigurationController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class RaidConfigurationController : EftHttpController + public class RaidConfigurationController : AbstractEftHttpController { public RaidConfigurationController() : base("/client/raid/configuration") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/RepeatableQuestActivityPeriodsController.cs b/Fuyu.Backend.EFT/Controllers/Http/RepeatableQuestActivityPeriodsController.cs index d5c6dce4..9962ed48 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/RepeatableQuestActivityPeriodsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/RepeatableQuestActivityPeriodsController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class RepeatableQuestActivityPeriodsController : EftHttpController + public class RepeatableQuestActivityPeriodsController : AbstractEftHttpController { public RepeatableQuestActivityPeriodsController() : base("/client/repeatalbeQuests/activityPeriods") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/ServerListController.cs b/Fuyu.Backend.EFT/Controllers/Http/ServerListController.cs index 97e3c08f..d2dcf901 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/ServerListController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/ServerListController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class ServerListController : EftHttpController + public class ServerListController : AbstractEftHttpController { public ServerListController() : base("/client/server/list") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/SettingsController.cs b/Fuyu.Backend.EFT/Controllers/Http/SettingsController.cs index 785c5160..97fa24c2 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/SettingsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/SettingsController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class SettingsController : EftHttpController + public class SettingsController : AbstractEftHttpController { public SettingsController() : base("/client/settings") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/SurveyController.cs b/Fuyu.Backend.EFT/Controllers/Http/SurveyController.cs index 44b2fe29..78a0b8cc 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/SurveyController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/SurveyController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class SurveyController : EftHttpController + public class SurveyController : AbstractEftHttpController { public SurveyController() : base("/client/survey") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/TraderSettingsController.cs b/Fuyu.Backend.EFT/Controllers/Http/TraderSettingsController.cs index 08ba86db..606e9f49 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/TraderSettingsController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/TraderSettingsController.cs @@ -7,7 +7,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class TraderSettingsController : EftHttpController + public class TraderSettingsController : AbstractEftHttpController { public TraderSettingsController() : base("/client/trading/api/traderSettings") { diff --git a/Fuyu.Backend.EFT/Controllers/Http/WeatherController.cs b/Fuyu.Backend.EFT/Controllers/Http/WeatherController.cs index ab38772d..dc218963 100644 --- a/Fuyu.Backend.EFT/Controllers/Http/WeatherController.cs +++ b/Fuyu.Backend.EFT/Controllers/Http/WeatherController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http { - public class WeatherController : EftHttpController + public class WeatherController : AbstractEftHttpController { public WeatherController() : base("/client/weather") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/AddNoteItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/AddNoteItemEventController.cs index 4ea0a7f5..d79b0a15 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/AddNoteItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/AddNoteItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class AddNoteItemEventController : ItemEventController + public class AddNoteItemEventController : AbstractItemEventController { public AddNoteItemEventController() : base("AddNote") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/AddToWishListItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/AddToWishListItemEventController.cs index bff578a6..8f4f777d 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/AddToWishListItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/AddToWishListItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class AddToWishListItemEventController : ItemEventController + public class AddToWishListItemEventController : AbstractItemEventController { public AddToWishListItemEventController() : base("AddToWishList") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs index 265dd590..3ce05aa9 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs @@ -8,7 +8,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class ApplyInventoryChangesItemEventController : ItemEventController + public class ApplyInventoryChangesItemEventController : AbstractItemEventController { public ApplyInventoryChangesItemEventController() : base("ApplyInventoryChanges") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/BindItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/BindItemEventController.cs index 851ece6b..d422e817 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/BindItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/BindItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class BindItemEventController : ItemEventController + public class BindItemEventController : AbstractItemEventController { public BindItemEventController() : base("Bind") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/ChangeWishlistItemCategoryItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/ChangeWishlistItemCategoryItemEventController.cs index 41adafc3..00913076 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/ChangeWishlistItemCategoryItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/ChangeWishlistItemCategoryItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class ChangeWishlistItemCategoryItemEventController : ItemEventController + public class ChangeWishlistItemCategoryItemEventController : AbstractItemEventController { public ChangeWishlistItemCategoryItemEventController() : base("ChangeWishlistItemCategory") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/CustomizationBuyItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/CustomizationBuyItemEventController.cs index f3da0567..18bc2a21 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/CustomizationBuyItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/CustomizationBuyItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class CustomizationBuyEventController : ItemEventController + public class CustomizationBuyEventController : AbstractItemEventController { public CustomizationBuyEventController() : base("CustomizationBuy") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/DeleteNoteItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/DeleteNoteItemEventController.cs index 3f963597..60a68f51 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/DeleteNoteItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/DeleteNoteItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class DeleteNoteItemEventController : ItemEventController + public class DeleteNoteItemEventController : AbstractItemEventController { public DeleteNoteItemEventController() : base("DeleteNote") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/EatItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/EatItemEventController.cs index a1517307..c320c016 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/EatItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/EatItemEventController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class EatItemEventController : ItemEventController + public class EatItemEventController : AbstractItemEventController { public EatItemEventController() : base("Eat") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/EditNoteItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/EditNoteItemEventController.cs index 0955fbb9..4805b2d0 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/EditNoteItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/EditNoteItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class EditNoteItemEventController : ItemEventController + public class EditNoteItemEventController : AbstractItemEventController { public EditNoteItemEventController() : base("EditNote") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/ExamineItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/ExamineItemEventController.cs index ca4b57f3..cf3184a4 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/ExamineItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/ExamineItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class ExamineItemEventController : ItemEventController + public class ExamineItemEventController : AbstractItemEventController { public ExamineItemEventController() : base("Examine") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/FoldItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/FoldItemEventController.cs index b8483cd1..04049efd 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/FoldItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/FoldItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class FoldItemEventController : ItemEventController + public class FoldItemEventController : AbstractItemEventController { public FoldItemEventController() : base("Fold") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/InsureItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/InsureItemEventController.cs index bad4c6b1..3081e345 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/InsureItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/InsureItemEventController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class InsureEventController : ItemEventController + public class InsureEventController : AbstractItemEventController { public InsureEventController() : base("Insure") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/InterGameTransferEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/InterGameTransferEventController.cs index fab116d4..aa3ab86a 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/InterGameTransferEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/InterGameTransferEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class InterGameTransferEventController : ItemEventController + public class InterGameTransferEventController : AbstractItemEventController { public InterGameTransferEventController() : base("InterGameTransfer") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/MoveItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/MoveItemEventController.cs index c4d61936..dd4bbb51 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/MoveItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/MoveItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class MoveItemEventController : ItemEventController + public class MoveItemEventController : AbstractItemEventController { public MoveItemEventController() : base("Move") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/ReadEncyclopediaItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/ReadEncyclopediaItemEventController.cs index 3fae94dc..8fe072b4 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/ReadEncyclopediaItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/ReadEncyclopediaItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class ReadEncyclopediaEventController : ItemEventController + public class ReadEncyclopediaEventController : AbstractItemEventController { public ReadEncyclopediaEventController() : base("ReadEncyclopedia") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/RecodeItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/RecodeItemEventController.cs index ba178364..2d653288 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/RecodeItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/RecodeItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class RecodeItemEventController : ItemEventController + public class RecodeItemEventController : AbstractItemEventController { public RecodeItemEventController() : base("Recode") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveFromWishListItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveFromWishListItemEventController.cs index 2c0e912a..5fc972b4 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveFromWishListItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveFromWishListItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class RemoveFromWishListItemEventController : ItemEventController + public class RemoveFromWishListItemEventController : AbstractItemEventController { public RemoveFromWishListItemEventController() : base("RemoveFromWishList") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveItemEventController.cs index bb95e592..c439a2d9 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/RemoveItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class RemoveItemEventController : ItemEventController + public class RemoveItemEventController : AbstractItemEventController { public RemoveItemEventController() : base("Remove") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/SellAllFromSavageItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/SellAllFromSavageItemEventController.cs index 228d84bc..0edacf41 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/SellAllFromSavageItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/SellAllFromSavageItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class SellAllFromSavageEventController : ItemEventController + public class SellAllFromSavageEventController : AbstractItemEventController { public SellAllFromSavageEventController() : base("SellAllFromSavage") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/TagItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/TagItemEventController.cs index 81e5e956..a735ecbf 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/TagItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/TagItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class TagItemEventController : ItemEventController + public class TagItemEventController : AbstractItemEventController { public TagItemEventController() : base("Tag") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/ToggleItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/ToggleItemEventController.cs index 8df0e471..85769a70 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/ToggleItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/ToggleItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class ToggleItemEventController : ItemEventController + public class ToggleItemEventController : AbstractItemEventController { public ToggleItemEventController() : base("Toggle") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/TraderRepairItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/TraderRepairItemEventController.cs index 212de5ef..f2f59e55 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/TraderRepairItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/TraderRepairItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class TraderRepairEventController : ItemEventController + public class TraderRepairEventController : AbstractItemEventController { public TraderRepairEventController() : base("TraderRepair") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/TradingConfirmItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/TradingConfirmItemEventController.cs index 0430a2dc..fdbfc370 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/TradingConfirmItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/TradingConfirmItemEventController.cs @@ -5,7 +5,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class TradingConfirmEventController : ItemEventController + public class TradingConfirmEventController : AbstractItemEventController { public TradingConfirmEventController() : base("TradingConfirm") { diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/UnbindItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/UnbindItemEventController.cs index 4c42b87a..3b732598 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/UnbindItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/UnbindItemEventController.cs @@ -4,7 +4,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class UnbindItemEventController : ItemEventController + public class UnbindItemEventController : AbstractItemEventController { public UnbindItemEventController() : base("Unbind") { diff --git a/Fuyu.Backend.EFT/Networking/EftHttpController.cs b/Fuyu.Backend.EFT/Networking/AbstractEftHttpController.cs similarity index 82% rename from Fuyu.Backend.EFT/Networking/EftHttpController.cs rename to Fuyu.Backend.EFT/Networking/AbstractEftHttpController.cs index c6da930f..a6e10884 100644 --- a/Fuyu.Backend.EFT/Networking/EftHttpController.cs +++ b/Fuyu.Backend.EFT/Networking/AbstractEftHttpController.cs @@ -5,14 +5,14 @@ namespace Fuyu.Backend.EFT.Networking { - public abstract class EftHttpController : HttpController + public abstract class AbstractEftHttpController : AbstractHttpController { - protected EftHttpController(Regex pattern) : base(pattern) + protected AbstractEftHttpController(Regex pattern) : base(pattern) { // match dynamic paths } - protected EftHttpController(string path) : base(path) + protected AbstractEftHttpController(string path) : base(path) { // match static paths } @@ -26,7 +26,7 @@ public override Task RunAsync(HttpContext context) public abstract Task RunAsync(EftHttpContext context); } - public abstract class EftHttpController : EftHttpController where TRequest : class + public abstract class EftHttpController : AbstractEftHttpController where TRequest : class { protected EftHttpController(Regex pattern) : base(pattern) { diff --git a/Fuyu.Common/Networking/HttpController.cs b/Fuyu.Common/Networking/AbstractHttpController.cs similarity index 79% rename from Fuyu.Common/Networking/HttpController.cs rename to Fuyu.Common/Networking/AbstractHttpController.cs index d40ad2eb..a85bf71d 100644 --- a/Fuyu.Common/Networking/HttpController.cs +++ b/Fuyu.Common/Networking/AbstractHttpController.cs @@ -4,20 +4,20 @@ namespace Fuyu.Common.Networking { - public abstract class HttpController : WebController + public abstract class AbstractHttpController : AbstractWebController { - protected HttpController(Regex pattern) : base(pattern) + protected AbstractHttpController(Regex pattern) : base(pattern) { // match dynamic paths } - protected HttpController(string path) : base(path) + protected AbstractHttpController(string path) : base(path) { // match static paths } } - public abstract class HttpController : HttpController where TRequest : class + public abstract class HttpController : AbstractHttpController where TRequest : class { protected HttpController(Regex pattern) : base(pattern) { diff --git a/Fuyu.Common/Networking/WebController.cs b/Fuyu.Common/Networking/AbstractWebController.cs similarity index 65% rename from Fuyu.Common/Networking/WebController.cs rename to Fuyu.Common/Networking/AbstractWebController.cs index 36047e28..5457e360 100644 --- a/Fuyu.Common/Networking/WebController.cs +++ b/Fuyu.Common/Networking/AbstractWebController.cs @@ -3,16 +3,16 @@ namespace Fuyu.Common.Networking { - public abstract class WebController : IRoutable, IRouterController where TContext : WebRouterContext + public abstract class AbstractWebController : IRoutable, IRouterController where TContext : WebRouterContext { public Regex Matcher { get; } - protected WebController(Regex pattern) + protected AbstractWebController(Regex pattern) { Matcher = pattern; } - protected WebController(string path) + protected AbstractWebController(string path) { Matcher = new Regex($"^{path}$"); } diff --git a/Fuyu.Common/Networking/HttpRouter.cs b/Fuyu.Common/Networking/HttpRouter.cs index a29bca94..97eea383 100644 --- a/Fuyu.Common/Networking/HttpRouter.cs +++ b/Fuyu.Common/Networking/HttpRouter.cs @@ -1,6 +1,6 @@ namespace Fuyu.Common.Networking { - public class HttpRouter : Router + public class HttpRouter : Router { public HttpRouter() : base() { diff --git a/Fuyu.Common/Networking/WsController.cs b/Fuyu.Common/Networking/WsController.cs index 9bb06fab..4de74c60 100644 --- a/Fuyu.Common/Networking/WsController.cs +++ b/Fuyu.Common/Networking/WsController.cs @@ -3,7 +3,7 @@ namespace Fuyu.Common.Networking { - public abstract class WsController : WebController + public abstract class WsController : AbstractWebController { protected WsController(Regex pattern) : base(pattern) { diff --git a/Fuyu.DependencyInjection/DependencyContainer.cs b/Fuyu.DependencyInjection/DependencyContainer.cs index 21f8dfd5..49003313 100644 --- a/Fuyu.DependencyInjection/DependencyContainer.cs +++ b/Fuyu.DependencyInjection/DependencyContainer.cs @@ -9,20 +9,20 @@ namespace Fuyu.DependencyInjection { public class DependencyContainer { - private Dictionary> _registrations; + private Dictionary> _registrations; public DependencyContainer() { - _registrations = new Dictionary>(); + _registrations = new Dictionary>(); } #region Registrations - private void AddRegistration(Type type, DependencyRegistration registration) + private void AddRegistration(Type type, AbstractDependencyRegistration registration) { if (!_registrations.TryGetValue(type, out var registrations)) { - _registrations[type] = registrations = new List(); + _registrations[type] = registrations = new List(); } else { @@ -38,14 +38,14 @@ private void AddRegistration(Type type, DependencyRegistration registration) registrations.Add(registration); } - private List GetRegistrations(Type type) + private List GetRegistrations(Type type) { if (_registrations.TryGetValue(type, out var registrations)) { return registrations; } - return new List(); + return new List(); } #endregion diff --git a/Fuyu.DependencyInjection/Registrations/DependencyRegistration.cs b/Fuyu.DependencyInjection/Registrations/AbstractDependencyRegistration.cs similarity index 71% rename from Fuyu.DependencyInjection/Registrations/DependencyRegistration.cs rename to Fuyu.DependencyInjection/Registrations/AbstractDependencyRegistration.cs index 141ce66c..150e265d 100644 --- a/Fuyu.DependencyInjection/Registrations/DependencyRegistration.cs +++ b/Fuyu.DependencyInjection/Registrations/AbstractDependencyRegistration.cs @@ -1,6 +1,6 @@ namespace Fuyu.DependencyInjection.Registrations { - internal abstract class DependencyRegistration + internal abstract class AbstractDependencyRegistration { public string Id { get; set; } diff --git a/Fuyu.DependencyInjection/Registrations/SingletonRegistration.cs b/Fuyu.DependencyInjection/Registrations/SingletonRegistration.cs index b5ef6a2a..234ddc12 100644 --- a/Fuyu.DependencyInjection/Registrations/SingletonRegistration.cs +++ b/Fuyu.DependencyInjection/Registrations/SingletonRegistration.cs @@ -1,6 +1,6 @@ namespace Fuyu.DependencyInjection.Registrations { - internal class SingletonRegistration : DependencyRegistration + internal class SingletonRegistration : AbstractDependencyRegistration { public T Instance { get; } diff --git a/Fuyu.DependencyInjection/Registrations/TransientRegistration.cs b/Fuyu.DependencyInjection/Registrations/TransientRegistration.cs index e53aa88b..4a2cafdb 100644 --- a/Fuyu.DependencyInjection/Registrations/TransientRegistration.cs +++ b/Fuyu.DependencyInjection/Registrations/TransientRegistration.cs @@ -2,7 +2,7 @@ namespace Fuyu.DependencyInjection.Registrations { - internal class TransientRegistration : DependencyRegistration + internal class TransientRegistration : AbstractDependencyRegistration { public Func Factory { get; } diff --git a/Fuyu.Modding/Mod.cs b/Fuyu.Modding/AbstractMod.cs similarity index 96% rename from Fuyu.Modding/Mod.cs rename to Fuyu.Modding/AbstractMod.cs index 1d259206..887c1634 100644 --- a/Fuyu.Modding/Mod.cs +++ b/Fuyu.Modding/AbstractMod.cs @@ -3,7 +3,7 @@ namespace Fuyu.Modding { - public abstract class Mod + public abstract class AbstractMod { internal bool IsLoaded { get; set; } diff --git a/Fuyu.Modding/Extensions.cs b/Fuyu.Modding/Extensions.cs index 88d8d04a..d7757995 100644 --- a/Fuyu.Modding/Extensions.cs +++ b/Fuyu.Modding/Extensions.cs @@ -4,9 +4,9 @@ namespace Fuyu.Modding { public static class Extensions { - public static T ResolveMod(this DependencyContainer container, string id) where T : Mod + public static T ResolveMod(this DependencyContainer container, string id) where T : AbstractMod { - return container.Resolve(id); + return container.Resolve(id); } } } diff --git a/Fuyu.Modding/ModManager.cs b/Fuyu.Modding/ModManager.cs index b2e753d4..3aa22410 100644 --- a/Fuyu.Modding/ModManager.cs +++ b/Fuyu.Modding/ModManager.cs @@ -27,7 +27,7 @@ private ModManager() } - private readonly List _mods = new List(); + private readonly List _mods = new List(); private string GetResourcePath(string resourceRootPath, string resourcePath) { @@ -114,12 +114,12 @@ private void ProcessAssembly(Assembly assembly, EModType assemblyModType) // Get types where T inherits from Mod var modTypes = assembly.GetExportedTypes() - .Where(t => typeof(Mod).IsAssignableFrom(t)); + .Where(t => typeof(AbstractMod).IsAssignableFrom(t)); // Technically you could export multiple mods per assembly foreach (var modType in modTypes) { - var mod = (Mod)Activator.CreateInstance(modType); + var mod = (AbstractMod)Activator.CreateInstance(modType); if (_mods.FindIndex(m => m.Id == mod.Id) != -1) { @@ -184,7 +184,7 @@ public async Task UnloadAll() } } - private async Task UnloadMod(Mod mod) + private async Task UnloadMod(AbstractMod mod) { if (mod.IsLoaded) { diff --git a/Fuyu.Plugin.Arena/ArenaMod.cs b/Fuyu.Plugin.Arena/ArenaMod.cs index 65f60190..abc63c2c 100644 --- a/Fuyu.Plugin.Arena/ArenaMod.cs +++ b/Fuyu.Plugin.Arena/ArenaMod.cs @@ -8,9 +8,9 @@ namespace Fuyu.Plugin.Arena { - public class ArenaMod : Mod + public class ArenaMod : AbstractMod { - private readonly APatch[] _patches; + private readonly AbstractPatch[] _patches; public override string Id { get; } = "com.fuyu.plugin.arena"; @@ -18,7 +18,7 @@ public class ArenaMod : Mod public ArenaMod() { - _patches = new APatch[] + _patches = new AbstractPatch[] { new BattlEyePatch(), new ConsistencyGeneralPatch() diff --git a/Fuyu.Plugin.Arena/Patches/BattleEyePatch.cs b/Fuyu.Plugin.Arena/Patches/BattleEyePatch.cs index d7add0a4..b0302884 100644 --- a/Fuyu.Plugin.Arena/Patches/BattleEyePatch.cs +++ b/Fuyu.Plugin.Arena/Patches/BattleEyePatch.cs @@ -8,7 +8,7 @@ namespace Fuyu.Plugin.Arena.Patches { - public class BattlEyePatch : APatch + public class BattlEyePatch : AbstractPatch { private static readonly PropertyInfo _succeed; private static readonly MethodInfo _mi; diff --git a/Fuyu.Plugin.Arena/Patches/ConsistencyGeneralPatch.cs b/Fuyu.Plugin.Arena/Patches/ConsistencyGeneralPatch.cs index a272a66b..28d6faf5 100644 --- a/Fuyu.Plugin.Arena/Patches/ConsistencyGeneralPatch.cs +++ b/Fuyu.Plugin.Arena/Patches/ConsistencyGeneralPatch.cs @@ -8,7 +8,7 @@ namespace Fuyu.Plugin.Arena.Patches { - public class ConsistencyGeneralPatch : APatch + public class ConsistencyGeneralPatch : AbstractPatch { private static readonly MethodInfo _mi; diff --git a/Fuyu.Plugin.Common/Reflection/APatch.cs b/Fuyu.Plugin.Common/Reflection/AbstractPatch.cs similarity index 94% rename from Fuyu.Plugin.Common/Reflection/APatch.cs rename to Fuyu.Plugin.Common/Reflection/AbstractPatch.cs index 4c4da4c6..fca8f456 100644 --- a/Fuyu.Plugin.Common/Reflection/APatch.cs +++ b/Fuyu.Plugin.Common/Reflection/AbstractPatch.cs @@ -5,13 +5,13 @@ namespace Fuyu.Plugin.Common.Reflection { - public abstract class APatch + public abstract class AbstractPatch { public readonly string Id; public readonly EPatchType Type; public readonly Harmony Harmony; - public APatch(string id, EPatchType type) + public AbstractPatch(string id, EPatchType type) { Id = id; Type = type; diff --git a/Fuyu.Plugin.EFT/EFTMod.cs b/Fuyu.Plugin.EFT/EFTMod.cs index 052a9515..db9a53f7 100644 --- a/Fuyu.Plugin.EFT/EFTMod.cs +++ b/Fuyu.Plugin.EFT/EFTMod.cs @@ -8,9 +8,9 @@ namespace Fuyu.Plugin.EFT { - public class EFTMod : Mod + public class EFTMod : AbstractMod { - private readonly APatch[] _patches; + private readonly AbstractPatch[] _patches; public override string Id { get; } = "com.fuyu.plugin.eft"; @@ -18,7 +18,7 @@ public class EFTMod : Mod public EFTMod() { - _patches = new APatch[] + _patches = new AbstractPatch[] { new BattlEyePatch(), new ConsistencyGeneralPatch() diff --git a/Fuyu.Plugin.EFT/Patches/BattleEyePatch.cs b/Fuyu.Plugin.EFT/Patches/BattleEyePatch.cs index 923ac754..d188158e 100644 --- a/Fuyu.Plugin.EFT/Patches/BattleEyePatch.cs +++ b/Fuyu.Plugin.EFT/Patches/BattleEyePatch.cs @@ -8,7 +8,7 @@ namespace Fuyu.Plugin.EFT.Patches { - public class BattlEyePatch : APatch + public class BattlEyePatch : AbstractPatch { private static readonly PropertyInfo _succeed; private static readonly MethodInfo _mi; diff --git a/Fuyu.Plugin.EFT/Patches/ConsistencyGeneralPatch.cs b/Fuyu.Plugin.EFT/Patches/ConsistencyGeneralPatch.cs index 2e4f9731..addc5e34 100644 --- a/Fuyu.Plugin.EFT/Patches/ConsistencyGeneralPatch.cs +++ b/Fuyu.Plugin.EFT/Patches/ConsistencyGeneralPatch.cs @@ -7,7 +7,7 @@ namespace Fuyu.Plugin.EFT.Patches { - public class ConsistencyGeneralPatch : APatch + public class ConsistencyGeneralPatch : AbstractPatch { public ConsistencyGeneralPatch() : base("com.fuyu.plugin.eft.consistencygeneral", EPatchType.Prefix) { From b295a2094a0343b85bc616e22342a798a85829ba Mon Sep 17 00:00:00 2001 From: Lacyway <20912169+Lacyway@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:02:58 +0100 Subject: [PATCH 2/3] Fix inherited name --- .../Controllers/ItemEvents/RepairItemEventController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fuyu.Backend.EFT/Controllers/ItemEvents/RepairItemEventController.cs b/Fuyu.Backend.EFT/Controllers/ItemEvents/RepairItemEventController.cs index ae5baa6b..8e790a00 100644 --- a/Fuyu.Backend.EFT/Controllers/ItemEvents/RepairItemEventController.cs +++ b/Fuyu.Backend.EFT/Controllers/ItemEvents/RepairItemEventController.cs @@ -6,7 +6,7 @@ namespace Fuyu.Backend.EFT.Controllers.ItemEvents { - public class RepairItemEventController : ItemEventController + public class RepairItemEventController : AbstractItemEventController { public RepairItemEventController() : base("Repair") { From 40db1b434b3cb155d5b3451e8392abcc9c15cc07 Mon Sep 17 00:00:00 2001 From: Lacyway <20912169+Lacyway@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:09:43 +0100 Subject: [PATCH 3/3] Update docs --- Documentation/fuyu-tutorial-mod.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/fuyu-tutorial-mod.md b/Documentation/fuyu-tutorial-mod.md index 891b6c01..8a28feb4 100644 --- a/Documentation/fuyu-tutorial-mod.md +++ b/Documentation/fuyu-tutorial-mod.md @@ -46,7 +46,7 @@ However, it is a **MUST** that you use either `Visual Studio Code` or `Visual Studio 2022` (or newer). For writing script mods, I recommend using `Visual Studio Code`. For advanced mods, use `Visual Studio 2022` (or newer). -Having prior experience with C# will definetly help, but is not required. +Having prior experience with C# will definitely help, but is not required. ### Setting up folder structure @@ -113,7 +113,7 @@ using Fuyu.Common.IO; namespace Senko.HelloWorld { - public class HelloWorldMod : Mod + public class HelloWorldMod : AbstractMod { public override string Id { get; } = "Senko.HelloWorld"; public override string Name { get; } = "Senko - HelloWorld"; @@ -146,11 +146,11 @@ using Fuyu.Modding; using Fuyu.Common.IO; ``` -This imports things we can use in our mod. Some of them are required by `Mod` +This imports things we can use in our mod. Some of them are required by `AbstractMod` to function. ```cs -public class HelloWorldMod : Mod +public class HelloWorldMod : AbstractMod ``` This is a `class` and also the heart of our mod. Here we can include @@ -158,10 +158,10 @@ functionality to the mod. Think of `class` as a tiny program. It can depend on other programs (inheritance). ```cs -: Mod +: AbstractMod ``` -This means we inherit from `Mod`, telling the mod loader that this is the place +This means we inherit from `AbstractMod`, telling the mod loader that this is the place to start looking for information of our mod. ```cs @@ -216,7 +216,7 @@ tools and helpers from `Fuyu` and other mods when we need to. ```cs { - // done loading the mod! + // done loading the ! return Task.CompletedTask; } ``` @@ -244,7 +244,7 @@ using Fuyu.Common.IO; namespace Senko.HelloWorld { - public class HelloWorldMod : Mod + public class HelloWorldMod : AbstractMod { public override string Id { get; } = "Senko.HelloWorld"; public override string Name { get; } = "Senko - HelloWorld"; @@ -338,7 +338,7 @@ using Fuyu.Common.IO; namespace Senko.HelloWorld { - public class HelloWorldMod : Mod + public class HelloWorldMod : AbstractMod { public override string Id { get; } = "Senko.HelloWorld"; public override string Name { get; } = "Senko - HelloWorld"; @@ -373,7 +373,7 @@ using Fuyu.Common.IO; namespace Senko.HelloWorld { - public class HelloWorldMod : Mod + public class HelloWorldMod : AbstractMod { public override string Id { get; } = "Senko.HelloWorld"; public override string Name { get; } = "Senko - HelloWorld"; @@ -432,7 +432,7 @@ using Fuyu.Common.IO; namespace Senko.HelloWorld { - public class HelloWorldMod : Mod + public class HelloWorldMod : AbstractMod { public override string Id { get; } = "Senko.HelloWorld"; public override string Name { get; } = "Senko - HelloWorld";