diff --git a/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs b/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs index 1951024b..36e536dd 100644 --- a/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs +++ b/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs @@ -1,8 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Levels; using LBPUnion.ProjectLighthouse.Servers.API.Responses; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs b/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs index b4ba41b5..30e7d655 100644 --- a/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs +++ b/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs @@ -1,6 +1,6 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.API/Program.cs b/ProjectLighthouse.Servers.API/Program.cs index c3657584..f2cb06d4 100644 --- a/ProjectLighthouse.Servers.API/Program.cs +++ b/ProjectLighthouse.Servers.API/Program.cs @@ -1,7 +1,7 @@ +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet; using LBPUnion.ProjectLighthouse.Servers.API.Startup; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.Extensions.DependencyInjection.Extensions; namespace LBPUnion.ProjectLighthouse.Servers.API; diff --git a/ProjectLighthouse.Servers.API/Responses/MinimalSlot.cs b/ProjectLighthouse.Servers.API/Responses/MinimalSlot.cs index 2de00515..f1d39c66 100644 --- a/ProjectLighthouse.Servers.API/Responses/MinimalSlot.cs +++ b/ProjectLighthouse.Servers.API/Responses/MinimalSlot.cs @@ -1,5 +1,6 @@ +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; namespace LBPUnion.ProjectLighthouse.Servers.API.Responses; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs index 98b1d2da..7e9dd31d 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs @@ -1,7 +1,8 @@ #nullable enable using System.Diagnostics.CodeAnalysis; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs index 09f6e0f1..46c239f5 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs @@ -1,10 +1,11 @@ #nullable enable using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs index 9c638ba5..20ffda5c 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs @@ -1,11 +1,12 @@ #nullable enable using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.StorableLists; using LBPUnion.ProjectLighthouse.StorableLists.Stores; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs index 25e19a3d..e13fab24 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs @@ -1,10 +1,13 @@ #nullable enable using System.Net; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.Tickets; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; -using LBPUnion.ProjectLighthouse.Types.Tickets; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs index 222e1e9e..2dc6e363 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs @@ -1,6 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs index 693d2fb4..70971f02 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs @@ -3,8 +3,12 @@ using System.Text.Json; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.Match; +using LBPUnion.ProjectLighthouse.Match.MatchCommands; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Match; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -44,7 +48,7 @@ public class MatchController : ControllerBase Logger.LogInfo("Received match data: " + bodyString, LogArea.Match); - IMatchData? matchData; + IMatchCommand? matchData; try { matchData = MatchHelper.Deserialize(bodyString); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs index d072f81f..b975ed75 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs @@ -1,8 +1,10 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs index f66c55b8..0b39c355 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs @@ -1,9 +1,10 @@ #nullable enable using System.Text.Json; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Administration.Reports; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Reports; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs index 3ab1bd44..d2533dbd 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs @@ -1,11 +1,13 @@ #nullable enable using System.Xml.Serialization; using Discord; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs index baabf4e8..006f6b6d 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs @@ -2,11 +2,12 @@ using System.Buffers; using System.IO.Pipelines; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Files; using Microsoft.AspNetCore.Mvc; using IOFile = System.IO.File; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs index 9dd0a153..1b6776c7 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs @@ -1,10 +1,12 @@ #nullable enable using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.Levels.Categories; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Categories; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots; @@ -31,7 +33,7 @@ public class CollectionController : ControllerBase User? user = await this.database.UserFromGameRequest(this.Request); if (user == null) return this.StatusCode(403, ""); - string categoriesSerialized = CollectionHelper.Categories.Aggregate + string categoriesSerialized = CategoryHelper.Categories.Aggregate ( string.Empty, (current, category) => @@ -60,7 +62,7 @@ public class CollectionController : ControllerBase "hint_start", 1 }, { - "total", CollectionHelper.Categories.Count + "total", CategoryHelper.Categories.Count }, } ) @@ -78,7 +80,7 @@ public class CollectionController : ControllerBase User user = userAndToken.Value.Item1; GameToken gameToken = userAndToken.Value.Item2; - Category? category = CollectionHelper.Categories.FirstOrDefault(c => c.Endpoint == endpointName); + Category? category = CategoryHelper.Categories.FirstOrDefault(c => c.Endpoint == endpointName); if (category == null) return this.NotFound(); Logger.LogDebug("Found category " + category, LogArea.Category); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs index be4bc3d3..a5ecd0bd 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs @@ -1,4 +1,4 @@ -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.Levels; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs index e8012c4d..e888f4ad 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs @@ -1,7 +1,9 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs index 38f88b91..a0eed01f 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs @@ -1,12 +1,13 @@ #nullable enable using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Files; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs index fb98fc6d..be33b216 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs @@ -1,11 +1,14 @@ #nullable enable using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Administration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Reviews; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs index 866e6431..cc61df46 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs @@ -2,9 +2,11 @@ using System.Diagnostics.CodeAnalysis; using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs index b4db356e..8e6e43bf 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs @@ -1,7 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs index 52703941..5fab0b3b 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs @@ -1,11 +1,13 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Reviews; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs index 524b8970..f27e902d 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs @@ -1,10 +1,12 @@ #nullable enable using System.Text.Json; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.GameServer/Program.cs b/ProjectLighthouse.Servers.GameServer/Program.cs index 9f40e5fa..4917b122 100644 --- a/ProjectLighthouse.Servers.GameServer/Program.cs +++ b/ProjectLighthouse.Servers.GameServer/Program.cs @@ -1,7 +1,7 @@ +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet; using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.Extensions.DependencyInjection.Extensions; namespace LBPUnion.ProjectLighthouse.Servers.GameServer; diff --git a/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs b/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs index 2dd9a0bb..f0340073 100644 --- a/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs +++ b/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs @@ -1,9 +1,10 @@ +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; using LBPUnion.ProjectLighthouse.Middlewares; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Primitives; diff --git a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs index b41abd66..7557e834 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs @@ -1,6 +1,7 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Administration.Reports; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Reports; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs index 5a3abb9f..0ef40305 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs @@ -1,6 +1,7 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs index d9303b21..3b888391 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs b/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs index 541312dc..a2bff1e0 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs @@ -1,5 +1,7 @@ using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs index bde8da98..8ae4e279 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs @@ -1,4 +1,6 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs index c11af2fc..48f935ef 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs @@ -1,4 +1,6 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs b/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs index fefb5fdf..61158233 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs @@ -1,5 +1,5 @@ +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types.Files; using Microsoft.AspNetCore.Mvc; using IOFile = System.IO.File; diff --git a/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs b/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs index 0c267353..6886c116 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs @@ -1,8 +1,9 @@ #nullable enable using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs b/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs index 753b8ffd..88a4a8f7 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs @@ -1,6 +1,7 @@ #nullable enable using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs index 5da1b1b2..dacee993 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml index c20f45e0..8aa31717 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml @@ -1,7 +1,8 @@ @page "/admin" +@using LBPUnion.ProjectLighthouse.Administration +@using LBPUnion.ProjectLighthouse.Administration.Maintenance @using LBPUnion.ProjectLighthouse.Extensions @using LBPUnion.ProjectLighthouse.Helpers -@using LBPUnion.ProjectLighthouse.Maintenance @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelPage diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs index 914dd3e3..cb42034e 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs @@ -1,6 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Administration; +using LBPUnion.ProjectLighthouse.Administration.Maintenance; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Maintenance; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml index 3a10be7f..5642912f 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml @@ -1,4 +1,5 @@ @page "/admin/users" +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelUsersPage diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs index 257b8ebd..1bde19da 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs index 583fa680..9e38340a 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs index 36cc1714..5f7e8752 100644 --- a/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs @@ -1,8 +1,9 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles.Email; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml index ed202a67..9845e193 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml @@ -1,8 +1,10 @@ @page "/debug/roomVisualizer" @using LBPUnion.ProjectLighthouse.Extensions @using LBPUnion.ProjectLighthouse.Helpers +@using LBPUnion.ProjectLighthouse.Match.Rooms +@using LBPUnion.ProjectLighthouse.PlayerData +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types -@using LBPUnion.ProjectLighthouse.Types.Match @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug.RoomVisualizerPage @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml index edf240b8..28c5fb12 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml @@ -1,4 +1,5 @@ @page "/authentication" +@using LBPUnion.ProjectLighthouse.PlayerData @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.AuthenticationPage diff --git a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs index b63e31c2..6e8cdc7c 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs @@ -1,8 +1,9 @@ #nullable enable using System.Net; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml index fd3de4ce..8226c086 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml @@ -1,4 +1,5 @@ @page "/authentication/autoApprovals" +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.ManageUserApprovedIpAddressesPage diff --git a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs index 1d2615a6..8e399a75 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml index f64132a3..5c6e49c3 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml @@ -1,6 +1,7 @@ @page "/" +@using LBPUnion.ProjectLighthouse.Configuration +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types -@using LBPUnion.ProjectLighthouse.Types.Settings @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LandingPage @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs index 662eee2f..a2968d79 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs @@ -1,6 +1,7 @@ #nullable enable using JetBrains.Annotations; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml index 2d7c0510..342c2d9e 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml @@ -1,7 +1,7 @@ +@using LBPUnion.ProjectLighthouse.Configuration @using LBPUnion.ProjectLighthouse.Extensions @using LBPUnion.ProjectLighthouse.Helpers @using LBPUnion.ProjectLighthouse.Types -@using LBPUnion.ProjectLighthouse.Types.Settings @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts.BaseLayout @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs index 68e31951..991692da 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml index 17ad4902..9dd0dfa0 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml @@ -1,5 +1,5 @@ @page "/login" -@using LBPUnion.ProjectLighthouse.Types.Settings +@using LBPUnion.ProjectLighthouse.Configuration @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LoginForm @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs index 445a8890..4243fc1c 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs @@ -1,12 +1,14 @@ #nullable enable using JetBrains.Annotations; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles.Email; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs index c7746866..bf28f740 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml index 4acff434..49db6781 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml @@ -1,4 +1,4 @@ -@model LBPUnion.ProjectLighthouse.Types.AdminPanelStatistic +@model LBPUnion.ProjectLighthouse.Administration.AdminPanelStatistic
diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml index bbec5bec..fa165cdf 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml @@ -1,4 +1,4 @@ -@model LBPUnion.ProjectLighthouse.Types.User +@model LBPUnion.ProjectLighthouse.PlayerData.Profiles.User
@Html.AntiForgeryToken() diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml index e887bf7b..d54cebce 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml @@ -1,4 +1,4 @@ -@using LBPUnion.ProjectLighthouse.Types.Settings +@using LBPUnion.ProjectLighthouse.Configuration @if (ServerConfiguration.Instance.Captcha.CaptchaEnabled) {
diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml index 70e1cfe3..e771e409 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml @@ -1,5 +1,5 @@ @using System.Web -@using LBPUnion.ProjectLighthouse.Types.Profiles +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles

Comments

@if (Model.Comments.Count == 0 && Model.CommentsEnabled) diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml index 2b422c5a..66c8b0fa 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml @@ -1,5 +1,6 @@ +@using LBPUnion.ProjectLighthouse.PlayerData @using LBPUnion.ProjectLighthouse.Types -@model LBPUnion.ProjectLighthouse.Types.Photo +@model LBPUnion.ProjectLighthouse.PlayerData.Photo
diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml index 6d850c1a..96a09d5f 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml @@ -1,8 +1,10 @@ @using LBPUnion.ProjectLighthouse +@using LBPUnion.ProjectLighthouse.Configuration +@using LBPUnion.ProjectLighthouse.PlayerData +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types -@using LBPUnion.ProjectLighthouse.Types.Settings @using Microsoft.EntityFrameworkCore -@model LBPUnion.ProjectLighthouse.Types.Levels.Slot +@model LBPUnion.ProjectLighthouse.Levels.Slot @{ User user = (User)ViewData["User"]!; diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml index b2751508..8e3386ea 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml @@ -1,4 +1,4 @@ -@model LBPUnion.ProjectLighthouse.Types.User +@model LBPUnion.ProjectLighthouse.PlayerData.Profiles.User @{ bool showLink = (bool?)ViewData["ShowLink"] ?? false; diff --git a/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs index f22390d6..5a767460 100644 --- a/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs @@ -1,6 +1,7 @@ #nullable enable using JetBrains.Annotations; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs index 7620349f..ff041a7a 100644 --- a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs @@ -1,4 +1,5 @@ #nullable enable +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; using Microsoft.AspNetCore.Mvc; diff --git a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml index 95542724..bbcf2cd3 100644 --- a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml @@ -1,4 +1,5 @@ @page "/photos/{pageNumber:int}" +@using LBPUnion.ProjectLighthouse.PlayerData @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PhotosPage diff --git a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs index 9fbb4c64..b636205e 100644 --- a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs @@ -1,7 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml index c9007e40..1a08875b 100644 --- a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml @@ -1,5 +1,5 @@ @page "/register" -@using LBPUnion.ProjectLighthouse.Types.Settings +@using LBPUnion.ProjectLighthouse.Configuration @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.RegisterForm @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs index 9f850884..fa49b753 100644 --- a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs @@ -1,10 +1,12 @@ using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml index ece77ab5..993074dd 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml @@ -1,5 +1,5 @@ @page "/admin/reports/{pageNumber:int}" -@using LBPUnion.ProjectLighthouse.Types.Reports +@using LBPUnion.ProjectLighthouse.Administration.Reports @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ReportsPage @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs index 217e7d01..50f21c3c 100644 --- a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs @@ -1,9 +1,10 @@ #nullable enable using System.Text.Json; +using LBPUnion.ProjectLighthouse.Administration.Reports; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Reports; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs index b5dc5bb8..fae0a1d4 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs @@ -1,9 +1,10 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles.Email; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages; diff --git a/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml index eddd7786..38782a30 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml @@ -1,5 +1,5 @@ @page "/login/setEmail" -@using LBPUnion.ProjectLighthouse.Types.Settings +@using LBPUnion.ProjectLighthouse.Configuration @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SetEmailForm @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs index deeb60ac..2a21379e 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs @@ -1,10 +1,12 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles.Email; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml index b3c70042..0722a616 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml @@ -1,9 +1,10 @@ @page "/slot/{id:int}" @using System.Web +@using LBPUnion.ProjectLighthouse.Administration +@using LBPUnion.ProjectLighthouse.Configuration @using LBPUnion.ProjectLighthouse.Extensions +@using LBPUnion.ProjectLighthouse.PlayerData.Reviews @using LBPUnion.ProjectLighthouse.Types -@using LBPUnion.ProjectLighthouse.Types.Reviews -@using LBPUnion.ProjectLighthouse.Types.Settings @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotPage @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs index d95d0679..47d8f265 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs @@ -1,10 +1,11 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Reviews; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml index faa9d7e3..e92606c6 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml @@ -1,6 +1,6 @@ @page "/slots/{pageNumber:int}" @using LBPUnion.ProjectLighthouse.Extensions -@using LBPUnion.ProjectLighthouse.Types.Levels +@using LBPUnion.ProjectLighthouse.Levels @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotsPage @{ diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs index eb09cf6b..2bc11efa 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs @@ -1,9 +1,10 @@ #nullable enable using System.Text; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml index 8678e6e3..b766e011 100644 --- a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml @@ -1,6 +1,7 @@ @page "/user/{userId:int}" @using System.Web @using LBPUnion.ProjectLighthouse.Extensions +@using LBPUnion.ProjectLighthouse.PlayerData @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UserPage diff --git a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs index 73871bca..067ee0a2 100644 --- a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs @@ -1,8 +1,9 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml index ef125fcc..32195a8f 100644 --- a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml @@ -1,5 +1,6 @@ @page "/users/{pageNumber:int}" @using LBPUnion.ProjectLighthouse.Extensions +@using LBPUnion.ProjectLighthouse.PlayerData.Profiles @using LBPUnion.ProjectLighthouse.Types @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UsersPage diff --git a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs index bac18c8a..fadb934e 100644 --- a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs @@ -1,7 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse.Servers.Website/Program.cs b/ProjectLighthouse.Servers.Website/Program.cs index 67c4e17a..21901602 100644 --- a/ProjectLighthouse.Servers.Website/Program.cs +++ b/ProjectLighthouse.Servers.Website/Program.cs @@ -1,8 +1,8 @@ #nullable enable +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet; using LBPUnion.ProjectLighthouse.Servers.Website.Startup; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.Extensions.DependencyInjection.Extensions; namespace LBPUnion.ProjectLighthouse.Servers.Website; diff --git a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj index cd5d6ade..086efd76 100644 --- a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj +++ b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj @@ -8,14 +8,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -27,7 +27,7 @@ - - + + diff --git a/ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs similarity index 93% rename from ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs rename to ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs index 29279fdd..1fe89c3e 100644 --- a/ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs @@ -1,12 +1,12 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Xunit; -namespace ProjectLighthouse.Tests.GameApiTests; +namespace ProjectLighthouse.Tests.GameApiTests.Tests; public class AuthenticationTests : LighthouseServerTest { diff --git a/ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs similarity index 87% rename from ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs rename to ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs index 69187d38..ef3fd8dd 100644 --- a/ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs @@ -2,11 +2,11 @@ using System; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using Xunit; -namespace ProjectLighthouse.Tests.GameApiTests; +namespace ProjectLighthouse.Tests.GameApiTests.Tests; public class DatabaseTests : LighthouseServerTest { diff --git a/ProjectLighthouse.Tests.GameApiTests/MatchTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs similarity index 95% rename from ProjectLighthouse.Tests.GameApiTests/MatchTests.cs rename to ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs index d5ac8e69..4bcf3324 100644 --- a/ProjectLighthouse.Tests.GameApiTests/MatchTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs @@ -4,11 +4,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using Xunit; -namespace ProjectLighthouse.Tests.GameApiTests; +namespace ProjectLighthouse.Tests.GameApiTests.Tests; public class MatchTests : LighthouseServerTest { diff --git a/ProjectLighthouse.Tests.GameApiTests/SlotTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs similarity index 93% rename from ProjectLighthouse.Tests.GameApiTests/SlotTests.cs rename to ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs index bfb34fa8..f9d96442 100644 --- a/ProjectLighthouse.Tests.GameApiTests/SlotTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs @@ -3,13 +3,13 @@ using System.Net.Http; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; using Xunit; -namespace ProjectLighthouse.Tests.GameApiTests; +namespace ProjectLighthouse.Tests.GameApiTests.Tests; public class SlotTests : LighthouseServerTest { diff --git a/ProjectLighthouse.Tests.GameApiTests/UploadTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs similarity index 96% rename from ProjectLighthouse.Tests.GameApiTests/UploadTests.cs rename to ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs index 7ac1f72c..ddfa5043 100644 --- a/ProjectLighthouse.Tests.GameApiTests/UploadTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs @@ -3,11 +3,11 @@ using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using Xunit; -namespace ProjectLighthouse.Tests.GameApiTests; +namespace ProjectLighthouse.Tests.GameApiTests.Tests; public class UploadTests : LighthouseServerTest { diff --git a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj index 800d01a8..68bb134c 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj +++ b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj @@ -8,16 +8,16 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -29,8 +29,8 @@ - - + + diff --git a/ProjectLighthouse.Tests.WebsiteTests/AdminTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs similarity index 93% rename from ProjectLighthouse.Tests.WebsiteTests/AdminTests.cs rename to ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs index befdf9a4..9c137086 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/AdminTests.cs +++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs @@ -2,12 +2,13 @@ using System; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using OpenQA.Selenium; using Xunit; -namespace ProjectLighthouse.Tests.WebsiteTests; +namespace ProjectLighthouse.Tests.WebsiteTests.Tests; public class AdminTests : LighthouseWebTest { diff --git a/ProjectLighthouse.Tests.WebsiteTests/AuthenticationTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs similarity index 96% rename from ProjectLighthouse.Tests.WebsiteTests/AuthenticationTests.cs rename to ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs index b4fb32d8..35a20bb4 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/AuthenticationTests.cs +++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs @@ -3,13 +3,14 @@ using System.Linq; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using Microsoft.EntityFrameworkCore; using OpenQA.Selenium; using Xunit; -namespace ProjectLighthouse.Tests.WebsiteTests; +namespace ProjectLighthouse.Tests.WebsiteTests.Tests; public class AuthenticationTests : LighthouseWebTest { diff --git a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/LighthouseWebTest.cs similarity index 96% rename from ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs rename to ProjectLighthouse.Tests.WebsiteTests/Tests/LighthouseWebTest.cs index babb22ad..59a464fc 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs +++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/LighthouseWebTest.cs @@ -7,7 +7,7 @@ using OpenQA.Selenium; using OpenQA.Selenium.Chrome; using Xunit; -namespace ProjectLighthouse.Tests.WebsiteTests; +namespace ProjectLighthouse.Tests.WebsiteTests.Tests; [Collection(nameof(LighthouseWebTest))] public class LighthouseWebTest : IDisposable diff --git a/ProjectLighthouse.Tests.WebsiteTests/RegisterTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/RegisterTests.cs similarity index 96% rename from ProjectLighthouse.Tests.WebsiteTests/RegisterTests.cs rename to ProjectLighthouse.Tests.WebsiteTests/Tests/RegisterTests.cs index 0c2263e9..7624ca83 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/RegisterTests.cs +++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/RegisterTests.cs @@ -3,13 +3,13 @@ using System.Linq; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Tests; -using LBPUnion.ProjectLighthouse.Types; using Microsoft.EntityFrameworkCore; using OpenQA.Selenium; using Xunit; -namespace ProjectLighthouse.Tests.WebsiteTests; +namespace ProjectLighthouse.Tests.WebsiteTests.Tests; public class RegisterTests : LighthouseWebTest { diff --git a/ProjectLighthouse.Tests/DatabaseFactAttribute.cs b/ProjectLighthouse.Tests/DatabaseFactAttribute.cs index 708ae3bb..5af29a56 100644 --- a/ProjectLighthouse.Tests/DatabaseFactAttribute.cs +++ b/ProjectLighthouse.Tests/DatabaseFactAttribute.cs @@ -1,4 +1,4 @@ -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Configuration; using Microsoft.EntityFrameworkCore; using Xunit; diff --git a/ProjectLighthouse.Tests/LighthouseServerTest.cs b/ProjectLighthouse.Tests/LighthouseServerTest.cs index 1b008b61..bd18d63d 100644 --- a/ProjectLighthouse.Tests/LighthouseServerTest.cs +++ b/ProjectLighthouse.Tests/LighthouseServerTest.cs @@ -5,6 +5,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Serialization; using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup; using LBPUnion.ProjectLighthouse.Types; diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj index b877f486..0f9fffbf 100644 --- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj +++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj @@ -13,14 +13,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -35,9 +35,9 @@ PreserveNewest - - - - + + + + diff --git a/ProjectLighthouse.Tests/FileTypeTests.cs b/ProjectLighthouse.Tests/Tests/FileTypeTests.cs similarity index 97% rename from ProjectLighthouse.Tests/FileTypeTests.cs rename to ProjectLighthouse.Tests/Tests/FileTypeTests.cs index aa0452de..611ec632 100644 --- a/ProjectLighthouse.Tests/FileTypeTests.cs +++ b/ProjectLighthouse.Tests/Tests/FileTypeTests.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Text; -using LBPUnion.ProjectLighthouse.Types.Files; +using LBPUnion.ProjectLighthouse.Files; using Xunit; namespace LBPUnion.ProjectLighthouse.Tests; diff --git a/ProjectLighthouse.Tests/SerializerTests.cs b/ProjectLighthouse.Tests/Tests/SerializerTests.cs similarity index 100% rename from ProjectLighthouse.Tests/SerializerTests.cs rename to ProjectLighthouse.Tests/Tests/SerializerTests.cs diff --git a/ProjectLighthouse/Types/AdminPanelStatistic.cs b/ProjectLighthouse/Administration/AdminPanelStatistic.cs similarity index 88% rename from ProjectLighthouse/Types/AdminPanelStatistic.cs rename to ProjectLighthouse/Administration/AdminPanelStatistic.cs index eaa668a7..15830b3f 100644 --- a/ProjectLighthouse/Types/AdminPanelStatistic.cs +++ b/ProjectLighthouse/Administration/AdminPanelStatistic.cs @@ -1,6 +1,6 @@ #nullable enable -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.Administration; public struct AdminPanelStatistic { diff --git a/ProjectLighthouse/Types/DeletedBy.cs b/ProjectLighthouse/Administration/DeletedBy.cs similarity index 84% rename from ProjectLighthouse/Types/DeletedBy.cs rename to ProjectLighthouse/Administration/DeletedBy.cs index c0e57733..a5e1ca36 100644 --- a/ProjectLighthouse/Types/DeletedBy.cs +++ b/ProjectLighthouse/Administration/DeletedBy.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.Administration; [XmlRoot("deleted_by")] public enum DeletedBy diff --git a/ProjectLighthouse/Maintenance/Commands/CreateUserCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/CreateUserCommand.cs similarity index 92% rename from ProjectLighthouse/Maintenance/Commands/CreateUserCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/CreateUserCommand.cs index b76dc027..dba2b60c 100644 --- a/ProjectLighthouse/Maintenance/Commands/CreateUserCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/CreateUserCommand.cs @@ -2,10 +2,10 @@ using System.Threading.Tasks; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class CreateUserCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/DeleteUserCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/DeleteUserCommand.cs similarity index 88% rename from ProjectLighthouse/Maintenance/Commands/DeleteUserCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/DeleteUserCommand.cs index 2f1cae47..880b12a4 100644 --- a/ProjectLighthouse/Maintenance/Commands/DeleteUserCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/DeleteUserCommand.cs @@ -1,10 +1,10 @@ #nullable enable using System; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class DeleteUserCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/MakeUserAdminCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/MakeUserAdminCommand.cs similarity index 89% rename from ProjectLighthouse/Maintenance/Commands/MakeUserAdminCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/MakeUserAdminCommand.cs index 02ac96d5..2741a86d 100644 --- a/ProjectLighthouse/Maintenance/Commands/MakeUserAdminCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/MakeUserAdminCommand.cs @@ -1,10 +1,10 @@ #nullable enable using System; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class MakeUserAdminCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/RenameUserCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/RenameUserCommand.cs similarity index 90% rename from ProjectLighthouse/Maintenance/Commands/RenameUserCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/RenameUserCommand.cs index 6ba41f52..875b0539 100644 --- a/ProjectLighthouse/Maintenance/Commands/RenameUserCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/RenameUserCommand.cs @@ -1,10 +1,10 @@ #nullable enable using System; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class RenameUserCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/ResetPasswordCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/ResetPasswordCommand.cs similarity index 91% rename from ProjectLighthouse/Maintenance/Commands/ResetPasswordCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/ResetPasswordCommand.cs index aef0af62..e5d2c144 100644 --- a/ProjectLighthouse/Maintenance/Commands/ResetPasswordCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/ResetPasswordCommand.cs @@ -2,10 +2,10 @@ using System; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class ResetPasswordCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/TestWebhookCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/TestWebhookCommand.cs similarity index 87% rename from ProjectLighthouse/Maintenance/Commands/TestWebhookCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/TestWebhookCommand.cs index e92365d3..9beadef8 100644 --- a/ProjectLighthouse/Maintenance/Commands/TestWebhookCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/TestWebhookCommand.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using LBPUnion.ProjectLighthouse.Helpers; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class TestWebhookCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/Commands/WipeTokensForUserCommand.cs b/ProjectLighthouse/Administration/Maintenance/Commands/WipeTokensForUserCommand.cs similarity index 91% rename from ProjectLighthouse/Maintenance/Commands/WipeTokensForUserCommand.cs rename to ProjectLighthouse/Administration/Maintenance/Commands/WipeTokensForUserCommand.cs index 646963df..68db13ae 100644 --- a/ProjectLighthouse/Maintenance/Commands/WipeTokensForUserCommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/Commands/WipeTokensForUserCommand.cs @@ -2,10 +2,10 @@ using System; using System.Linq; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Maintenance.Commands; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands; public class WipeTokensForUserCommand : ICommand { diff --git a/ProjectLighthouse/Maintenance/ICommand.cs b/ProjectLighthouse/Administration/Maintenance/ICommand.cs similarity index 84% rename from ProjectLighthouse/Maintenance/ICommand.cs rename to ProjectLighthouse/Administration/Maintenance/ICommand.cs index 29fc63e0..070e73e3 100644 --- a/ProjectLighthouse/Maintenance/ICommand.cs +++ b/ProjectLighthouse/Administration/Maintenance/ICommand.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using JetBrains.Annotations; -namespace LBPUnion.ProjectLighthouse.Maintenance; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance; [UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)] public interface ICommand diff --git a/ProjectLighthouse/Maintenance/IMaintenanceJob.cs b/ProjectLighthouse/Administration/Maintenance/IMaintenanceJob.cs similarity index 70% rename from ProjectLighthouse/Maintenance/IMaintenanceJob.cs rename to ProjectLighthouse/Administration/Maintenance/IMaintenanceJob.cs index 545e7d33..cf9b82da 100644 --- a/ProjectLighthouse/Maintenance/IMaintenanceJob.cs +++ b/ProjectLighthouse/Administration/Maintenance/IMaintenanceJob.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace LBPUnion.ProjectLighthouse.Maintenance; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance; public interface IMaintenanceJob { diff --git a/ProjectLighthouse/Helpers/MaintenanceHelper.cs b/ProjectLighthouse/Administration/Maintenance/MaintenanceHelper.cs similarity index 95% rename from ProjectLighthouse/Helpers/MaintenanceHelper.cs rename to ProjectLighthouse/Administration/Maintenance/MaintenanceHelper.cs index 7b50b49d..8e434bd8 100644 --- a/ProjectLighthouse/Helpers/MaintenanceHelper.cs +++ b/ProjectLighthouse/Administration/Maintenance/MaintenanceHelper.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Maintenance; -namespace LBPUnion.ProjectLighthouse.Helpers; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance; public static class MaintenanceHelper { diff --git a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs similarity index 95% rename from ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs rename to ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs index 603ed685..fdd6f523 100644 --- a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs +++ b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupBrokenPhotosMaintenanceJob.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Files; +using LBPUnion.ProjectLighthouse.PlayerData; -namespace LBPUnion.ProjectLighthouse.Maintenance.MaintenanceJobs; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.MaintenanceJobs; public class CleanupBrokenPhotosMaintenanceJob : IMaintenanceJob { diff --git a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs similarity index 87% rename from ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs rename to ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs index a9d6da95..96e9d523 100644 --- a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs +++ b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupUnusedLocationsMaintenanceJob.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Maintenance.MaintenanceJobs; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.MaintenanceJobs; public class CleanupUnusedLocationsMaintenanceJob : IMaintenanceJob { diff --git a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs similarity index 79% rename from ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs rename to ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs index c504a16e..91dd40d3 100644 --- a/ProjectLighthouse/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs +++ b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/CleanupXMLInjection.cs @@ -1,13 +1,13 @@ #nullable enable using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Administration.Reports; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Reports; -using LBPUnion.ProjectLighthouse.Types.Reviews; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; -namespace LBPUnion.ProjectLighthouse.Maintenance.MaintenanceJobs; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.MaintenanceJobs; public class CleanupXmlInjection : IMaintenanceJob { diff --git a/ProjectLighthouse/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs similarity index 87% rename from ProjectLighthouse/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs rename to ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs index 4c6767ef..70b959de 100644 --- a/ProjectLighthouse/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs +++ b/ProjectLighthouse/Administration/Maintenance/MaintenanceJobs/DeleteAllTokensMaintenanceJob.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace LBPUnion.ProjectLighthouse.Maintenance.MaintenanceJobs; +namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.MaintenanceJobs; public class DeleteAllTokensMaintenanceJob : IMaintenanceJob { diff --git a/ProjectLighthouse/Types/Reports/GriefReport.cs b/ProjectLighthouse/Administration/Reports/GriefReport.cs similarity index 91% rename from ProjectLighthouse/Types/Reports/GriefReport.cs rename to ProjectLighthouse/Administration/Reports/GriefReport.cs index e0727b6a..a8e85c57 100644 --- a/ProjectLighthouse/Types/Reports/GriefReport.cs +++ b/ProjectLighthouse/Administration/Reports/GriefReport.cs @@ -1,8 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; [XmlRoot("griefReport")] public class GriefReport diff --git a/ProjectLighthouse/Types/Reports/GriefType.cs b/ProjectLighthouse/Administration/Reports/GriefType.cs similarity index 85% rename from ProjectLighthouse/Types/Reports/GriefType.cs rename to ProjectLighthouse/Administration/Reports/GriefType.cs index ccce115b..e651eab0 100644 --- a/ProjectLighthouse/Types/Reports/GriefType.cs +++ b/ProjectLighthouse/Administration/Reports/GriefType.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; public enum GriefType { diff --git a/ProjectLighthouse/Types/Reports/Marqee.cs b/ProjectLighthouse/Administration/Reports/Marqee.cs similarity index 70% rename from ProjectLighthouse/Types/Reports/Marqee.cs rename to ProjectLighthouse/Administration/Reports/Marqee.cs index 82e554cf..c5047516 100644 --- a/ProjectLighthouse/Types/Reports/Marqee.cs +++ b/ProjectLighthouse/Administration/Reports/Marqee.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; [XmlRoot("marqee")] public class Marqee diff --git a/ProjectLighthouse/Types/Reports/Rectangle.cs b/ProjectLighthouse/Administration/Reports/Rectangle.cs similarity index 83% rename from ProjectLighthouse/Types/Reports/Rectangle.cs rename to ProjectLighthouse/Administration/Reports/Rectangle.cs index 66a8116c..c01631ad 100644 --- a/ProjectLighthouse/Types/Reports/Rectangle.cs +++ b/ProjectLighthouse/Administration/Reports/Rectangle.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; public class Rectangle { diff --git a/ProjectLighthouse/Types/Reports/ReportPlayer.cs b/ProjectLighthouse/Administration/Reports/ReportPlayer.cs similarity index 87% rename from ProjectLighthouse/Types/Reports/ReportPlayer.cs rename to ProjectLighthouse/Administration/Reports/ReportPlayer.cs index 22c94a68..2526228e 100644 --- a/ProjectLighthouse/Types/Reports/ReportPlayer.cs +++ b/ProjectLighthouse/Administration/Reports/ReportPlayer.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; [XmlRoot("player")] public class ReportPlayer diff --git a/ProjectLighthouse/Types/Reports/VisiblePlayer.cs b/ProjectLighthouse/Administration/Reports/VisiblePlayer.cs similarity index 86% rename from ProjectLighthouse/Types/Reports/VisiblePlayer.cs rename to ProjectLighthouse/Administration/Reports/VisiblePlayer.cs index 78507bb1..4fc523e1 100644 --- a/ProjectLighthouse/Types/Reports/VisiblePlayer.cs +++ b/ProjectLighthouse/Administration/Reports/VisiblePlayer.cs @@ -1,7 +1,7 @@ using System; using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Reports; +namespace LBPUnion.ProjectLighthouse.Administration.Reports; [XmlRoot("visibleBadge")] [Serializable] diff --git a/ProjectLighthouse/Types/ApiEndpointController.cs b/ProjectLighthouse/ApiEndpointController.cs similarity index 77% rename from ProjectLighthouse/Types/ApiEndpointController.cs rename to ProjectLighthouse/ApiEndpointController.cs index 7a717cab..c42889cb 100644 --- a/ProjectLighthouse/Types/ApiEndpointController.cs +++ b/ProjectLighthouse/ApiEndpointController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse; [ApiController] [Route("/api/v1")] diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/AuthenticationConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/AuthenticationConfiguration.cs similarity index 78% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/AuthenticationConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/AuthenticationConfiguration.cs index d7ed58cc..c1f75473 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/AuthenticationConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/AuthenticationConfiguration.cs @@ -1,6 +1,6 @@ using System; -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class AuthenticationConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/CaptchaConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/CaptchaConfiguration.cs similarity index 82% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/CaptchaConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/CaptchaConfiguration.cs index fcbd1532..fad16ae6 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/CaptchaConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/CaptchaConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class CaptchaConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/DigestKeyConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/DigestKeyConfiguration.cs similarity index 69% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/DigestKeyConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/DigestKeyConfiguration.cs index 5f2f858e..006a2236 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/DigestKeyConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/DigestKeyConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class DigestKeyConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/DiscordIntegrationConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs similarity index 74% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/DiscordIntegrationConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs index c3563b54..92246899 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/DiscordIntegrationConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs @@ -1,5 +1,5 @@ #nullable enable -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class DiscordIntegrationConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/GoogleAnalyticsConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/GoogleAnalyticsConfiguration.cs similarity index 63% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/GoogleAnalyticsConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/GoogleAnalyticsConfiguration.cs index 84526c28..0cc543de 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/GoogleAnalyticsConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/GoogleAnalyticsConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class GoogleAnalyticsConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/InfluxDBConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/InfluxDBConfiguration.cs similarity index 84% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/InfluxDBConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/InfluxDBConfiguration.cs index c94d5aa6..c3aad3f2 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/InfluxDBConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/InfluxDBConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class InfluxDBConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/MailConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs similarity index 83% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/MailConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs index 2f3985b9..9bef477b 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/MailConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/MailConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class MailConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs similarity index 87% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs index 14459ded..6430b754 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/UserGeneratedContentLimitConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class UserGeneratedContentLimitConfiguration { diff --git a/ProjectLighthouse/Types/Settings/ConfigurationCategories/WebsiteConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/WebsiteConfiguration.cs similarity index 66% rename from ProjectLighthouse/Types/Settings/ConfigurationCategories/WebsiteConfiguration.cs rename to ProjectLighthouse/Configuration/ConfigurationCategories/WebsiteConfiguration.cs index 5715b795..7a31aa5a 100644 --- a/ProjectLighthouse/Types/Settings/ConfigurationCategories/WebsiteConfiguration.cs +++ b/ProjectLighthouse/Configuration/ConfigurationCategories/WebsiteConfiguration.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; public class WebsiteConfiguration { diff --git a/ProjectLighthouse/Types/Settings/Legacy/LegacyServerSettings.cs b/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs similarity index 96% rename from ProjectLighthouse/Types/Settings/Legacy/LegacyServerSettings.cs rename to ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs index 53f4a321..123fcf63 100644 --- a/ProjectLighthouse/Types/Settings/Legacy/LegacyServerSettings.cs +++ b/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs @@ -1,8 +1,9 @@ using System.IO; using System.Text.Json; -using LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; +using LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; +using LBPUnion.ProjectLighthouse.Types; -namespace LBPUnion.ProjectLighthouse.Types.Settings.Legacy; +namespace LBPUnion.ProjectLighthouse.Configuration.Legacy; #nullable enable internal class LegacyServerSettings @@ -146,7 +147,7 @@ internal class LegacyServerSettings Bucket = this.InfluxBucket, Organization = this.InfluxOrg, Token = this.InfluxToken, - Url = InfluxUrl, + Url = this.InfluxUrl, }; configuration.Authentication = new AuthenticationConfiguration diff --git a/ProjectLighthouse/Types/Settings/PrivacySettings.cs b/ProjectLighthouse/Configuration/PrivacySettings.cs similarity index 89% rename from ProjectLighthouse/Types/Settings/PrivacySettings.cs rename to ProjectLighthouse/Configuration/PrivacySettings.cs index b8c2e637..1bd96e1c 100644 --- a/ProjectLighthouse/Types/Settings/PrivacySettings.cs +++ b/ProjectLighthouse/Configuration/PrivacySettings.cs @@ -1,6 +1,6 @@ using LBPUnion.ProjectLighthouse.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Settings; +namespace LBPUnion.ProjectLighthouse.Configuration; public class PrivacySettings { diff --git a/ProjectLighthouse/Types/Settings/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs similarity index 97% rename from ProjectLighthouse/Types/Settings/ServerConfiguration.cs rename to ProjectLighthouse/Configuration/ServerConfiguration.cs index 67e64c79..3b1abdb9 100644 --- a/ProjectLighthouse/Types/Settings/ServerConfiguration.cs +++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs @@ -2,13 +2,14 @@ using System; using System.Diagnostics; using System.IO; +using LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories; +using LBPUnion.ProjectLighthouse.Configuration.Legacy; using LBPUnion.ProjectLighthouse.Logging; -using LBPUnion.ProjectLighthouse.Types.Settings.ConfigurationCategories; -using LBPUnion.ProjectLighthouse.Types.Settings.Legacy; +using LBPUnion.ProjectLighthouse.Types; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -namespace LBPUnion.ProjectLighthouse.Types.Settings; +namespace LBPUnion.ProjectLighthouse.Configuration; [Serializable] public class ServerConfiguration diff --git a/ProjectLighthouse/Types/Settings/ServerStatics.cs b/ProjectLighthouse/Configuration/ServerStatics.cs similarity index 93% rename from ProjectLighthouse/Types/Settings/ServerStatics.cs rename to ProjectLighthouse/Configuration/ServerStatics.cs index 3753859c..cc75213e 100644 --- a/ProjectLighthouse/Types/Settings/ServerStatics.cs +++ b/ProjectLighthouse/Configuration/ServerStatics.cs @@ -3,7 +3,7 @@ using System; using System.Linq; using LBPUnion.ProjectLighthouse.Logging; -namespace LBPUnion.ProjectLighthouse.Types.Settings; +namespace LBPUnion.ProjectLighthouse.Configuration; public static class ServerStatics { diff --git a/ProjectLighthouse/Database.cs b/ProjectLighthouse/Database.cs index 80d7434b..7430e070 100644 --- a/ProjectLighthouse/Database.cs +++ b/ProjectLighthouse/Database.cs @@ -3,16 +3,17 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Administration.Reports; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.Levels.Categories; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; +using LBPUnion.ProjectLighthouse.Tickets; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Categories; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Profiles.Email; -using LBPUnion.ProjectLighthouse.Types.Reports; -using LBPUnion.ProjectLighthouse.Types.Reviews; -using LBPUnion.ProjectLighthouse.Types.Settings; -using LBPUnion.ProjectLighthouse.Types.Tickets; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse/Extensions/DatabaseExtensions.cs b/ProjectLighthouse/Extensions/DatabaseExtensions.cs index 036401be..eb8af6c7 100644 --- a/ProjectLighthouse/Extensions/DatabaseExtensions.cs +++ b/ProjectLighthouse/Extensions/DatabaseExtensions.cs @@ -1,7 +1,8 @@ using System.Linq; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Reviews; using Microsoft.EntityFrameworkCore; namespace LBPUnion.ProjectLighthouse.Extensions; diff --git a/ProjectLighthouse/Extensions/RequestExtensions.cs b/ProjectLighthouse/Extensions/RequestExtensions.cs index 7dcaec93..d375246c 100644 --- a/ProjectLighthouse/Extensions/RequestExtensions.cs +++ b/ProjectLighthouse/Extensions/RequestExtensions.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Net.Http; using System.Text.RegularExpressions; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Configuration; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; diff --git a/ProjectLighthouse/Extensions/RoomExtensions.cs b/ProjectLighthouse/Extensions/RoomExtensions.cs index 32976beb..df75cea0 100644 --- a/ProjectLighthouse/Extensions/RoomExtensions.cs +++ b/ProjectLighthouse/Extensions/RoomExtensions.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Match; namespace LBPUnion.ProjectLighthouse.Extensions; diff --git a/ProjectLighthouse/Helpers/FileHelper.cs b/ProjectLighthouse/Files/FileHelper.cs similarity index 98% rename from ProjectLighthouse/Helpers/FileHelper.cs rename to ProjectLighthouse/Files/FileHelper.cs index f3a104c7..3c2066f4 100644 --- a/ProjectLighthouse/Helpers/FileHelper.cs +++ b/ProjectLighthouse/Files/FileHelper.cs @@ -8,14 +8,13 @@ using System.Threading; using System.Threading.Tasks; using DDSReader; using ICSharpCode.SharpZipLib.Zip.Compression; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Logging; -using LBPUnion.ProjectLighthouse.Types.Files; -using LBPUnion.ProjectLighthouse.Types.Settings; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; -namespace LBPUnion.ProjectLighthouse.Helpers; +namespace LBPUnion.ProjectLighthouse.Files; public static class FileHelper { diff --git a/ProjectLighthouse/Types/Files/LbpFile.cs b/ProjectLighthouse/Files/LbpFile.cs similarity index 94% rename from ProjectLighthouse/Types/Files/LbpFile.cs rename to ProjectLighthouse/Files/LbpFile.cs index 4b2909a6..e36e1b2c 100644 --- a/ProjectLighthouse/Types/Files/LbpFile.cs +++ b/ProjectLighthouse/Files/LbpFile.cs @@ -2,7 +2,7 @@ using System.IO; using LBPUnion.ProjectLighthouse.Helpers; -namespace LBPUnion.ProjectLighthouse.Types.Files; +namespace LBPUnion.ProjectLighthouse.Files; public class LbpFile { diff --git a/ProjectLighthouse/Types/Files/LbpFileType.cs b/ProjectLighthouse/Files/LbpFileType.cs similarity index 89% rename from ProjectLighthouse/Types/Files/LbpFileType.cs rename to ProjectLighthouse/Files/LbpFileType.cs index 6005bc80..31043379 100644 --- a/ProjectLighthouse/Types/Files/LbpFileType.cs +++ b/ProjectLighthouse/Files/LbpFileType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Files; +namespace LBPUnion.ProjectLighthouse.Files; public enum LbpFileType { diff --git a/ProjectLighthouse/Helpers/CensorHelper.cs b/ProjectLighthouse/Helpers/CensorHelper.cs index d9b9af05..85d3db91 100644 --- a/ProjectLighthouse/Helpers/CensorHelper.cs +++ b/ProjectLighthouse/Helpers/CensorHelper.cs @@ -1,7 +1,7 @@ using System; using System.Text; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Helpers/GameVersionHelper.cs b/ProjectLighthouse/Helpers/GameVersionHelper.cs index c31adb18..a33cd43d 100644 --- a/ProjectLighthouse/Helpers/GameVersionHelper.cs +++ b/ProjectLighthouse/Helpers/GameVersionHelper.cs @@ -1,4 +1,5 @@ using System.Linq; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Helpers/InfluxHelper.cs b/ProjectLighthouse/Helpers/InfluxHelper.cs index 2c7e340a..a9266390 100644 --- a/ProjectLighthouse/Helpers/InfluxHelper.cs +++ b/ProjectLighthouse/Helpers/InfluxHelper.cs @@ -5,10 +5,11 @@ using System.Threading; using System.Threading.Tasks; using InfluxDB.Client; using InfluxDB.Client.Writes; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Helpers/MatchHelper.cs b/ProjectLighthouse/Helpers/MatchHelper.cs index f04eb938..aa7d5908 100644 --- a/ProjectLighthouse/Helpers/MatchHelper.cs +++ b/ProjectLighthouse/Helpers/MatchHelper.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Linq; using System.Text.Json; using System.Text.RegularExpressions; -using LBPUnion.ProjectLighthouse.Types.Match; +using LBPUnion.ProjectLighthouse.Match.MatchCommands; namespace LBPUnion.ProjectLighthouse.Helpers; @@ -37,7 +37,7 @@ public static class MatchHelper } // This is the function used to show people how laughably awful LBP's protocol is. Beware. - public static IMatchData? Deserialize(string data) + public static IMatchCommand? Deserialize(string data) { string matchType = ""; @@ -61,7 +61,7 @@ public static class MatchHelper return Deserialize(matchType, matchData); } - public static IMatchData? Deserialize(string matchType, string matchData) + public static IMatchCommand? Deserialize(string matchType, string matchData) { return matchType switch { diff --git a/ProjectLighthouse/Helpers/SMTPHelper.cs b/ProjectLighthouse/Helpers/SMTPHelper.cs index ca5b903e..3a72db02 100644 --- a/ProjectLighthouse/Helpers/SMTPHelper.cs +++ b/ProjectLighthouse/Helpers/SMTPHelper.cs @@ -1,7 +1,7 @@ using System; using System.Net; using System.Net.Mail; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Configuration; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Helpers/StatisticsHelper.cs b/ProjectLighthouse/Helpers/StatisticsHelper.cs index 219b6d80..a03b03ab 100644 --- a/ProjectLighthouse/Helpers/StatisticsHelper.cs +++ b/ProjectLighthouse/Helpers/StatisticsHelper.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.PlayerData; using LBPUnion.ProjectLighthouse.Types; using Microsoft.EntityFrameworkCore; diff --git a/ProjectLighthouse/Helpers/VersionHelper.cs b/ProjectLighthouse/Helpers/VersionHelper.cs index a6b50a7c..84b67711 100644 --- a/ProjectLighthouse/Helpers/VersionHelper.cs +++ b/ProjectLighthouse/Helpers/VersionHelper.cs @@ -1,6 +1,6 @@ using System.Linq; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Logging; -using LBPUnion.ProjectLighthouse.Types.Settings; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Helpers/WebhookHelper.cs b/ProjectLighthouse/Helpers/WebhookHelper.cs index a708ba1a..031a79de 100644 --- a/ProjectLighthouse/Helpers/WebhookHelper.cs +++ b/ProjectLighthouse/Helpers/WebhookHelper.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Discord; using Discord.Webhook; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Configuration; namespace LBPUnion.ProjectLighthouse.Helpers; diff --git a/ProjectLighthouse/Types/Categories/Category.cs b/ProjectLighthouse/Levels/Categories/Category.cs similarity index 95% rename from ProjectLighthouse/Types/Categories/Category.cs rename to ProjectLighthouse/Levels/Categories/Category.cs index c2d2918a..1f673f33 100644 --- a/ProjectLighthouse/Types/Categories/Category.cs +++ b/ProjectLighthouse/Levels/Categories/Category.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; [XmlType("category")] [XmlRoot("category")] diff --git a/ProjectLighthouse/Helpers/CollectionHelper.cs b/ProjectLighthouse/Levels/Categories/CategoryHelper.cs similarity index 74% rename from ProjectLighthouse/Helpers/CollectionHelper.cs rename to ProjectLighthouse/Levels/Categories/CategoryHelper.cs index 7a19065a..2440402e 100644 --- a/ProjectLighthouse/Helpers/CollectionHelper.cs +++ b/ProjectLighthouse/Levels/Categories/CategoryHelper.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; -using LBPUnion.ProjectLighthouse.Types.Categories; -namespace LBPUnion.ProjectLighthouse.Helpers; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; -public static class CollectionHelper +public static class CategoryHelper { public static readonly List Categories = new(); - static CollectionHelper() + static CategoryHelper() { Categories.Add(new TeamPicksCategory()); Categories.Add(new NewestLevelsCategory()); diff --git a/ProjectLighthouse/Types/Categories/CategoryWithUser.cs b/ProjectLighthouse/Levels/Categories/CategoryWithUser.cs similarity index 95% rename from ProjectLighthouse/Types/Categories/CategoryWithUser.cs rename to ProjectLighthouse/Levels/Categories/CategoryWithUser.cs index 53d18388..ae2a2281 100644 --- a/ProjectLighthouse/Types/Categories/CategoryWithUser.cs +++ b/ProjectLighthouse/Levels/Categories/CategoryWithUser.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Diagnostics; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public abstract class CategoryWithUser : Category { diff --git a/ProjectLighthouse/Types/Categories/CustomCategory.cs b/ProjectLighthouse/Levels/Categories/CustomCategory.cs similarity index 93% rename from ProjectLighthouse/Types/Categories/CustomCategory.cs rename to ProjectLighthouse/Levels/Categories/CustomCategory.cs index 4ef99957..295f0842 100644 --- a/ProjectLighthouse/Types/Categories/CustomCategory.cs +++ b/ProjectLighthouse/Levels/Categories/CustomCategory.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using LBPUnion.ProjectLighthouse.Extensions; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class CustomCategory : Category { diff --git a/ProjectLighthouse/Types/Categories/DatabaseCategory.cs b/ProjectLighthouse/Levels/Categories/DatabaseCategory.cs similarity index 91% rename from ProjectLighthouse/Types/Categories/DatabaseCategory.cs rename to ProjectLighthouse/Levels/Categories/DatabaseCategory.cs index 648985c9..194dae7c 100644 --- a/ProjectLighthouse/Types/Categories/DatabaseCategory.cs +++ b/ProjectLighthouse/Levels/Categories/DatabaseCategory.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class DatabaseCategory { diff --git a/ProjectLighthouse/Types/Categories/HeartedCategory.cs b/ProjectLighthouse/Levels/Categories/HeartedCategory.cs similarity index 88% rename from ProjectLighthouse/Types/Categories/HeartedCategory.cs rename to ProjectLighthouse/Levels/Categories/HeartedCategory.cs index dfcfacd9..4b8b1a73 100644 --- a/ProjectLighthouse/Types/Categories/HeartedCategory.cs +++ b/ProjectLighthouse/Levels/Categories/HeartedCategory.cs @@ -3,10 +3,11 @@ using System; using System.Collections.Generic; using System.Linq; using LBPUnion.ProjectLighthouse.Extensions; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class HeartedCategory : CategoryWithUser { diff --git a/ProjectLighthouse/Types/Categories/NewestLevelsCategory.cs b/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs similarity index 90% rename from ProjectLighthouse/Types/Categories/NewestLevelsCategory.cs rename to ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs index f9ff0626..a5d41b16 100644 --- a/ProjectLighthouse/Types/Categories/NewestLevelsCategory.cs +++ b/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; using LBPUnion.ProjectLighthouse.Extensions; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class NewestLevelsCategory : Category { diff --git a/ProjectLighthouse/Types/Categories/QueueCategory.cs b/ProjectLighthouse/Levels/Categories/QueueCategory.cs similarity index 88% rename from ProjectLighthouse/Types/Categories/QueueCategory.cs rename to ProjectLighthouse/Levels/Categories/QueueCategory.cs index 87e435a1..352d3d69 100644 --- a/ProjectLighthouse/Types/Categories/QueueCategory.cs +++ b/ProjectLighthouse/Levels/Categories/QueueCategory.cs @@ -3,10 +3,11 @@ using System; using System.Collections.Generic; using System.Linq; using LBPUnion.ProjectLighthouse.Extensions; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class QueueCategory : CategoryWithUser { diff --git a/ProjectLighthouse/Types/Categories/TeamPicksCategory.cs b/ProjectLighthouse/Levels/Categories/TeamPicksCategory.cs similarity index 91% rename from ProjectLighthouse/Types/Categories/TeamPicksCategory.cs rename to ProjectLighthouse/Levels/Categories/TeamPicksCategory.cs index 931615d0..40439cb1 100644 --- a/ProjectLighthouse/Types/Categories/TeamPicksCategory.cs +++ b/ProjectLighthouse/Levels/Categories/TeamPicksCategory.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; using LBPUnion.ProjectLighthouse.Extensions; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.PlayerData; -namespace LBPUnion.ProjectLighthouse.Types.Categories; +namespace LBPUnion.ProjectLighthouse.Levels.Categories; public class TeamPicksCategory : Category { diff --git a/ProjectLighthouse/Types/Levels/HeartedLevel.cs b/ProjectLighthouse/Levels/HeartedLevel.cs similarity index 81% rename from ProjectLighthouse/Types/Levels/HeartedLevel.cs rename to ProjectLighthouse/Levels/HeartedLevel.cs index 6500f3e9..8e9ab867 100644 --- a/ProjectLighthouse/Types/Levels/HeartedLevel.cs +++ b/ProjectLighthouse/Levels/HeartedLevel.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; public class HeartedLevel { diff --git a/ProjectLighthouse/Types/Levels/LevelTags.cs b/ProjectLighthouse/Levels/LevelTags.cs similarity index 96% rename from ProjectLighthouse/Types/Levels/LevelTags.cs rename to ProjectLighthouse/Levels/LevelTags.cs index 2df0d786..1d6f2e2f 100644 --- a/ProjectLighthouse/Types/Levels/LevelTags.cs +++ b/ProjectLighthouse/Levels/LevelTags.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; /// /// A series of tags that can be applied to a level diff --git a/ProjectLighthouse/Types/Levels/QueuedLevel.cs b/ProjectLighthouse/Levels/QueuedLevel.cs similarity index 81% rename from ProjectLighthouse/Types/Levels/QueuedLevel.cs rename to ProjectLighthouse/Levels/QueuedLevel.cs index 2957d9ce..45481ce6 100644 --- a/ProjectLighthouse/Types/Levels/QueuedLevel.cs +++ b/ProjectLighthouse/Levels/QueuedLevel.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; public class QueuedLevel { diff --git a/ProjectLighthouse/Types/Levels/RatedLevel.cs b/ProjectLighthouse/Levels/RatedLevel.cs similarity index 84% rename from ProjectLighthouse/Types/Levels/RatedLevel.cs rename to ProjectLighthouse/Levels/RatedLevel.cs index d34afd08..265783e3 100644 --- a/ProjectLighthouse/Types/Levels/RatedLevel.cs +++ b/ProjectLighthouse/Levels/RatedLevel.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; public class RatedLevel { diff --git a/ProjectLighthouse/Types/Levels/Slot.cs b/ProjectLighthouse/Levels/Slot.cs similarity index 96% rename from ProjectLighthouse/Types/Levels/Slot.cs rename to ProjectLighthouse/Levels/Slot.cs index 39948064..098d7760 100644 --- a/ProjectLighthouse/Types/Levels/Slot.cs +++ b/ProjectLighthouse/Levels/Slot.cs @@ -4,13 +4,16 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text.Json.Serialization; using System.Xml.Serialization; -using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Files; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.PlayerData.Reviews; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Reviews; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Types; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; /// /// A LittleBigPlanet level. diff --git a/ProjectLighthouse/Types/Levels/SlotType.cs b/ProjectLighthouse/Levels/SlotType.cs similarity index 72% rename from ProjectLighthouse/Types/Levels/SlotType.cs rename to ProjectLighthouse/Levels/SlotType.cs index 4554addd..a34876c9 100644 --- a/ProjectLighthouse/Types/Levels/SlotType.cs +++ b/ProjectLighthouse/Levels/SlotType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; public enum SlotType { diff --git a/ProjectLighthouse/Types/Levels/VisitedLevel.cs b/ProjectLighthouse/Levels/VisitedLevel.cs similarity index 85% rename from ProjectLighthouse/Types/Levels/VisitedLevel.cs rename to ProjectLighthouse/Levels/VisitedLevel.cs index 167bd258..93a4c4f0 100644 --- a/ProjectLighthouse/Types/Levels/VisitedLevel.cs +++ b/ProjectLighthouse/Levels/VisitedLevel.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Levels; +namespace LBPUnion.ProjectLighthouse.Levels; public class VisitedLevel { diff --git a/ProjectLighthouse/Logging/Loggers/InfluxLogger.cs b/ProjectLighthouse/Logging/Loggers/InfluxLogger.cs index 777bd04e..a5685d32 100644 --- a/ProjectLighthouse/Logging/Loggers/InfluxLogger.cs +++ b/ProjectLighthouse/Logging/Loggers/InfluxLogger.cs @@ -1,7 +1,7 @@ using InfluxDB.Client; using InfluxDB.Client.Writes; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types.Settings; namespace LBPUnion.ProjectLighthouse.Logging.Loggers; diff --git a/ProjectLighthouse/Logging/Loggers/LighthouseFileLogger.cs b/ProjectLighthouse/Logging/Loggers/LighthouseFileLogger.cs index 21eac271..405e31a1 100644 --- a/ProjectLighthouse/Logging/Loggers/LighthouseFileLogger.cs +++ b/ProjectLighthouse/Logging/Loggers/LighthouseFileLogger.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; namespace LBPUnion.ProjectLighthouse.Logging.Loggers; diff --git a/ProjectLighthouse/Types/Match/CreateRoom.cs b/ProjectLighthouse/Match/MatchCommands/CreateRoom.cs similarity index 86% rename from ProjectLighthouse/Types/Match/CreateRoom.cs rename to ProjectLighthouse/Match/MatchCommands/CreateRoom.cs index 1b244315..345674e4 100644 --- a/ProjectLighthouse/Types/Match/CreateRoom.cs +++ b/ProjectLighthouse/Match/MatchCommands/CreateRoom.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.Match.Rooms; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.MatchCommands; [SuppressMessage("ReSharper", "CollectionNeverUpdated.Global")] -public class CreateRoom : IMatchData +public class CreateRoom : IMatchCommand { public int BuildVersion; public int HostMood; diff --git a/ProjectLighthouse/Types/Match/FindBestRoom.cs b/ProjectLighthouse/Match/MatchCommands/FindBestRoom.cs similarity index 82% rename from ProjectLighthouse/Types/Match/FindBestRoom.cs rename to ProjectLighthouse/Match/MatchCommands/FindBestRoom.cs index eebf2e57..255c7c7f 100644 --- a/ProjectLighthouse/Types/Match/FindBestRoom.cs +++ b/ProjectLighthouse/Match/MatchCommands/FindBestRoom.cs @@ -1,13 +1,14 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.Match.Rooms; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.MatchCommands; // Schema is the EXACT SAME as CreateRoom (but cant be a subclass here), so see comments there for details [SuppressMessage("ReSharper", "CollectionNeverUpdated.Global")] -public class FindBestRoom : IMatchData +public class FindBestRoom : IMatchCommand { public int BuildVersion; public int HostMood; diff --git a/ProjectLighthouse/Match/MatchCommands/IMatchCommand.cs b/ProjectLighthouse/Match/MatchCommands/IMatchCommand.cs new file mode 100644 index 00000000..fa0f3a40 --- /dev/null +++ b/ProjectLighthouse/Match/MatchCommands/IMatchCommand.cs @@ -0,0 +1,4 @@ +namespace LBPUnion.ProjectLighthouse.Match.MatchCommands; + +public interface IMatchCommand +{} \ No newline at end of file diff --git a/ProjectLighthouse/Match/MatchCommands/UpdateMyPlayerData.cs b/ProjectLighthouse/Match/MatchCommands/UpdateMyPlayerData.cs new file mode 100644 index 00000000..82334536 --- /dev/null +++ b/ProjectLighthouse/Match/MatchCommands/UpdateMyPlayerData.cs @@ -0,0 +1,11 @@ +#nullable enable +using LBPUnion.ProjectLighthouse.Match.Rooms; + +namespace LBPUnion.ProjectLighthouse.Match.MatchCommands; + +public class UpdateMyPlayerData : IMatchCommand +{ + public string Player { get; set; } = null!; + + public RoomState? RoomState { get; set; } +} \ No newline at end of file diff --git a/ProjectLighthouse/Types/Match/UpdatePlayersInRoom.cs b/ProjectLighthouse/Match/MatchCommands/UpdatePlayersInRoom.cs similarity index 69% rename from ProjectLighthouse/Types/Match/UpdatePlayersInRoom.cs rename to ProjectLighthouse/Match/MatchCommands/UpdatePlayersInRoom.cs index 58288b5c..50628471 100644 --- a/ProjectLighthouse/Types/Match/UpdatePlayersInRoom.cs +++ b/ProjectLighthouse/Match/MatchCommands/UpdatePlayersInRoom.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.MatchCommands; [SuppressMessage("ReSharper", "CollectionNeverUpdated.Global")] -public class UpdatePlayersInRoom : IMatchData +public class UpdatePlayersInRoom : IMatchCommand { public List Players { get; set; } public List Reservations { get; set; } diff --git a/ProjectLighthouse/Types/Match/NatType.cs b/ProjectLighthouse/Match/NatType.cs similarity index 59% rename from ProjectLighthouse/Types/Match/NatType.cs rename to ProjectLighthouse/Match/NatType.cs index efd54b16..ab007eae 100644 --- a/ProjectLighthouse/Types/Match/NatType.cs +++ b/ProjectLighthouse/Match/NatType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match; public enum NatType { diff --git a/ProjectLighthouse/Types/Match/Player.cs b/ProjectLighthouse/Match/Player.cs similarity index 79% rename from ProjectLighthouse/Types/Match/Player.cs rename to ProjectLighthouse/Match/Player.cs index 263ed4fe..a36d717d 100644 --- a/ProjectLighthouse/Types/Match/Player.cs +++ b/ProjectLighthouse/Match/Player.cs @@ -1,8 +1,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match; [Serializable] public class Player diff --git a/ProjectLighthouse/Types/Match/FindBestRoomResponse.cs b/ProjectLighthouse/Match/Rooms/FindBestRoomResponse.cs similarity index 90% rename from ProjectLighthouse/Types/Match/FindBestRoomResponse.cs rename to ProjectLighthouse/Match/Rooms/FindBestRoomResponse.cs index 42b23769..f22c0ebb 100644 --- a/ProjectLighthouse/Types/Match/FindBestRoomResponse.cs +++ b/ProjectLighthouse/Match/Rooms/FindBestRoomResponse.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.Rooms; public class FindBestRoomResponse { diff --git a/ProjectLighthouse/Types/Match/Room.cs b/ProjectLighthouse/Match/Rooms/Room.cs similarity index 94% rename from ProjectLighthouse/Types/Match/Room.cs rename to ProjectLighthouse/Match/Rooms/Room.cs index 6772cc04..4692ff68 100644 --- a/ProjectLighthouse/Types/Match/Room.cs +++ b/ProjectLighthouse/Match/Rooms/Room.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; +using LBPUnion.ProjectLighthouse.PlayerData; using Redis.OM.Modeling; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.Rooms; [Document(StorageType = StorageType.Json)] public class Room diff --git a/ProjectLighthouse/Helpers/RoomHelper.cs b/ProjectLighthouse/Match/Rooms/RoomHelper.cs similarity index 97% rename from ProjectLighthouse/Helpers/RoomHelper.cs rename to ProjectLighthouse/Match/Rooms/RoomHelper.cs index 5988252c..1bf04469 100644 --- a/ProjectLighthouse/Helpers/RoomHelper.cs +++ b/ProjectLighthouse/Match/Rooms/RoomHelper.cs @@ -4,15 +4,15 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading.Tasks; using LBPUnion.ProjectLighthouse.Extensions; +using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.Levels; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.StorableLists; using LBPUnion.ProjectLighthouse.StorableLists.Stores; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Levels; -using LBPUnion.ProjectLighthouse.Types.Match; -using LBPUnion.ProjectLighthouse.Types.Profiles; -namespace LBPUnion.ProjectLighthouse.Helpers; +namespace LBPUnion.ProjectLighthouse.Match.Rooms; public class RoomHelper { diff --git a/ProjectLighthouse/Types/Match/RoomSlot.cs b/ProjectLighthouse/Match/Rooms/RoomSlot.cs similarity index 69% rename from ProjectLighthouse/Types/Match/RoomSlot.cs rename to ProjectLighthouse/Match/Rooms/RoomSlot.cs index 0a21b494..452ac207 100644 --- a/ProjectLighthouse/Types/Match/RoomSlot.cs +++ b/ProjectLighthouse/Match/Rooms/RoomSlot.cs @@ -1,6 +1,6 @@ -using LBPUnion.ProjectLighthouse.Types.Levels; +using LBPUnion.ProjectLighthouse.Levels; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.Rooms; public class RoomSlot { diff --git a/ProjectLighthouse/Types/Match/RoomState.cs b/ProjectLighthouse/Match/Rooms/RoomState.cs similarity index 93% rename from ProjectLighthouse/Types/Match/RoomState.cs rename to ProjectLighthouse/Match/Rooms/RoomState.cs index 88145125..ed07937b 100644 --- a/ProjectLighthouse/Types/Match/RoomState.cs +++ b/ProjectLighthouse/Match/Rooms/RoomState.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace LBPUnion.ProjectLighthouse.Types.Match; +namespace LBPUnion.ProjectLighthouse.Match.Rooms; [SuppressMessage("ReSharper", "UnusedMember.Global")] public enum RoomState diff --git a/ProjectLighthouse/Types/AuthenticationAttempt.cs b/ProjectLighthouse/PlayerData/AuthenticationAttempt.cs similarity index 90% rename from ProjectLighthouse/Types/AuthenticationAttempt.cs rename to ProjectLighthouse/PlayerData/AuthenticationAttempt.cs index 76c45278..96eefad0 100644 --- a/ProjectLighthouse/Types/AuthenticationAttempt.cs +++ b/ProjectLighthouse/PlayerData/AuthenticationAttempt.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public class AuthenticationAttempt { diff --git a/ProjectLighthouse/Types/GameToken.cs b/ProjectLighthouse/PlayerData/GameToken.cs similarity index 86% rename from ProjectLighthouse/Types/GameToken.cs rename to ProjectLighthouse/PlayerData/GameToken.cs index 0e57d7fd..dd83924a 100644 --- a/ProjectLighthouse/Types/GameToken.cs +++ b/ProjectLighthouse/PlayerData/GameToken.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public class GameToken { diff --git a/ProjectLighthouse/Types/GameVersion.cs b/ProjectLighthouse/PlayerData/GameVersion.cs similarity index 88% rename from ProjectLighthouse/Types/GameVersion.cs rename to ProjectLighthouse/PlayerData/GameVersion.cs index 8e5c8b6b..29c72684 100644 --- a/ProjectLighthouse/Types/GameVersion.cs +++ b/ProjectLighthouse/PlayerData/GameVersion.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public enum GameVersion { diff --git a/ProjectLighthouse/Helpers/LastContactHelper.cs b/ProjectLighthouse/PlayerData/LastContactHelper.cs similarity index 86% rename from ProjectLighthouse/Helpers/LastContactHelper.cs rename to ProjectLighthouse/PlayerData/LastContactHelper.cs index 83b100f8..28c9ae6c 100644 --- a/ProjectLighthouse/Helpers/LastContactHelper.cs +++ b/ProjectLighthouse/PlayerData/LastContactHelper.cs @@ -1,11 +1,11 @@ #nullable enable using System.Linq; using System.Threading.Tasks; -using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Profiles; +using LBPUnion.ProjectLighthouse.Helpers; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Helpers; +namespace LBPUnion.ProjectLighthouse.PlayerData; public static class LastContactHelper { diff --git a/ProjectLighthouse/Types/LoginResult.cs b/ProjectLighthouse/PlayerData/LoginResult.cs similarity index 92% rename from ProjectLighthouse/Types/LoginResult.cs rename to ProjectLighthouse/PlayerData/LoginResult.cs index 274559b7..f577f175 100644 --- a/ProjectLighthouse/Types/LoginResult.cs +++ b/ProjectLighthouse/PlayerData/LoginResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Serialization; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; /// /// Response to POST /login diff --git a/ProjectLighthouse/Types/Photo.cs b/ProjectLighthouse/PlayerData/Photo.cs similarity index 96% rename from ProjectLighthouse/Types/Photo.cs rename to ProjectLighthouse/PlayerData/Photo.cs index 5d84ca5d..8a8ca224 100644 --- a/ProjectLighthouse/Types/Photo.cs +++ b/ProjectLighthouse/PlayerData/Photo.cs @@ -5,10 +5,11 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; [XmlRoot("photo")] [XmlType("photo")] diff --git a/ProjectLighthouse/Types/PhotoSubject.cs b/ProjectLighthouse/PlayerData/PhotoSubject.cs similarity index 91% rename from ProjectLighthouse/Types/PhotoSubject.cs rename to ProjectLighthouse/PlayerData/PhotoSubject.cs index bf8d71e6..4257743e 100644 --- a/ProjectLighthouse/Types/PhotoSubject.cs +++ b/ProjectLighthouse/PlayerData/PhotoSubject.cs @@ -3,9 +3,10 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; // [XmlRoot("subject")] [XmlType("subject")] diff --git a/ProjectLighthouse/Types/Platform.cs b/ProjectLighthouse/PlayerData/Platform.cs similarity index 70% rename from ProjectLighthouse/Types/Platform.cs rename to ProjectLighthouse/PlayerData/Platform.cs index b863f285..bbb3d372 100644 --- a/ProjectLighthouse/Types/Platform.cs +++ b/ProjectLighthouse/PlayerData/Platform.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public enum Platform { diff --git a/ProjectLighthouse/Types/Profiles/ClientsConnected.cs b/ProjectLighthouse/PlayerData/Profiles/ClientsConnected.cs similarity index 92% rename from ProjectLighthouse/Types/Profiles/ClientsConnected.cs rename to ProjectLighthouse/PlayerData/Profiles/ClientsConnected.cs index d54590d0..b0b9c57a 100644 --- a/ProjectLighthouse/Types/Profiles/ClientsConnected.cs +++ b/ProjectLighthouse/PlayerData/Profiles/ClientsConnected.cs @@ -1,7 +1,7 @@ using LBPUnion.ProjectLighthouse.Serialization; using Microsoft.EntityFrameworkCore; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; [Keyless] public class ClientsConnected diff --git a/ProjectLighthouse/Types/Profiles/Comment.cs b/ProjectLighthouse/PlayerData/Profiles/Comment.cs similarity index 96% rename from ProjectLighthouse/Types/Profiles/Comment.cs rename to ProjectLighthouse/PlayerData/Profiles/Comment.cs index d263c091..36782a60 100644 --- a/ProjectLighthouse/Types/Profiles/Comment.cs +++ b/ProjectLighthouse/PlayerData/Profiles/Comment.cs @@ -3,8 +3,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Serialization; +using LBPUnion.ProjectLighthouse.Types; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; [XmlRoot("comment")] [XmlType("comment")] diff --git a/ProjectLighthouse/Types/Profiles/Email/EmailSetToken.cs b/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs similarity index 83% rename from ProjectLighthouse/Types/Profiles/Email/EmailSetToken.cs rename to ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs index 0b3258af..152e42ed 100644 --- a/ProjectLighthouse/Types/Profiles/Email/EmailSetToken.cs +++ b/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types.Profiles.Email; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; public class EmailSetToken { diff --git a/ProjectLighthouse/Types/Profiles/Email/EmailVerificationToken.cs b/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs similarity index 84% rename from ProjectLighthouse/Types/Profiles/Email/EmailVerificationToken.cs rename to ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs index 0604d2e5..61559cce 100644 --- a/ProjectLighthouse/Types/Profiles/Email/EmailVerificationToken.cs +++ b/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types.Profiles.Email; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email; public class EmailVerificationToken { diff --git a/ProjectLighthouse/Types/HeartedProfile.cs b/ProjectLighthouse/PlayerData/Profiles/HeartedProfile.cs similarity index 91% rename from ProjectLighthouse/Types/HeartedProfile.cs rename to ProjectLighthouse/PlayerData/Profiles/HeartedProfile.cs index f60fcee5..04a2dc92 100644 --- a/ProjectLighthouse/Types/HeartedProfile.cs +++ b/ProjectLighthouse/PlayerData/Profiles/HeartedProfile.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class HeartedProfile { diff --git a/ProjectLighthouse/Types/Profiles/LastContact.cs b/ProjectLighthouse/PlayerData/Profiles/LastContact.cs similarity index 87% rename from ProjectLighthouse/Types/Profiles/LastContact.cs rename to ProjectLighthouse/PlayerData/Profiles/LastContact.cs index 5e7b1fea..4f90d32b 100644 --- a/ProjectLighthouse/Types/Profiles/LastContact.cs +++ b/ProjectLighthouse/PlayerData/Profiles/LastContact.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class LastContact { diff --git a/ProjectLighthouse/Types/Profiles/Location.cs b/ProjectLighthouse/PlayerData/Profiles/Location.cs similarity index 89% rename from ProjectLighthouse/Types/Profiles/Location.cs rename to ProjectLighthouse/PlayerData/Profiles/Location.cs index 6d07d62f..a0428f91 100644 --- a/ProjectLighthouse/Types/Profiles/Location.cs +++ b/ProjectLighthouse/PlayerData/Profiles/Location.cs @@ -1,7 +1,7 @@ using System.Xml.Serialization; using LBPUnion.ProjectLighthouse.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; /// /// The location of a slot on a planet. diff --git a/ProjectLighthouse/Types/Profiles/NPData.cs b/ProjectLighthouse/PlayerData/Profiles/NPData.cs similarity index 85% rename from ProjectLighthouse/Types/Profiles/NPData.cs rename to ProjectLighthouse/PlayerData/Profiles/NPData.cs index ed52fe1e..80d82775 100644 --- a/ProjectLighthouse/Types/Profiles/NPData.cs +++ b/ProjectLighthouse/PlayerData/Profiles/NPData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; [XmlRoot("npdata")] [XmlType("npdata")] diff --git a/ProjectLighthouse/Types/Profiles/Pins.cs b/ProjectLighthouse/PlayerData/Profiles/Pins.cs similarity index 83% rename from ProjectLighthouse/Types/Profiles/Pins.cs rename to ProjectLighthouse/PlayerData/Profiles/Pins.cs index f1ed3ef6..abdee779 100644 --- a/ProjectLighthouse/Types/Profiles/Pins.cs +++ b/ProjectLighthouse/PlayerData/Profiles/Pins.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class Pins { diff --git a/ProjectLighthouse/Types/Profiles/StatusType.cs b/ProjectLighthouse/PlayerData/Profiles/StatusType.cs similarity index 50% rename from ProjectLighthouse/Types/Profiles/StatusType.cs rename to ProjectLighthouse/PlayerData/Profiles/StatusType.cs index ea7d99a6..eae84e8c 100644 --- a/ProjectLighthouse/Types/Profiles/StatusType.cs +++ b/ProjectLighthouse/PlayerData/Profiles/StatusType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public enum StatusType { diff --git a/ProjectLighthouse/Types/User.cs b/ProjectLighthouse/PlayerData/Profiles/User.cs similarity index 87% rename from ProjectLighthouse/Types/User.cs rename to ProjectLighthouse/PlayerData/Profiles/User.cs index 669c7135..300345d2 100644 --- a/ProjectLighthouse/Types/User.cs +++ b/ProjectLighthouse/PlayerData/Profiles/User.cs @@ -3,11 +3,11 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text.Json.Serialization; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Profiles; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.Types; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class User { @@ -72,19 +72,19 @@ public class User [NotMapped] [JsonIgnore] - public int Reviews => database.Reviews.Count(r => r.ReviewerId == this.UserId); + public int Reviews => this.database.Reviews.Count(r => r.ReviewerId == this.UserId); [NotMapped] [JsonIgnore] - public int Comments => database.Comments.Count(c => c.Type == CommentType.Profile && c.TargetId == this.UserId); + public int Comments => this.database.Comments.Count(c => c.Type == CommentType.Profile && c.TargetId == this.UserId); [NotMapped] [JsonIgnore] - public int PhotosByMe => database.Photos.Count(p => p.CreatorId == this.UserId); + public int PhotosByMe => this.database.Photos.Count(p => p.CreatorId == this.UserId); [NotMapped] [JsonIgnore] - public int PhotosWithMe => Enumerable.Sum(database.Photos, photo => photo.Subjects.Count(subject => subject.User.UserId == this.UserId)); + public int PhotosWithMe => Enumerable.Sum(this.database.Photos, photo => photo.Subjects.Count(subject => subject.User.UserId == this.UserId)); [JsonIgnore] public int LocationId { get; set; } @@ -98,15 +98,15 @@ public class User [NotMapped] [JsonIgnore] - public int HeartedLevels => database.HeartedLevels.Count(p => p.UserId == this.UserId); + public int HeartedLevels => this.database.HeartedLevels.Count(p => p.UserId == this.UserId); [NotMapped] [JsonIgnore] - public int HeartedUsers => database.HeartedProfiles.Count(p => p.UserId == this.UserId); + public int HeartedUsers => this.database.HeartedProfiles.Count(p => p.UserId == this.UserId); [NotMapped] [JsonIgnore] - public int QueuedLevels => database.QueuedLevels.Count(p => p.UserId == this.UserId); + public int QueuedLevels => this.database.QueuedLevels.Count(p => p.UserId == this.UserId); [JsonIgnore] public string Pins { get; set; } = ""; @@ -121,7 +121,7 @@ public class User public string PlanetHashLBPVita { get; set; } = ""; [JsonIgnore] - public int Hearts => database.HeartedProfiles.Count(s => s.HeartedUserId == this.UserId); + public int Hearts => this.database.HeartedProfiles.Count(s => s.HeartedUserId == this.UserId); [JsonIgnore] public bool IsAdmin { get; set; } = false; @@ -135,7 +135,7 @@ public class User [NotMapped] [JsonIgnore] - public UserStatus Status => new(database, this.UserId); + public UserStatus Status => new(this.database, this.UserId); [JsonIgnore] public bool Banned { get; set; } @@ -165,7 +165,7 @@ public class User LbpSerializer.StringElement("favouriteUserCount", this.HeartedUsers) + LbpSerializer.StringElement("lolcatftwCount", this.QueuedLevels) + LbpSerializer.StringElement("pins", this.Pins) + - serializeEarth(gameVersion) + + this.serializeEarth(gameVersion) + LbpSerializer.BlankElement("photos") + LbpSerializer.StringElement("heartCount", this.Hearts) + LbpSerializer.StringElement("yay2", this.YayHash) + @@ -197,12 +197,12 @@ public class User /// [NotMapped] [JsonIgnore] - public int UsedSlots => database.Slots.Count(s => s.CreatorId == this.UserId); + public int UsedSlots => this.database.Slots.Count(s => s.CreatorId == this.UserId); #nullable enable public int GetUsedSlotsForGame(GameVersion version) { - return database.Slots.Count(s => s.CreatorId == this.UserId && s.GameVersion == version); + return this.database.Slots.Count(s => s.CreatorId == this.UserId && s.GameVersion == version); } #nullable disable diff --git a/ProjectLighthouse/Types/UserApprovedIpAddress.cs b/ProjectLighthouse/PlayerData/Profiles/UserApprovedIpAddress.cs similarity index 85% rename from ProjectLighthouse/Types/UserApprovedIpAddress.cs rename to ProjectLighthouse/PlayerData/Profiles/UserApprovedIpAddress.cs index 577e159e..cbb4179c 100644 --- a/ProjectLighthouse/Types/UserApprovedIpAddress.cs +++ b/ProjectLighthouse/PlayerData/Profiles/UserApprovedIpAddress.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class UserApprovedIpAddress { diff --git a/ProjectLighthouse/Types/UserFriendData.cs b/ProjectLighthouse/PlayerData/Profiles/UserFriendData.cs similarity index 91% rename from ProjectLighthouse/Types/UserFriendData.cs rename to ProjectLighthouse/PlayerData/Profiles/UserFriendData.cs index ee0224cf..3524f43b 100644 --- a/ProjectLighthouse/Types/UserFriendData.cs +++ b/ProjectLighthouse/PlayerData/Profiles/UserFriendData.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Redis.OM.Modeling; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; [SuppressMessage("ReSharper", "CollectionNeverQueried.Global")] [Document(StorageType = StorageType.Json)] diff --git a/ProjectLighthouse/Types/Profiles/UserStatus.cs b/ProjectLighthouse/PlayerData/Profiles/UserStatus.cs similarity index 64% rename from ProjectLighthouse/Types/Profiles/UserStatus.cs rename to ProjectLighthouse/PlayerData/Profiles/UserStatus.cs index 1e422183..91c0083a 100644 --- a/ProjectLighthouse/Types/Profiles/UserStatus.cs +++ b/ProjectLighthouse/PlayerData/Profiles/UserStatus.cs @@ -1,9 +1,9 @@ #nullable enable using System.Linq; using LBPUnion.ProjectLighthouse.Helpers; -using LBPUnion.ProjectLighthouse.Types.Match; +using LBPUnion.ProjectLighthouse.Match.Rooms; -namespace LBPUnion.ProjectLighthouse.Types.Profiles; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class UserStatus { @@ -21,23 +21,23 @@ public class UserStatus if (lastContact == null) { - StatusType = StatusType.Offline; - CurrentVersion = null; + this.StatusType = StatusType.Offline; + this.CurrentVersion = null; } else { - StatusType = StatusType.Online; - CurrentVersion = lastContact.GameVersion; - CurrentPlatform = lastContact.Platform; + this.StatusType = StatusType.Online; + this.CurrentVersion = lastContact.GameVersion; + this.CurrentPlatform = lastContact.Platform; } - CurrentRoom = RoomHelper.FindRoomByUserId(userId); + this.CurrentRoom = RoomHelper.FindRoomByUserId(userId); } public override string ToString() { - CurrentVersion ??= GameVersion.Unknown; - CurrentPlatform ??= Platform.Unknown; + this.CurrentVersion ??= GameVersion.Unknown; + this.CurrentPlatform ??= Platform.Unknown; return this.StatusType switch { StatusType.Online => $"Currently online on {((GameVersion)this.CurrentVersion).ToPrettyString()} on {((Platform)this.CurrentPlatform)}", diff --git a/ProjectLighthouse/Types/UserUpdate.cs b/ProjectLighthouse/PlayerData/Profiles/UserUpdate.cs similarity index 85% rename from ProjectLighthouse/Types/UserUpdate.cs rename to ProjectLighthouse/PlayerData/Profiles/UserUpdate.cs index ef609967..f25e29dd 100644 --- a/ProjectLighthouse/Types/UserUpdate.cs +++ b/ProjectLighthouse/PlayerData/Profiles/UserUpdate.cs @@ -1,8 +1,7 @@ #nullable enable using System.Xml.Serialization; -using LBPUnion.ProjectLighthouse.Types.Profiles; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles; public class UserUpdate { diff --git a/ProjectLighthouse/Types/Reaction.cs b/ProjectLighthouse/PlayerData/Reaction.cs similarity index 82% rename from ProjectLighthouse/Types/Reaction.cs rename to ProjectLighthouse/PlayerData/Reaction.cs index 40d8d624..48fc7f25 100644 --- a/ProjectLighthouse/Types/Reaction.cs +++ b/ProjectLighthouse/PlayerData/Reaction.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public class Reaction { diff --git a/ProjectLighthouse/Types/Reviews/RatedReview.cs b/ProjectLighthouse/PlayerData/Reviews/RatedReview.cs similarity index 81% rename from ProjectLighthouse/Types/Reviews/RatedReview.cs rename to ProjectLighthouse/PlayerData/Reviews/RatedReview.cs index e77530fb..a1bb1e89 100644 --- a/ProjectLighthouse/Types/Reviews/RatedReview.cs +++ b/ProjectLighthouse/PlayerData/Reviews/RatedReview.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; -namespace LBPUnion.ProjectLighthouse.Types.Reviews; +namespace LBPUnion.ProjectLighthouse.PlayerData.Reviews; public class RatedReview { diff --git a/ProjectLighthouse/Types/Reviews/Review.cs b/ProjectLighthouse/PlayerData/Reviews/Review.cs similarity index 93% rename from ProjectLighthouse/Types/Reviews/Review.cs rename to ProjectLighthouse/PlayerData/Reviews/Review.cs index 8bc7b620..6843df3c 100644 --- a/ProjectLighthouse/Types/Reviews/Review.cs +++ b/ProjectLighthouse/PlayerData/Reviews/Review.cs @@ -2,10 +2,12 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Administration; +using LBPUnion.ProjectLighthouse.Levels; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; -namespace LBPUnion.ProjectLighthouse.Types.Reviews; +namespace LBPUnion.ProjectLighthouse.PlayerData.Reviews; [XmlRoot("review")] [XmlType("review")] diff --git a/ProjectLighthouse/Types/Score.cs b/ProjectLighthouse/PlayerData/Score.cs similarity index 94% rename from ProjectLighthouse/Types/Score.cs rename to ProjectLighthouse/PlayerData/Score.cs index 85e569cf..67ad2601 100644 --- a/ProjectLighthouse/Types/Score.cs +++ b/ProjectLighthouse/PlayerData/Score.cs @@ -1,10 +1,10 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Xml.Serialization; +using LBPUnion.ProjectLighthouse.Levels; using LBPUnion.ProjectLighthouse.Serialization; -using LBPUnion.ProjectLighthouse.Types.Levels; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; [XmlRoot("playRecord")] [XmlType("playRecord")] diff --git a/ProjectLighthouse/Types/WebToken.cs b/ProjectLighthouse/PlayerData/WebToken.cs similarity index 83% rename from ProjectLighthouse/Types/WebToken.cs rename to ProjectLighthouse/PlayerData/WebToken.cs index fdcd6d5b..7860a418 100644 --- a/ProjectLighthouse/Types/WebToken.cs +++ b/ProjectLighthouse/PlayerData/WebToken.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace LBPUnion.ProjectLighthouse.Types; +namespace LBPUnion.ProjectLighthouse.PlayerData; public class WebToken { diff --git a/ProjectLighthouse/Startup/DebugWarmupLifetime.cs b/ProjectLighthouse/Startup/DebugWarmupLifetime.cs index 80f95228..9a0db149 100644 --- a/ProjectLighthouse/Startup/DebugWarmupLifetime.cs +++ b/ProjectLighthouse/Startup/DebugWarmupLifetime.cs @@ -2,10 +2,10 @@ using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Logging; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting.Internal; using Microsoft.Extensions.Logging; diff --git a/ProjectLighthouse/StartupTasks.cs b/ProjectLighthouse/StartupTasks.cs index f9a3881d..627b0de7 100644 --- a/ProjectLighthouse/StartupTasks.cs +++ b/ProjectLighthouse/StartupTasks.cs @@ -1,12 +1,15 @@ using System; using System.Diagnostics; +using LBPUnion.ProjectLighthouse.Administration.Maintenance; +using LBPUnion.ProjectLighthouse.Configuration; +using LBPUnion.ProjectLighthouse.Files; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; using LBPUnion.ProjectLighthouse.Logging.Loggers; +using LBPUnion.ProjectLighthouse.Match.Rooms; using LBPUnion.ProjectLighthouse.Startup; using LBPUnion.ProjectLighthouse.StorableLists; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Settings; using Microsoft.EntityFrameworkCore; namespace LBPUnion.ProjectLighthouse; diff --git a/ProjectLighthouse/StorableLists/RedisDatabase.cs b/ProjectLighthouse/StorableLists/RedisDatabase.cs index d686b8cb..c4c7583b 100644 --- a/ProjectLighthouse/StorableLists/RedisDatabase.cs +++ b/ProjectLighthouse/StorableLists/RedisDatabase.cs @@ -3,11 +3,12 @@ using System; using System.Globalization; using System.Linq; using System.Threading.Tasks; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Logging; +using LBPUnion.ProjectLighthouse.Match.Rooms; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; -using LBPUnion.ProjectLighthouse.Types.Match; -using LBPUnion.ProjectLighthouse.Types.Settings; using Redis.OM; using Redis.OM.Contracts; using Redis.OM.Searching; diff --git a/ProjectLighthouse/StorableLists/Stores/RoomStore.cs b/ProjectLighthouse/StorableLists/Stores/RoomStore.cs index bcc8676e..6452b5ce 100644 --- a/ProjectLighthouse/StorableLists/Stores/RoomStore.cs +++ b/ProjectLighthouse/StorableLists/Stores/RoomStore.cs @@ -1,6 +1,6 @@ #nullable enable using System.Collections.Generic; -using LBPUnion.ProjectLighthouse.Types.Match; +using LBPUnion.ProjectLighthouse.Match.Rooms; namespace LBPUnion.ProjectLighthouse.StorableLists.Stores; diff --git a/ProjectLighthouse/StorableLists/Stores/UserFriendStore.cs b/ProjectLighthouse/StorableLists/Stores/UserFriendStore.cs index 2884691a..30a2b5c9 100644 --- a/ProjectLighthouse/StorableLists/Stores/UserFriendStore.cs +++ b/ProjectLighthouse/StorableLists/Stores/UserFriendStore.cs @@ -1,6 +1,7 @@ #nullable enable using System.Collections.Generic; using System.Linq; +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; using LBPUnion.ProjectLighthouse.Types; namespace LBPUnion.ProjectLighthouse.StorableLists.Stores; diff --git a/ProjectLighthouse/Types/Tickets/DataHeader.cs b/ProjectLighthouse/Tickets/Data/DataHeader.cs similarity index 60% rename from ProjectLighthouse/Types/Tickets/DataHeader.cs rename to ProjectLighthouse/Tickets/Data/DataHeader.cs index 940f980c..a41bcab6 100644 --- a/ProjectLighthouse/Types/Tickets/DataHeader.cs +++ b/ProjectLighthouse/Tickets/Data/DataHeader.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets.Data; public struct DataHeader { diff --git a/ProjectLighthouse/Types/Tickets/DataType.cs b/ProjectLighthouse/Tickets/Data/DataType.cs similarity index 74% rename from ProjectLighthouse/Types/Tickets/DataType.cs rename to ProjectLighthouse/Tickets/Data/DataType.cs index 92da0543..a35bf811 100644 --- a/ProjectLighthouse/Types/Tickets/DataType.cs +++ b/ProjectLighthouse/Tickets/Data/DataType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets.Data; public enum DataType : byte { diff --git a/ProjectLighthouse/Types/Tickets/SectionHeader.cs b/ProjectLighthouse/Tickets/Data/SectionHeader.cs similarity index 62% rename from ProjectLighthouse/Types/Tickets/SectionHeader.cs rename to ProjectLighthouse/Tickets/Data/SectionHeader.cs index 5242fe59..a22bb2d3 100644 --- a/ProjectLighthouse/Types/Tickets/SectionHeader.cs +++ b/ProjectLighthouse/Tickets/Data/SectionHeader.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets.Data; public struct SectionHeader { diff --git a/ProjectLighthouse/Types/Tickets/SectionType.cs b/ProjectLighthouse/Tickets/Data/SectionType.cs similarity index 57% rename from ProjectLighthouse/Types/Tickets/SectionType.cs rename to ProjectLighthouse/Tickets/Data/SectionType.cs index c7bb43a5..673e1523 100644 --- a/ProjectLighthouse/Types/Tickets/SectionType.cs +++ b/ProjectLighthouse/Tickets/Data/SectionType.cs @@ -1,4 +1,4 @@ -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets.Data; public enum SectionType : byte { diff --git a/ProjectLighthouse/Types/Tickets/NPTicket.cs b/ProjectLighthouse/Tickets/NPTicket.cs similarity index 96% rename from ProjectLighthouse/Types/Tickets/NPTicket.cs rename to ProjectLighthouse/Tickets/NPTicket.cs index 26a22fe2..bacb558f 100644 --- a/ProjectLighthouse/Types/Tickets/NPTicket.cs +++ b/ProjectLighthouse/Tickets/NPTicket.cs @@ -3,12 +3,15 @@ using System; using System.IO; using System.Text; using System.Text.Json; +using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Logging; -using LBPUnion.ProjectLighthouse.Types.Settings; +using LBPUnion.ProjectLighthouse.PlayerData; +using LBPUnion.ProjectLighthouse.Tickets.Data; +using Version = LBPUnion.ProjectLighthouse.Types.Version; -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets; /// /// A PSN ticket, typically sent from PS3/RPCN diff --git a/ProjectLighthouse/Types/Tickets/TicketReader.cs b/ProjectLighthouse/Tickets/TicketReader.cs similarity index 92% rename from ProjectLighthouse/Types/Tickets/TicketReader.cs rename to ProjectLighthouse/Tickets/TicketReader.cs index 7a9deeb5..cfb7c067 100644 --- a/ProjectLighthouse/Types/Tickets/TicketReader.cs +++ b/ProjectLighthouse/Tickets/TicketReader.cs @@ -3,8 +3,10 @@ using System.IO; using System.Text; using JetBrains.Annotations; using LBPUnion.ProjectLighthouse.Extensions; +using LBPUnion.ProjectLighthouse.Tickets.Data; +using LBPUnion.ProjectLighthouse.Types; -namespace LBPUnion.ProjectLighthouse.Types.Tickets; +namespace LBPUnion.ProjectLighthouse.Tickets; public class TicketReader : BinaryReader { diff --git a/ProjectLighthouse/Types/Match/IMatchData.cs b/ProjectLighthouse/Types/Match/IMatchData.cs deleted file mode 100644 index 28ecab3d..00000000 --- a/ProjectLighthouse/Types/Match/IMatchData.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace LBPUnion.ProjectLighthouse.Types.Match; - -public interface IMatchData -{} \ No newline at end of file diff --git a/ProjectLighthouse/Types/Match/UpdateMyPlayerData.cs b/ProjectLighthouse/Types/Match/UpdateMyPlayerData.cs deleted file mode 100644 index 2e11508e..00000000 --- a/ProjectLighthouse/Types/Match/UpdateMyPlayerData.cs +++ /dev/null @@ -1,9 +0,0 @@ -#nullable enable -namespace LBPUnion.ProjectLighthouse.Types.Match; - -public class UpdateMyPlayerData : IMatchData -{ - public string Player { get; set; } = null!; - - public RoomState? RoomState { get; set; } -} \ No newline at end of file