diff --git a/fluXis.Desktop/DiscordActivity.cs b/fluXis.Desktop/DiscordActivity.cs index c3367d34..e53bf32a 100644 --- a/fluXis.Desktop/DiscordActivity.cs +++ b/fluXis.Desktop/DiscordActivity.cs @@ -5,7 +5,7 @@ using fluXis.Game; using fluXis.Game.Integration; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using Newtonsoft.Json; using osu.Framework.Logging; using EventType = DiscordRPC.EventType; diff --git a/fluXis.Desktop/Program.cs b/fluXis.Desktop/Program.cs index d35b8ac6..ed5bc883 100644 --- a/fluXis.Desktop/Program.cs +++ b/fluXis.Desktop/Program.cs @@ -9,7 +9,7 @@ using fluXis.Game.Localization.Categories; using fluXis.Game.Localization.Categories.Settings; using fluXis.Game.Mods; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.Platform; using osu.Framework; using osu.Framework.Localisation; diff --git a/fluXis.Game.Tests/Gameplay/TestJudgementCounter.cs b/fluXis.Game.Tests/Gameplay/TestJudgementCounter.cs index d2fd0e3d..a51dd108 100644 --- a/fluXis.Game.Tests/Gameplay/TestJudgementCounter.cs +++ b/fluXis.Game.Tests/Gameplay/TestJudgementCounter.cs @@ -1,6 +1,6 @@ +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens.Gameplay.HUD.Components; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; namespace fluXis.Game.Tests.Gameplay; diff --git a/fluXis.Game.Tests/Graphics/TestMapCard.cs b/fluXis.Game.Tests/Graphics/TestMapCard.cs index 769052e6..fac7baea 100644 --- a/fluXis.Game.Tests/Graphics/TestMapCard.cs +++ b/fluXis.Game.Tests/Graphics/TestMapCard.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using fluXis.Game.Map.Drawables.Card; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Overlay.Mouse; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Users; using NUnit.Framework; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game.Tests/Graphics/TestRanks.cs b/fluXis.Game.Tests/Graphics/TestRanks.cs index 52c24a3d..bf97d12f 100644 --- a/fluXis.Game.Tests/Graphics/TestRanks.cs +++ b/fluXis.Game.Tests/Graphics/TestRanks.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics.Drawables; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game.Tests/Multiplayer/TestMultiResults.cs b/fluXis.Game.Tests/Multiplayer/TestMultiResults.cs index 624ad725..53617d55 100644 --- a/fluXis.Game.Tests/Multiplayer/TestMultiResults.cs +++ b/fluXis.Game.Tests/Multiplayer/TestMultiResults.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using fluXis.Game.Graphics.Background; using fluXis.Game.Map; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens; using fluXis.Game.Screens.Multiplayer.Gameplay; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; namespace fluXis.Game.Tests.Multiplayer; diff --git a/fluXis.Game.Tests/Multiplayer/TestMultiplayer.cs b/fluXis.Game.Tests/Multiplayer/TestMultiplayer.cs index e7094ee7..f45d1dc6 100644 --- a/fluXis.Game.Tests/Multiplayer/TestMultiplayer.cs +++ b/fluXis.Game.Tests/Multiplayer/TestMultiplayer.cs @@ -1,6 +1,5 @@ using fluXis.Game.Graphics.Background; using fluXis.Game.Graphics.UserInterface.Panel; -using fluXis.Game.Online.Fluxel; using fluXis.Game.Screens.Multiplayer; using osu.Framework.Allocation; using osu.Framework.Graphics; @@ -10,9 +9,6 @@ namespace fluXis.Game.Tests.Multiplayer; public partial class TestMultiplayer : FluXisTestScene { - [Resolved] - private IAPIClient api { get; set; } - [BackgroundDependencyLoader] private void load() { diff --git a/fluXis.Game.Tests/Overlay/TestAchievementOverlay.cs b/fluXis.Game.Tests/Overlay/TestAchievementOverlay.cs index 5f951894..e154211e 100644 --- a/fluXis.Game.Tests/Overlay/TestAchievementOverlay.cs +++ b/fluXis.Game.Tests/Overlay/TestAchievementOverlay.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.UserInterface.Panel; +using fluXis.Game.Online.API.Models.Other; using fluXis.Game.Overlay.Achievements; -using fluXis.Shared.Components.Other; using osu.Framework.Allocation; namespace fluXis.Game.Tests.Overlay; diff --git a/fluXis.Game.Tests/Overlay/TestUserProfileFollowers.cs b/fluXis.Game.Tests/Overlay/TestUserProfileFollowers.cs index a1386483..c393ba0d 100644 --- a/fluXis.Game.Tests/Overlay/TestUserProfileFollowers.cs +++ b/fluXis.Game.Tests/Overlay/TestUserProfileFollowers.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Overlay.User.Sidebar; -using fluXis.Shared.Components.Users; using NUnit.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game.Tests/Screens/TestMapBrowser.cs b/fluXis.Game.Tests/Screens/TestMapBrowser.cs index 5f8cb3cc..96a56bc6 100644 --- a/fluXis.Game.Tests/Screens/TestMapBrowser.cs +++ b/fluXis.Game.Tests/Screens/TestMapBrowser.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.MapSets; using fluXis.Game.Screens; using fluXis.Game.Screens.Browse; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game.Tests/Screens/TestResults.cs b/fluXis.Game.Tests/Screens/TestResults.cs index 6f130f1b..2ef1d7f0 100644 --- a/fluXis.Game.Tests/Screens/TestResults.cs +++ b/fluXis.Game.Tests/Screens/TestResults.cs @@ -2,14 +2,14 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Map; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Scores; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Scores; +using fluXis.Game.Online.API.Responses.Scores; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens; using fluXis.Game.Screens.Result; -using fluXis.Shared.API.Responses.Scores; -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using NUnit.Framework; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game.Tests/Select/TestScoreEntry.cs b/fluXis.Game.Tests/Select/TestScoreEntry.cs index 98e64416..f31c0975 100644 --- a/fluXis.Game.Tests/Select/TestScoreEntry.cs +++ b/fluXis.Game.Tests/Select/TestScoreEntry.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using fluXis.Game.Graphics.UserInterface.Context; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens.Select.Info.Scores; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Logging; diff --git a/fluXis.Game.Tests/TestAPIClient.cs b/fluXis.Game.Tests/TestAPIClient.cs index af2aa8bd..f9440693 100644 --- a/fluXis.Game.Tests/TestAPIClient.cs +++ b/fluXis.Game.Tests/TestAPIClient.cs @@ -4,10 +4,9 @@ using fluXis.Game.Online; using fluXis.Game.Online.Activity; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Packets; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.API; -using fluXis.Shared.API.Packets; -using fluXis.Shared.Components.Users; using osu.Framework.Bindables; using osu.Framework.Logging; diff --git a/fluXis.Game/Database/Maps/RealmMap.cs b/fluXis.Game/Database/Maps/RealmMap.cs index bb846dec..8ab84e01 100644 --- a/fluXis.Game/Database/Maps/RealmMap.cs +++ b/fluXis.Game/Database/Maps/RealmMap.cs @@ -5,7 +5,6 @@ using fluXis.Game.Map; using fluXis.Game.Mods; using fluXis.Game.Utils; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu.Framework.Audio.Track; using osu.Framework.Graphics.Textures; diff --git a/fluXis.Game/Database/Maps/RealmMapFilters.cs b/fluXis.Game/Database/Maps/RealmMapFilters.cs index 41377aeb..00d5f538 100644 --- a/fluXis.Game/Database/Maps/RealmMapFilters.cs +++ b/fluXis.Game/Database/Maps/RealmMapFilters.cs @@ -1,5 +1,5 @@ using System; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using Realms; namespace fluXis.Game.Database.Maps; diff --git a/fluXis.Game/Database/Score/RealmScore.cs b/fluXis.Game/Database/Score/RealmScore.cs index 294a657d..1a0bcf48 100644 --- a/fluXis.Game/Database/Score/RealmScore.cs +++ b/fluXis.Game/Database/Score/RealmScore.cs @@ -2,9 +2,8 @@ using System.Linq; using fluXis.Game.Database.Maps; using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Utils; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using JetBrains.Annotations; using Realms; diff --git a/fluXis.Game/FluXisGame.cs b/fluXis.Game/FluXisGame.cs index 6890fb16..50026dd0 100644 --- a/fluXis.Game/FluXisGame.cs +++ b/fluXis.Game/FluXisGame.cs @@ -12,6 +12,9 @@ using fluXis.Game.Input; using fluXis.Game.Localization; using fluXis.Game.Localization.Stores; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Packets.Other; +using fluXis.Game.Online.API.Packets.User; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Achievements; using fluXis.Game.Overlay.Auth; @@ -29,6 +32,7 @@ using fluXis.Game.Overlay.Toolbar; using fluXis.Game.Overlay.User; using fluXis.Game.Overlay.Volume; +using fluXis.Game.Scoring; using fluXis.Game.Screens; using fluXis.Game.Screens.Intro; using fluXis.Game.Screens.Loading; @@ -40,10 +44,6 @@ using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; using fluXis.Game.Utils.Sentry; -using fluXis.Shared.API.Packets.Other; -using fluXis.Shared.API.Packets.User; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Audio; diff --git a/fluXis.Game/FluXisGameBase.cs b/fluXis.Game/FluXisGameBase.cs index 49bfc773..2dadd952 100644 --- a/fluXis.Game/FluXisGameBase.cs +++ b/fluXis.Game/FluXisGameBase.cs @@ -25,6 +25,7 @@ using fluXis.Game.Online.API.Models.Chat; using fluXis.Game.Online.API.Models.Groups; using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Chat; using fluXis.Game.Online.Fluxel; using fluXis.Game.Online.Multiplayer; @@ -41,12 +42,6 @@ using fluXis.Game.Updater; using fluXis.Game.Utils; using fluXis.Resources; -using fluXis.Shared.Components.Chat; -using fluXis.Shared.Components.Groups; -using fluXis.Shared.Components.Multi; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Utils; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Configuration; diff --git a/fluXis.Game/Graphics/Drawables/DrawableAvatar.cs b/fluXis.Game/Graphics/Drawables/DrawableAvatar.cs index d6b3e124..f5a891a4 100644 --- a/fluXis.Game/Graphics/Drawables/DrawableAvatar.cs +++ b/fluXis.Game/Graphics/Drawables/DrawableAvatar.cs @@ -1,7 +1,7 @@ using System; using fluXis.Game.Online; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Graphics/Drawables/DrawableBanner.cs b/fluXis.Game/Graphics/Drawables/DrawableBanner.cs index 8e93a13e..68ac35a4 100644 --- a/fluXis.Game/Graphics/Drawables/DrawableBanner.cs +++ b/fluXis.Game/Graphics/Drawables/DrawableBanner.cs @@ -1,6 +1,6 @@ using fluXis.Game.Online; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Graphics/Drawables/DrawableClubBanner.cs b/fluXis.Game/Graphics/Drawables/DrawableClubBanner.cs index b43fe24f..3996ebf1 100644 --- a/fluXis.Game/Graphics/Drawables/DrawableClubBanner.cs +++ b/fluXis.Game/Graphics/Drawables/DrawableClubBanner.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Graphics/Drawables/DrawableClubIcon.cs b/fluXis.Game/Graphics/Drawables/DrawableClubIcon.cs index 54161cef..1fc97b43 100644 --- a/fluXis.Game/Graphics/Drawables/DrawableClubIcon.cs +++ b/fluXis.Game/Graphics/Drawables/DrawableClubIcon.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Graphics/Drawables/DrawableScoreRank.cs b/fluXis.Game/Graphics/Drawables/DrawableScoreRank.cs index 301d7ba0..2bb85a0e 100644 --- a/fluXis.Game/Graphics/Drawables/DrawableScoreRank.cs +++ b/fluXis.Game/Graphics/Drawables/DrawableScoreRank.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/IO/ReplayStorage.cs b/fluXis.Game/IO/ReplayStorage.cs index 6d4a6d98..de752676 100644 --- a/fluXis.Game/IO/ReplayStorage.cs +++ b/fluXis.Game/IO/ReplayStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -using fluXis.Shared.Replays; -using fluXis.Shared.Utils; +using fluXis.Game.Replays; +using fluXis.Game.Utils; using JetBrains.Annotations; using osu.Framework.Platform; diff --git a/fluXis.Game/Import/FluXisImport.cs b/fluXis.Game/Import/FluXisImport.cs index 12a6fb14..8c857c1b 100644 --- a/fluXis.Game/Import/FluXisImport.cs +++ b/fluXis.Game/Import/FluXisImport.cs @@ -9,7 +9,6 @@ using fluXis.Game.Overlay.Notifications; using fluXis.Game.Overlay.Notifications.Tasks; using fluXis.Game.Utils; -using fluXis.Shared.Utils; using osu.Framework.Graphics; using osu.Framework.Logging; diff --git a/fluXis.Game/Localization/Stores/ResourceLocaleStore.cs b/fluXis.Game/Localization/Stores/ResourceLocaleStore.cs index db878cad..afb3469e 100644 --- a/fluXis.Game/Localization/Stores/ResourceLocaleStore.cs +++ b/fluXis.Game/Localization/Stores/ResourceLocaleStore.cs @@ -4,7 +4,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.Bindables; using osu.Framework.IO.Stores; using osu.Framework.Localisation; diff --git a/fluXis.Game/Map/Drawables/Card/MapCard-Tooltip.cs b/fluXis.Game/Map/Drawables/Card/MapCard-Tooltip.cs index 7771ff86..c0ffc19a 100644 --- a/fluXis.Game/Map/Drawables/Card/MapCard-Tooltip.cs +++ b/fluXis.Game/Map/Drawables/Card/MapCard-Tooltip.cs @@ -3,8 +3,8 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Overlay.Mouse; -using fluXis.Shared.Components.Maps; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osuTK; diff --git a/fluXis.Game/Map/Drawables/Card/MapCard.cs b/fluXis.Game/Map/Drawables/Card/MapCard.cs index 059a76a9..9919dfa2 100644 --- a/fluXis.Game/Map/Drawables/Card/MapCard.cs +++ b/fluXis.Game/Map/Drawables/Card/MapCard.cs @@ -10,9 +10,9 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Menus; using fluXis.Game.Map.Drawables.Online; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Utils.Extensions; +using fluXis.Game.Utils.Extensions; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Map/Drawables/Online/DrawableOnlineBackground.cs b/fluXis.Game/Map/Drawables/Online/DrawableOnlineBackground.cs index 53285db4..4f3bfbfb 100644 --- a/fluXis.Game/Map/Drawables/Online/DrawableOnlineBackground.cs +++ b/fluXis.Game/Map/Drawables/Online/DrawableOnlineBackground.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Map/Drawables/Online/DrawableOnlineCover.cs b/fluXis.Game/Map/Drawables/Online/DrawableOnlineCover.cs index b379af4f..a01962c6 100644 --- a/fluXis.Game/Map/Drawables/Online/DrawableOnlineCover.cs +++ b/fluXis.Game/Map/Drawables/Online/DrawableOnlineCover.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Map/MapEvents.cs b/fluXis.Game/Map/MapEvents.cs index d695bd63..e37ff3a8 100644 --- a/fluXis.Game/Map/MapEvents.cs +++ b/fluXis.Game/Map/MapEvents.cs @@ -4,7 +4,7 @@ using System.Linq; using fluXis.Game.Map.Structures.Bases; using fluXis.Game.Map.Structures.Events; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using Newtonsoft.Json; using osu.Framework.Graphics; using SixLabors.ImageSharp; diff --git a/fluXis.Game/Map/MapInfo.cs b/fluXis.Game/Map/MapInfo.cs index 3d09a5fb..3535b0d1 100644 --- a/fluXis.Game/Map/MapInfo.cs +++ b/fluXis.Game/Map/MapInfo.cs @@ -5,11 +5,10 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Map.Structures; using fluXis.Game.Mods; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Storyboards; using fluXis.Game.Storyboards.Drawables; using fluXis.Game.Utils; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Utils; using JetBrains.Annotations; using Newtonsoft.Json; diff --git a/fluXis.Game/Map/MapStore.cs b/fluXis.Game/Map/MapStore.cs index 5a46b540..acfbd2e0 100644 --- a/fluXis.Game/Map/MapStore.cs +++ b/fluXis.Game/Map/MapStore.cs @@ -15,6 +15,7 @@ using fluXis.Game.Map.Builtin.Roundhouse; using fluXis.Game.Map.Builtin.Spoophouse; using fluXis.Game.Map.Structures; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.API.Requests.Maps; using fluXis.Game.Online.API.Requests.MapSets; using fluXis.Game.Online.Fluxel; @@ -23,8 +24,6 @@ using fluXis.Game.Storyboards; using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Audio; diff --git a/fluXis.Game/Map/Structures/HitObject.cs b/fluXis.Game/Map/Structures/HitObject.cs index 541dd959..9464a658 100644 --- a/fluXis.Game/Map/Structures/HitObject.cs +++ b/fluXis.Game/Map/Structures/HitObject.cs @@ -1,6 +1,6 @@ using fluXis.Game.Map.Structures.Bases; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Screens.Edit.Tabs.Charting.Playfield; -using fluXis.Shared.Scoring.Structs; using JetBrains.Annotations; using Newtonsoft.Json; diff --git a/fluXis.Game/Mods/FlawlessMod.cs b/fluXis.Game/Mods/FlawlessMod.cs index d989de77..0feaf413 100644 --- a/fluXis.Game/Mods/FlawlessMod.cs +++ b/fluXis.Game/Mods/FlawlessMod.cs @@ -1,7 +1,7 @@ using System; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Graphics.Sprites; namespace fluXis.Game.Mods; diff --git a/fluXis.Game/Mods/FragileMod.cs b/fluXis.Game/Mods/FragileMod.cs index 83e6e582..219f1a6e 100644 --- a/fluXis.Game/Mods/FragileMod.cs +++ b/fluXis.Game/Mods/FragileMod.cs @@ -1,7 +1,7 @@ using System; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Graphics.Sprites; namespace fluXis.Game.Mods; diff --git a/fluXis.Game/Online/API/APIWebRequest.cs b/fluXis.Game/Online/API/APIWebRequest.cs index 3188b258..5a08949b 100644 --- a/fluXis.Game/Online/API/APIWebRequest.cs +++ b/fluXis.Game/Online/API/APIWebRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.IO.Network; using osu.Framework.Logging; diff --git a/fluXis.Shared/Components/Chat/APIChatChannel.cs b/fluXis.Game/Online/API/Models/Chat/APIChatChannel.cs similarity index 87% rename from fluXis.Shared/Components/Chat/APIChatChannel.cs rename to fluXis.Game/Online/API/Models/Chat/APIChatChannel.cs index c786fbbb..4e839229 100644 --- a/fluXis.Shared/Components/Chat/APIChatChannel.cs +++ b/fluXis.Game/Online/API/Models/Chat/APIChatChannel.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Chat; +namespace fluXis.Game.Online.API.Models.Chat; public class APIChatChannel { diff --git a/fluXis.Game/Online/API/Models/Chat/ChatMessage.cs b/fluXis.Game/Online/API/Models/Chat/ChatMessage.cs index 4765c8c2..c69c019b 100644 --- a/fluXis.Game/Online/API/Models/Chat/ChatMessage.cs +++ b/fluXis.Game/Online/API/Models/Chat/ChatMessage.cs @@ -1,5 +1,4 @@ -using fluXis.Shared.Components.Chat; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Models.Chat; diff --git a/fluXis.Shared/Components/Chat/IChatMessage.cs b/fluXis.Game/Online/API/Models/Chat/IChatMessage.cs similarity index 81% rename from fluXis.Shared/Components/Chat/IChatMessage.cs rename to fluXis.Game/Online/API/Models/Chat/IChatMessage.cs index 490d82e7..a5381b78 100644 --- a/fluXis.Shared/Components/Chat/IChatMessage.cs +++ b/fluXis.Game/Online/API/Models/Chat/IChatMessage.cs @@ -1,7 +1,7 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Chat; +namespace fluXis.Game.Online.API.Models.Chat; public interface IChatMessage { diff --git a/fluXis.Shared/Components/Clubs/APIClub.cs b/fluXis.Game/Online/API/Models/Clubs/APIClub.cs similarity index 87% rename from fluXis.Shared/Components/Clubs/APIClub.cs rename to fluXis.Game/Online/API/Models/Clubs/APIClub.cs index 65ed1e10..8f99a835 100644 --- a/fluXis.Shared/Components/Clubs/APIClub.cs +++ b/fluXis.Game/Online/API/Models/Clubs/APIClub.cs @@ -1,8 +1,11 @@ -using fluXis.Shared.Components.Other; -using fluXis.Shared.Components.Users; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Other; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Clubs; +namespace fluXis.Game.Online.API.Models.Clubs; + +#nullable enable public class APIClub { diff --git a/fluXis.Shared/Components/Clubs/APIClubInvite.cs b/fluXis.Game/Online/API/Models/Clubs/APIClubInvite.cs similarity index 84% rename from fluXis.Shared/Components/Clubs/APIClubInvite.cs rename to fluXis.Game/Online/API/Models/Clubs/APIClubInvite.cs index 125e7d33..9ec258e9 100644 --- a/fluXis.Shared/Components/Clubs/APIClubInvite.cs +++ b/fluXis.Game/Online/API/Models/Clubs/APIClubInvite.cs @@ -1,7 +1,7 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Clubs; +namespace fluXis.Game.Online.API.Models.Clubs; public class APIClubInvite { diff --git a/fluXis.Shared/Components/Clubs/APIClubStatistics.cs b/fluXis.Game/Online/API/Models/Clubs/APIClubStatistics.cs similarity index 90% rename from fluXis.Shared/Components/Clubs/APIClubStatistics.cs rename to fluXis.Game/Online/API/Models/Clubs/APIClubStatistics.cs index 543ceb54..b6c6f9d1 100644 --- a/fluXis.Shared/Components/Clubs/APIClubStatistics.cs +++ b/fluXis.Game/Online/API/Models/Clubs/APIClubStatistics.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Clubs; +namespace fluXis.Game.Online.API.Models.Clubs; public class APIClubStatistics { diff --git a/fluXis.Shared/Components/Clubs/ClubJoinType.cs b/fluXis.Game/Online/API/Models/Clubs/ClubJoinType.cs similarity index 80% rename from fluXis.Shared/Components/Clubs/ClubJoinType.cs rename to fluXis.Game/Online/API/Models/Clubs/ClubJoinType.cs index 108bf369..9cef9827 100644 --- a/fluXis.Shared/Components/Clubs/ClubJoinType.cs +++ b/fluXis.Game/Online/API/Models/Clubs/ClubJoinType.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Components.Clubs; +namespace fluXis.Game.Online.API.Models.Clubs; public enum ClubJoinType { diff --git a/fluXis.Shared/Components/Collections/APICollection.cs b/fluXis.Game/Online/API/Models/Collections/APICollection.cs similarity index 77% rename from fluXis.Shared/Components/Collections/APICollection.cs rename to fluXis.Game/Online/API/Models/Collections/APICollection.cs index 767f5f59..fc6b8431 100644 --- a/fluXis.Shared/Components/Collections/APICollection.cs +++ b/fluXis.Game/Online/API/Models/Collections/APICollection.cs @@ -1,8 +1,9 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Users; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Collections; +namespace fluXis.Game.Online.API.Models.Collections; public class APICollection { diff --git a/fluXis.Game/Online/API/Models/Groups/APIGroup.cs b/fluXis.Game/Online/API/Models/Groups/APIGroup.cs index 76979acb..57e5ddec 100644 --- a/fluXis.Game/Online/API/Models/Groups/APIGroup.cs +++ b/fluXis.Game/Online/API/Models/Groups/APIGroup.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Groups; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Models.Groups; diff --git a/fluXis.Shared/Components/Groups/IAPIGroup.cs b/fluXis.Game/Online/API/Models/Groups/IAPIGroup.cs similarity index 74% rename from fluXis.Shared/Components/Groups/IAPIGroup.cs rename to fluXis.Game/Online/API/Models/Groups/IAPIGroup.cs index 81948f48..de60bd27 100644 --- a/fluXis.Shared/Components/Groups/IAPIGroup.cs +++ b/fluXis.Game/Online/API/Models/Groups/IAPIGroup.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Components.Users; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Groups; +namespace fluXis.Game.Online.API.Models.Groups; public interface IAPIGroup { diff --git a/fluXis.Shared/Components/Maps/APIMap.cs b/fluXis.Game/Online/API/Models/Maps/APIMap.cs similarity index 94% rename from fluXis.Shared/Components/Maps/APIMap.cs rename to fluXis.Game/Online/API/Models/Maps/APIMap.cs index b553b367..46155287 100644 --- a/fluXis.Shared/Components/Maps/APIMap.cs +++ b/fluXis.Game/Online/API/Models/Maps/APIMap.cs @@ -1,7 +1,9 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Maps; +namespace fluXis.Game.Online.API.Models.Maps; + +#nullable enable public class APIMap { diff --git a/fluXis.Shared/Components/Maps/APIMapLookup.cs b/fluXis.Game/Online/API/Models/Maps/APIMapLookup.cs similarity index 93% rename from fluXis.Shared/Components/Maps/APIMapLookup.cs rename to fluXis.Game/Online/API/Models/Maps/APIMapLookup.cs index adf51a11..7842f185 100644 --- a/fluXis.Shared/Components/Maps/APIMapLookup.cs +++ b/fluXis.Game/Online/API/Models/Maps/APIMapLookup.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Maps; +namespace fluXis.Game.Online.API.Models.Maps; public class APIMapLookup { diff --git a/fluXis.Shared/Components/Maps/APIMapSet.cs b/fluXis.Game/Online/API/Models/Maps/APIMapSet.cs similarity index 86% rename from fluXis.Shared/Components/Maps/APIMapSet.cs rename to fluXis.Game/Online/API/Models/Maps/APIMapSet.cs index d9326464..48ce7e56 100644 --- a/fluXis.Shared/Components/Maps/APIMapSet.cs +++ b/fluXis.Game/Online/API/Models/Maps/APIMapSet.cs @@ -1,7 +1,9 @@ -using fluXis.Shared.Components.Users; +using System; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Maps; +namespace fluXis.Game.Online.API.Models.Maps; public class APIMapSet { diff --git a/fluXis.Shared/Components/Maps/APIMapVotes.cs b/fluXis.Game/Online/API/Models/Maps/APIMapVotes.cs similarity index 87% rename from fluXis.Shared/Components/Maps/APIMapVotes.cs rename to fluXis.Game/Online/API/Models/Maps/APIMapVotes.cs index 97b7b5f8..2d867593 100644 --- a/fluXis.Shared/Components/Maps/APIMapVotes.cs +++ b/fluXis.Game/Online/API/Models/Maps/APIMapVotes.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Maps; +namespace fluXis.Game.Online.API.Models.Maps; public class APIMapVotes { diff --git a/fluXis.Shared/Components/Maps/DualMode.cs b/fluXis.Game/Online/API/Models/Maps/DualMode.cs similarity index 51% rename from fluXis.Shared/Components/Maps/DualMode.cs rename to fluXis.Game/Online/API/Models/Maps/DualMode.cs index 56feb03d..eeb25572 100644 --- a/fluXis.Shared/Components/Maps/DualMode.cs +++ b/fluXis.Game/Online/API/Models/Maps/DualMode.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Components.Maps; +namespace fluXis.Game.Online.API.Models.Maps; public enum DualMode { diff --git a/fluXis.Shared/Components/Maps/MapEffectType.cs b/fluXis.Game/Online/API/Models/Maps/MapEffectType.cs similarity index 87% rename from fluXis.Shared/Components/Maps/MapEffectType.cs rename to fluXis.Game/Online/API/Models/Maps/MapEffectType.cs index bfd841fe..f0be7233 100644 --- a/fluXis.Shared/Components/Maps/MapEffectType.cs +++ b/fluXis.Game/Online/API/Models/Maps/MapEffectType.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Components.Maps; +using System; + +namespace fluXis.Game.Online.API.Models.Maps; [Flags] public enum MapEffectType : ulong diff --git a/fluXis.Shared/Components/Maps/MapSetFlag.cs b/fluXis.Game/Online/API/Models/Maps/MapSetFlag.cs similarity index 80% rename from fluXis.Shared/Components/Maps/MapSetFlag.cs rename to fluXis.Game/Online/API/Models/Maps/MapSetFlag.cs index ffeaf4f4..fb99f9ef 100644 --- a/fluXis.Shared/Components/Maps/MapSetFlag.cs +++ b/fluXis.Game/Online/API/Models/Maps/MapSetFlag.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Components.Maps; +using System; + +namespace fluXis.Game.Online.API.Models.Maps; [Flags] public enum MapSetFlag : ulong diff --git a/fluXis.Shared/Components/Multi/IMultiplayerParticipant.cs b/fluXis.Game/Online/API/Models/Multi/IMultiplayerParticipant.cs similarity index 84% rename from fluXis.Shared/Components/Multi/IMultiplayerParticipant.cs rename to fluXis.Game/Online/API/Models/Multi/IMultiplayerParticipant.cs index 756a684d..63d6c536 100644 --- a/fluXis.Shared/Components/Multi/IMultiplayerParticipant.cs +++ b/fluXis.Game/Online/API/Models/Multi/IMultiplayerParticipant.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Multi; +namespace fluXis.Game.Online.API.Models.Multi; [JsonObject(MemberSerialization.OptIn)] public interface IMultiplayerParticipant diff --git a/fluXis.Shared/Components/Multi/IMultiplayerRoom.cs b/fluXis.Game/Online/API/Models/Multi/IMultiplayerRoom.cs similarity index 73% rename from fluXis.Shared/Components/Multi/IMultiplayerRoom.cs rename to fluXis.Game/Online/API/Models/Multi/IMultiplayerRoom.cs index 3ff7aff9..203ef26f 100644 --- a/fluXis.Shared/Components/Multi/IMultiplayerRoom.cs +++ b/fluXis.Game/Online/API/Models/Multi/IMultiplayerRoom.cs @@ -1,8 +1,9 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Users; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Multi; +namespace fluXis.Game.Online.API.Models.Multi; [JsonObject(MemberSerialization.OptIn)] public interface IMultiplayerRoom diff --git a/fluXis.Shared/Components/Multi/IMultiplayerRoomSettings.cs b/fluXis.Game/Online/API/Models/Multi/IMultiplayerRoomSettings.cs similarity index 83% rename from fluXis.Shared/Components/Multi/IMultiplayerRoomSettings.cs rename to fluXis.Game/Online/API/Models/Multi/IMultiplayerRoomSettings.cs index 644a3cdc..cd93ec2c 100644 --- a/fluXis.Shared/Components/Multi/IMultiplayerRoomSettings.cs +++ b/fluXis.Game/Online/API/Models/Multi/IMultiplayerRoomSettings.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Multi; +namespace fluXis.Game.Online.API.Models.Multi; [JsonObject(MemberSerialization.OptIn)] public interface IMultiplayerRoomSettings diff --git a/fluXis.Game/Online/API/Models/Multi/MultiplayerParticipant.cs b/fluXis.Game/Online/API/Models/Multi/MultiplayerParticipant.cs index 54e7d943..f11261d0 100644 --- a/fluXis.Game/Online/API/Models/Multi/MultiplayerParticipant.cs +++ b/fluXis.Game/Online/API/Models/Multi/MultiplayerParticipant.cs @@ -1,5 +1,4 @@ -using fluXis.Shared.Components.Multi; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Models.Multi; diff --git a/fluXis.Game/Online/API/Models/Multi/MultiplayerRoom.cs b/fluXis.Game/Online/API/Models/Multi/MultiplayerRoom.cs index b4e2598e..4675771d 100644 --- a/fluXis.Game/Online/API/Models/Multi/MultiplayerRoom.cs +++ b/fluXis.Game/Online/API/Models/Multi/MultiplayerRoom.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Multi; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; namespace fluXis.Game.Online.API.Models.Multi; diff --git a/fluXis.Game/Online/API/Models/Multi/MultiplayerRoomSettings.cs b/fluXis.Game/Online/API/Models/Multi/MultiplayerRoomSettings.cs index 64d8a930..d316e6cb 100644 --- a/fluXis.Game/Online/API/Models/Multi/MultiplayerRoomSettings.cs +++ b/fluXis.Game/Online/API/Models/Multi/MultiplayerRoomSettings.cs @@ -1,5 +1,3 @@ -using fluXis.Shared.Components.Multi; - namespace fluXis.Game.Online.API.Models.Multi; public class MultiplayerRoomSettings : IMultiplayerRoomSettings diff --git a/fluXis.Shared/Components/Multi/MultiplayerUserState.cs b/fluXis.Game/Online/API/Models/Multi/MultiplayerUserState.cs similarity index 66% rename from fluXis.Shared/Components/Multi/MultiplayerUserState.cs rename to fluXis.Game/Online/API/Models/Multi/MultiplayerUserState.cs index 6bfd55e0..16f03e7c 100644 --- a/fluXis.Shared/Components/Multi/MultiplayerUserState.cs +++ b/fluXis.Game/Online/API/Models/Multi/MultiplayerUserState.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Components.Multi; +namespace fluXis.Game.Online.API.Models.Multi; public enum MultiplayerUserState { diff --git a/fluXis.Shared/Components/Notifications/NotificationType.cs b/fluXis.Game/Online/API/Models/Notifications/NotificationType.cs similarity index 55% rename from fluXis.Shared/Components/Notifications/NotificationType.cs rename to fluXis.Game/Online/API/Models/Notifications/NotificationType.cs index 1cb0f76c..dfc8563d 100644 --- a/fluXis.Shared/Components/Notifications/NotificationType.cs +++ b/fluXis.Game/Online/API/Models/Notifications/NotificationType.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Components.Notifications; +namespace fluXis.Game.Online.API.Models.Notifications; public enum NotificationType : long { diff --git a/fluXis.Shared/Components/Other/Achievement.cs b/fluXis.Game/Online/API/Models/Other/Achievement.cs similarity index 88% rename from fluXis.Shared/Components/Other/Achievement.cs rename to fluXis.Game/Online/API/Models/Other/Achievement.cs index 9c10cdfc..420c16bb 100644 --- a/fluXis.Shared/Components/Other/Achievement.cs +++ b/fluXis.Game/Online/API/Models/Other/Achievement.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Other; +namespace fluXis.Game.Online.API.Models.Other; public class Achievement { diff --git a/fluXis.Shared/Components/Other/GradientColor.cs b/fluXis.Game/Online/API/Models/Other/GradientColor.cs similarity index 81% rename from fluXis.Shared/Components/Other/GradientColor.cs rename to fluXis.Game/Online/API/Models/Other/GradientColor.cs index 0b8ca0fe..3665ac1c 100644 --- a/fluXis.Shared/Components/Other/GradientColor.cs +++ b/fluXis.Game/Online/API/Models/Other/GradientColor.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Other; +namespace fluXis.Game.Online.API.Models.Other; public class GradientColor { diff --git a/fluXis.Shared/Components/Other/MenuUpdate.cs b/fluXis.Game/Online/API/Models/Other/MenuUpdate.cs similarity index 81% rename from fluXis.Shared/Components/Other/MenuUpdate.cs rename to fluXis.Game/Online/API/Models/Other/MenuUpdate.cs index 8c031c47..b417e7ad 100644 --- a/fluXis.Shared/Components/Other/MenuUpdate.cs +++ b/fluXis.Game/Online/API/Models/Other/MenuUpdate.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Other; +namespace fluXis.Game.Online.API.Models.Other; public class MenuUpdate { diff --git a/fluXis.Shared/Components/Other/ServerMessage.cs b/fluXis.Game/Online/API/Models/Other/ServerMessage.cs similarity index 95% rename from fluXis.Shared/Components/Other/ServerMessage.cs rename to fluXis.Game/Online/API/Models/Other/ServerMessage.cs index 7d9a41e8..9f73d4f4 100644 --- a/fluXis.Shared/Components/Other/ServerMessage.cs +++ b/fluXis.Game/Online/API/Models/Other/ServerMessage.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Other; +namespace fluXis.Game.Online.API.Models.Other; public class ServerMessage { diff --git a/fluXis.Shared/Components/Scores/APIClubScore.cs b/fluXis.Game/Online/API/Models/Scores/APIClubScore.cs similarity index 81% rename from fluXis.Shared/Components/Scores/APIClubScore.cs rename to fluXis.Game/Online/API/Models/Scores/APIClubScore.cs index 941e5178..05234dfe 100644 --- a/fluXis.Shared/Components/Scores/APIClubScore.cs +++ b/fluXis.Game/Online/API/Models/Scores/APIClubScore.cs @@ -1,7 +1,7 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Scores; +namespace fluXis.Game.Online.API.Models.Scores; public class APIClubScore { diff --git a/fluXis.Shared/Components/Scores/APIScore.cs b/fluXis.Game/Online/API/Models/Scores/APIScore.cs similarity index 90% rename from fluXis.Shared/Components/Scores/APIScore.cs rename to fluXis.Game/Online/API/Models/Scores/APIScore.cs index fdbba752..5919b6b6 100644 --- a/fluXis.Shared/Components/Scores/APIScore.cs +++ b/fluXis.Game/Online/API/Models/Scores/APIScore.cs @@ -1,8 +1,10 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Users; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Scores; +namespace fluXis.Game.Online.API.Models.Scores; + +#nullable enable public class APIScore { diff --git a/fluXis.Shared/Components/Users/APIUser.cs b/fluXis.Game/Online/API/Models/Users/APIUser.cs similarity index 90% rename from fluXis.Shared/Components/Users/APIUser.cs rename to fluXis.Game/Online/API/Models/Users/APIUser.cs index 70f28e8b..faa19575 100644 --- a/fluXis.Shared/Components/Users/APIUser.cs +++ b/fluXis.Game/Online/API/Models/Users/APIUser.cs @@ -1,9 +1,12 @@ -using fluXis.Shared.Components.Clubs; -using fluXis.Shared.Components.Groups; -using fluXis.Shared.Components.Users.Equipment; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Clubs; +using fluXis.Game.Online.API.Models.Groups; +using fluXis.Game.Online.API.Models.Users.Equipment; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Users; +namespace fluXis.Game.Online.API.Models.Users; + +#nullable enable public class APIUser { diff --git a/fluXis.Shared/Components/Users/APIUserMaps.cs b/fluXis.Game/Online/API/Models/Users/APIUserMaps.cs similarity index 78% rename from fluXis.Shared/Components/Users/APIUserMaps.cs rename to fluXis.Game/Online/API/Models/Users/APIUserMaps.cs index 9ffc021c..ec188552 100644 --- a/fluXis.Shared/Components/Users/APIUserMaps.cs +++ b/fluXis.Game/Online/API/Models/Users/APIUserMaps.cs @@ -1,8 +1,10 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Utils; +using System; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Users; +namespace fluXis.Game.Online.API.Models.Users; public class APIUserMaps { diff --git a/fluXis.Shared/Components/Users/APIUserSocials.cs b/fluXis.Game/Online/API/Models/Users/APIUserSocials.cs similarity index 84% rename from fluXis.Shared/Components/Users/APIUserSocials.cs rename to fluXis.Game/Online/API/Models/Users/APIUserSocials.cs index 15bdd3a3..2faa3ae8 100644 --- a/fluXis.Shared/Components/Users/APIUserSocials.cs +++ b/fluXis.Game/Online/API/Models/Users/APIUserSocials.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Users; +namespace fluXis.Game.Online.API.Models.Users; + +#nullable enable public class APIUserSocials { diff --git a/fluXis.Shared/Components/Users/APIUserStatistics.cs b/fluXis.Game/Online/API/Models/Users/APIUserStatistics.cs similarity index 93% rename from fluXis.Shared/Components/Users/APIUserStatistics.cs rename to fluXis.Game/Online/API/Models/Users/APIUserStatistics.cs index 76bfeff2..c6b338a1 100644 --- a/fluXis.Shared/Components/Users/APIUserStatistics.cs +++ b/fluXis.Game/Online/API/Models/Users/APIUserStatistics.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.Components.Users; +namespace fluXis.Game.Online.API.Models.Users; public class APIUserStatistics { diff --git a/fluXis.Shared/Components/Users/Equipment/APINamePaint.cs b/fluXis.Game/Online/API/Models/Users/Equipment/APINamePaint.cs similarity index 67% rename from fluXis.Shared/Components/Users/Equipment/APINamePaint.cs rename to fluXis.Game/Online/API/Models/Users/Equipment/APINamePaint.cs index fa96cb92..ae4c94ce 100644 --- a/fluXis.Shared/Components/Users/Equipment/APINamePaint.cs +++ b/fluXis.Game/Online/API/Models/Users/Equipment/APINamePaint.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Components.Other; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Other; using Newtonsoft.Json; -namespace fluXis.Shared.Components.Users.Equipment; +namespace fluXis.Game.Online.API.Models.Users.Equipment; public class APINamePaint { diff --git a/fluXis.Shared/API/Packets/Account/AuthPacket.cs b/fluXis.Game/Online/API/Packets/Account/AuthPacket.cs similarity index 82% rename from fluXis.Shared/API/Packets/Account/AuthPacket.cs rename to fluXis.Game/Online/API/Packets/Account/AuthPacket.cs index be247fdf..833fa330 100644 --- a/fluXis.Shared/API/Packets/Account/AuthPacket.cs +++ b/fluXis.Game/Online/API/Packets/Account/AuthPacket.cs @@ -1,6 +1,9 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Account; +namespace fluXis.Game.Online.API.Packets.Account; + +#nullable enable public class AuthPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Account/LoginPacket.cs b/fluXis.Game/Online/API/Packets/Account/LoginPacket.cs similarity index 76% rename from fluXis.Shared/API/Packets/Account/LoginPacket.cs rename to fluXis.Game/Online/API/Packets/Account/LoginPacket.cs index 4e79228a..757cc1d7 100644 --- a/fluXis.Shared/API/Packets/Account/LoginPacket.cs +++ b/fluXis.Game/Online/API/Packets/Account/LoginPacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Account; +namespace fluXis.Game.Online.API.Packets.Account; + +#nullable enable public class LoginPacket : IPacket { diff --git a/fluXis.Game/Online/API/Packets/Account/LogoutPacket.cs b/fluXis.Game/Online/API/Packets/Account/LogoutPacket.cs new file mode 100644 index 00000000..ec4c9c09 --- /dev/null +++ b/fluXis.Game/Online/API/Packets/Account/LogoutPacket.cs @@ -0,0 +1,8 @@ +using fluXis.Game.Online.Fluxel; + +namespace fluXis.Game.Online.API.Packets.Account; + +public class LogoutPacket : IPacket +{ + public string ID => PacketIDs.LOGOUT; +} diff --git a/fluXis.Shared/API/Packets/Account/RegisterPacket.cs b/fluXis.Game/Online/API/Packets/Account/RegisterPacket.cs similarity index 85% rename from fluXis.Shared/API/Packets/Account/RegisterPacket.cs rename to fluXis.Game/Online/API/Packets/Account/RegisterPacket.cs index b6f36941..907a5e72 100644 --- a/fluXis.Shared/API/Packets/Account/RegisterPacket.cs +++ b/fluXis.Game/Online/API/Packets/Account/RegisterPacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Account; +namespace fluXis.Game.Online.API.Packets.Account; + +#nullable enable public class RegisterPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Chat/ChatChannelJoinPacket.cs b/fluXis.Game/Online/API/Packets/Chat/ChatChannelJoinPacket.cs similarity index 62% rename from fluXis.Shared/API/Packets/Chat/ChatChannelJoinPacket.cs rename to fluXis.Game/Online/API/Packets/Chat/ChatChannelJoinPacket.cs index 3f927656..d60e8fa6 100644 --- a/fluXis.Shared/API/Packets/Chat/ChatChannelJoinPacket.cs +++ b/fluXis.Game/Online/API/Packets/Chat/ChatChannelJoinPacket.cs @@ -1,6 +1,7 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Chat; +namespace fluXis.Game.Online.API.Packets.Chat; public class ChatChannelJoinPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Chat/ChatChannelLeavePacket.cs b/fluXis.Game/Online/API/Packets/Chat/ChatChannelLeavePacket.cs similarity index 62% rename from fluXis.Shared/API/Packets/Chat/ChatChannelLeavePacket.cs rename to fluXis.Game/Online/API/Packets/Chat/ChatChannelLeavePacket.cs index 506e6cfb..3b11d177 100644 --- a/fluXis.Shared/API/Packets/Chat/ChatChannelLeavePacket.cs +++ b/fluXis.Game/Online/API/Packets/Chat/ChatChannelLeavePacket.cs @@ -1,6 +1,7 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Chat; +namespace fluXis.Game.Online.API.Packets.Chat; public class ChatChannelLeavePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Chat/ChatDeletePacket.cs b/fluXis.Game/Online/API/Packets/Chat/ChatDeletePacket.cs similarity index 66% rename from fluXis.Shared/API/Packets/Chat/ChatDeletePacket.cs rename to fluXis.Game/Online/API/Packets/Chat/ChatDeletePacket.cs index 83999da0..d27b03ac 100644 --- a/fluXis.Shared/API/Packets/Chat/ChatDeletePacket.cs +++ b/fluXis.Game/Online/API/Packets/Chat/ChatDeletePacket.cs @@ -1,6 +1,9 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Chat; +namespace fluXis.Game.Online.API.Packets.Chat; + +#nullable enable public class ChatDeletePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Chat/ChatHistoryPacket.cs b/fluXis.Game/Online/API/Packets/Chat/ChatHistoryPacket.cs similarity index 76% rename from fluXis.Shared/API/Packets/Chat/ChatHistoryPacket.cs rename to fluXis.Game/Online/API/Packets/Chat/ChatHistoryPacket.cs index e3465070..e4ff435c 100644 --- a/fluXis.Shared/API/Packets/Chat/ChatHistoryPacket.cs +++ b/fluXis.Game/Online/API/Packets/Chat/ChatHistoryPacket.cs @@ -1,7 +1,11 @@ -using fluXis.Shared.Components.Chat; +using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Chat; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Chat; +namespace fluXis.Game.Online.API.Packets.Chat; + +#nullable enable public class ChatHistoryPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Chat/ChatMessagePacket.cs b/fluXis.Game/Online/API/Packets/Chat/ChatMessagePacket.cs similarity index 82% rename from fluXis.Shared/API/Packets/Chat/ChatMessagePacket.cs rename to fluXis.Game/Online/API/Packets/Chat/ChatMessagePacket.cs index 4556c6d8..dbd036c6 100644 --- a/fluXis.Shared/API/Packets/Chat/ChatMessagePacket.cs +++ b/fluXis.Game/Online/API/Packets/Chat/ChatMessagePacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Components.Chat; +using fluXis.Game.Online.API.Models.Chat; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Chat; +namespace fluXis.Game.Online.API.Packets.Chat; + +#nullable enable public class ChatMessagePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/EmptyPacket.cs b/fluXis.Game/Online/API/Packets/EmptyPacket.cs similarity index 67% rename from fluXis.Shared/API/Packets/EmptyPacket.cs rename to fluXis.Game/Online/API/Packets/EmptyPacket.cs index c5db422f..914ddec4 100644 --- a/fluXis.Shared/API/Packets/EmptyPacket.cs +++ b/fluXis.Game/Online/API/Packets/EmptyPacket.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.API.Packets; +namespace fluXis.Game.Online.API.Packets; public class EmptyPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/IPacket.cs b/fluXis.Game/Online/API/Packets/IPacket.cs similarity index 69% rename from fluXis.Shared/API/Packets/IPacket.cs rename to fluXis.Game/Online/API/Packets/IPacket.cs index f0d9df2f..46ee011d 100644 --- a/fluXis.Shared/API/Packets/IPacket.cs +++ b/fluXis.Game/Online/API/Packets/IPacket.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets; +namespace fluXis.Game.Online.API.Packets; public interface IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiCompletePacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiCompletePacket.cs similarity index 69% rename from fluXis.Shared/API/Packets/Multiplayer/MultiCompletePacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiCompletePacket.cs index 8f938303..2bbda6e7 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiCompletePacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiCompletePacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Scoring; +using fluXis.Game.Online.Fluxel; +using fluXis.Game.Scoring; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; + +#nullable enable public class MultiCompletePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiCreatePacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiCreatePacket.cs similarity index 84% rename from fluXis.Shared/API/Packets/Multiplayer/MultiCreatePacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiCreatePacket.cs index 89409dba..9cb86d46 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiCreatePacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiCreatePacket.cs @@ -1,6 +1,7 @@ -using fluXis.Shared.Components.Multi; +using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.Fluxel; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiCreatePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiFinishPacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiFinishPacket.cs similarity index 65% rename from fluXis.Shared/API/Packets/Multiplayer/MultiFinishPacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiFinishPacket.cs index 03cfe67b..5a6b71ff 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiFinishPacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiFinishPacket.cs @@ -1,7 +1,9 @@ -using fluXis.Shared.Scoring; +using System.Collections.Generic; +using fluXis.Game.Online.Fluxel; +using fluXis.Game.Scoring; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiFinishPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiJoinPacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiJoinPacket.cs similarity index 87% rename from fluXis.Shared/API/Packets/Multiplayer/MultiJoinPacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiJoinPacket.cs index 989438b3..2f0bd8c9 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiJoinPacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiJoinPacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Components.Multi; +using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; + +#nullable enable public class MultiJoinPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiLeavePacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiLeavePacket.cs similarity index 72% rename from fluXis.Shared/API/Packets/Multiplayer/MultiLeavePacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiLeavePacket.cs index 19eeb2f9..5dbbf320 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiLeavePacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiLeavePacket.cs @@ -1,6 +1,7 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiLeavePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiMapPacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiMapPacket.cs similarity index 80% rename from fluXis.Shared/API/Packets/Multiplayer/MultiMapPacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiMapPacket.cs index 682b22ca..5941d404 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiMapPacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiMapPacket.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiMapPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiReadyPacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiReadyPacket.cs similarity index 81% rename from fluXis.Shared/API/Packets/Multiplayer/MultiReadyPacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiReadyPacket.cs index 7ba65d16..6691f9a5 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiReadyPacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiReadyPacket.cs @@ -1,6 +1,7 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiReadyPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiScorePacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiScorePacket.cs similarity index 84% rename from fluXis.Shared/API/Packets/Multiplayer/MultiScorePacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiScorePacket.cs index 137efe68..f98d470b 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiScorePacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiScorePacket.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.API.Packets.Multiplayer; +using fluXis.Game.Online.Fluxel; + +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiScorePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiStartPacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiStartPacket.cs similarity index 51% rename from fluXis.Shared/API/Packets/Multiplayer/MultiStartPacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiStartPacket.cs index 76e5f0a5..11a54c0f 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiStartPacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiStartPacket.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.API.Packets.Multiplayer; +using fluXis.Game.Online.Fluxel; + +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiStartPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Multiplayer/MultiStatePacket.cs b/fluXis.Game/Online/API/Packets/Multiplayer/MultiStatePacket.cs similarity index 78% rename from fluXis.Shared/API/Packets/Multiplayer/MultiStatePacket.cs rename to fluXis.Game/Online/API/Packets/Multiplayer/MultiStatePacket.cs index 35a3888a..74b9bad0 100644 --- a/fluXis.Shared/API/Packets/Multiplayer/MultiStatePacket.cs +++ b/fluXis.Game/Online/API/Packets/Multiplayer/MultiStatePacket.cs @@ -1,6 +1,7 @@ -using fluXis.Shared.Components.Multi; +using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.Fluxel; -namespace fluXis.Shared.API.Packets.Multiplayer; +namespace fluXis.Game.Online.API.Packets.Multiplayer; public class MultiStatePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Other/AchievementPacket.cs b/fluXis.Game/Online/API/Packets/Other/AchievementPacket.cs similarity index 72% rename from fluXis.Shared/API/Packets/Other/AchievementPacket.cs rename to fluXis.Game/Online/API/Packets/Other/AchievementPacket.cs index 1479ca22..c819295d 100644 --- a/fluXis.Shared/API/Packets/Other/AchievementPacket.cs +++ b/fluXis.Game/Online/API/Packets/Other/AchievementPacket.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Components.Other; +using fluXis.Game.Online.API.Models.Other; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Other; +namespace fluXis.Game.Online.API.Packets.Other; public class AchievementPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Other/MaintenancePacket.cs b/fluXis.Game/Online/API/Packets/Other/MaintenancePacket.cs similarity index 79% rename from fluXis.Shared/API/Packets/Other/MaintenancePacket.cs rename to fluXis.Game/Online/API/Packets/Other/MaintenancePacket.cs index 6d2458bc..cc97853e 100644 --- a/fluXis.Shared/API/Packets/Other/MaintenancePacket.cs +++ b/fluXis.Game/Online/API/Packets/Other/MaintenancePacket.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.API.Packets.Other; +using fluXis.Game.Online.Fluxel; + +namespace fluXis.Game.Online.API.Packets.Other; public class MaintenancePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/Other/ServerMessagePacket.cs b/fluXis.Game/Online/API/Packets/Other/ServerMessagePacket.cs similarity index 69% rename from fluXis.Shared/API/Packets/Other/ServerMessagePacket.cs rename to fluXis.Game/Online/API/Packets/Other/ServerMessagePacket.cs index 3d7b360f..2fb1335d 100644 --- a/fluXis.Shared/API/Packets/Other/ServerMessagePacket.cs +++ b/fluXis.Game/Online/API/Packets/Other/ServerMessagePacket.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Components.Other; +using fluXis.Game.Online.API.Models.Other; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.Other; +namespace fluXis.Game.Online.API.Packets.Other; public class ServerMessagePacket : IPacket { diff --git a/fluXis.Shared/API/Packets/User/ActivityPacket.cs b/fluXis.Game/Online/API/Packets/User/ActivityPacket.cs similarity index 79% rename from fluXis.Shared/API/Packets/User/ActivityPacket.cs rename to fluXis.Game/Online/API/Packets/User/ActivityPacket.cs index 67ff54df..509e313b 100644 --- a/fluXis.Shared/API/Packets/User/ActivityPacket.cs +++ b/fluXis.Game/Online/API/Packets/User/ActivityPacket.cs @@ -1,7 +1,8 @@ -using Newtonsoft.Json; +using fluXis.Game.Online.Fluxel; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace fluXis.Shared.API.Packets.User; +namespace fluXis.Game.Online.API.Packets.User; public class ActivityPacket : IPacket { diff --git a/fluXis.Shared/API/Packets/User/FriendOnlinePacket.cs b/fluXis.Game/Online/API/Packets/User/FriendOnlinePacket.cs similarity index 72% rename from fluXis.Shared/API/Packets/User/FriendOnlinePacket.cs rename to fluXis.Game/Online/API/Packets/User/FriendOnlinePacket.cs index 57db3a12..c31aa529 100644 --- a/fluXis.Shared/API/Packets/User/FriendOnlinePacket.cs +++ b/fluXis.Game/Online/API/Packets/User/FriendOnlinePacket.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.Fluxel; using Newtonsoft.Json; -namespace fluXis.Shared.API.Packets.User; +namespace fluXis.Game.Online.API.Packets.User; + +#nullable enable public class FriendOnlinePacket : IPacket { diff --git a/fluXis.Shared/API/Payloads/Auth/LoginPayload.cs b/fluXis.Game/Online/API/Payloads/Auth/LoginPayload.cs similarity index 83% rename from fluXis.Shared/API/Payloads/Auth/LoginPayload.cs rename to fluXis.Game/Online/API/Payloads/Auth/LoginPayload.cs index 125e1f6b..8f22638e 100644 --- a/fluXis.Shared/API/Payloads/Auth/LoginPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Auth/LoginPayload.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Auth; +namespace fluXis.Game.Online.API.Payloads.Auth; public class LoginPayload { diff --git a/fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs b/fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs similarity index 77% rename from fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs rename to fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs index f39031e3..73d9a050 100644 --- a/fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPEnablePayload.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Auth.Multifactor; +namespace fluXis.Game.Online.API.Payloads.Auth.Multifactor; + +#nullable enable public class TOTPEnablePayload { diff --git a/fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs b/fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs similarity index 62% rename from fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs rename to fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs index 5bb89112..974df2db 100644 --- a/fluXis.Shared/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Auth/Multifactor/TOTPVerifyPayload.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Auth.Multifactor; +namespace fluXis.Game.Online.API.Payloads.Auth.Multifactor; + +#nullable enable public class TOTPVerifyPayload { diff --git a/fluXis.Shared/API/Payloads/Auth/PasswordResetPayload.cs b/fluXis.Game/Online/API/Payloads/Auth/PasswordResetPayload.cs similarity index 75% rename from fluXis.Shared/API/Payloads/Auth/PasswordResetPayload.cs rename to fluXis.Game/Online/API/Payloads/Auth/PasswordResetPayload.cs index 4ec14122..5cfbffad 100644 --- a/fluXis.Shared/API/Payloads/Auth/PasswordResetPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Auth/PasswordResetPayload.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Auth; +namespace fluXis.Game.Online.API.Payloads.Auth; + +#nullable enable public class PasswordResetPayload { diff --git a/fluXis.Shared/API/Payloads/Auth/RegisterPayload.cs b/fluXis.Game/Online/API/Payloads/Auth/RegisterPayload.cs similarity index 84% rename from fluXis.Shared/API/Payloads/Auth/RegisterPayload.cs rename to fluXis.Game/Online/API/Payloads/Auth/RegisterPayload.cs index 4558a440..7d16167a 100644 --- a/fluXis.Shared/API/Payloads/Auth/RegisterPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Auth/RegisterPayload.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Auth; +namespace fluXis.Game.Online.API.Payloads.Auth; + +#nullable enable public class RegisterPayload { diff --git a/fluXis.Shared/API/Payloads/Chat/ChatMessagePayload.cs b/fluXis.Game/Online/API/Payloads/Chat/ChatMessagePayload.cs similarity index 75% rename from fluXis.Shared/API/Payloads/Chat/ChatMessagePayload.cs rename to fluXis.Game/Online/API/Payloads/Chat/ChatMessagePayload.cs index ea6b22c1..82bd4d66 100644 --- a/fluXis.Shared/API/Payloads/Chat/ChatMessagePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Chat/ChatMessagePayload.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Chat; +namespace fluXis.Game.Online.API.Payloads.Chat; + +#nullable enable public class ChatMessagePayload { diff --git a/fluXis.Shared/API/Payloads/Clubs/CreateClubPayload.cs b/fluXis.Game/Online/API/Payloads/Clubs/CreateClubPayload.cs similarity index 91% rename from fluXis.Shared/API/Payloads/Clubs/CreateClubPayload.cs rename to fluXis.Game/Online/API/Payloads/Clubs/CreateClubPayload.cs index bb3e0138..f5fe58b2 100644 --- a/fluXis.Shared/API/Payloads/Clubs/CreateClubPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Clubs/CreateClubPayload.cs @@ -1,7 +1,7 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Clubs; +namespace fluXis.Game.Online.API.Payloads.Clubs; public class CreateClubPayload { diff --git a/fluXis.Shared/API/Payloads/Clubs/EditClubPayload.cs b/fluXis.Game/Online/API/Payloads/Clubs/EditClubPayload.cs similarity index 88% rename from fluXis.Shared/API/Payloads/Clubs/EditClubPayload.cs rename to fluXis.Game/Online/API/Payloads/Clubs/EditClubPayload.cs index 5d0297db..a3e9e1b3 100644 --- a/fluXis.Shared/API/Payloads/Clubs/EditClubPayload.cs +++ b/fluXis.Game/Online/API/Payloads/Clubs/EditClubPayload.cs @@ -1,7 +1,9 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Clubs; +namespace fluXis.Game.Online.API.Payloads.Clubs; + +#nullable enable public class EditClubPayload { diff --git a/fluXis.Shared/API/Payloads/Collections/CollectionCreatePayload.cs b/fluXis.Game/Online/API/Payloads/Collections/CollectionCreatePayload.cs similarity index 62% rename from fluXis.Shared/API/Payloads/Collections/CollectionCreatePayload.cs rename to fluXis.Game/Online/API/Payloads/Collections/CollectionCreatePayload.cs index aa6220d8..e7d3be60 100644 --- a/fluXis.Shared/API/Payloads/Collections/CollectionCreatePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Collections/CollectionCreatePayload.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.API.Payloads.Collections; +namespace fluXis.Game.Online.API.Payloads.Collections; + +#nullable enable public class CollectionCreatePayload { diff --git a/fluXis.Shared/API/Payloads/Invites/CreateClubInvitePayload.cs b/fluXis.Game/Online/API/Payloads/Invites/CreateClubInvitePayload.cs similarity index 79% rename from fluXis.Shared/API/Payloads/Invites/CreateClubInvitePayload.cs rename to fluXis.Game/Online/API/Payloads/Invites/CreateClubInvitePayload.cs index da07f41d..257d5a0a 100644 --- a/fluXis.Shared/API/Payloads/Invites/CreateClubInvitePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Invites/CreateClubInvitePayload.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Invites; +namespace fluXis.Game.Online.API.Payloads.Invites; public class CreateClubInvitePayload { diff --git a/fluXis.Shared/API/Payloads/Maps/MapVotePayload.cs b/fluXis.Game/Online/API/Payloads/Maps/MapVotePayload.cs similarity index 72% rename from fluXis.Shared/API/Payloads/Maps/MapVotePayload.cs rename to fluXis.Game/Online/API/Payloads/Maps/MapVotePayload.cs index 420754e4..ce9a333a 100644 --- a/fluXis.Shared/API/Payloads/Maps/MapVotePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Maps/MapVotePayload.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Maps; +namespace fluXis.Game.Online.API.Payloads.Maps; public class MapVotePayload { diff --git a/fluXis.Shared/API/Payloads/Users/UserProfileUpdatePayload.cs b/fluXis.Game/Online/API/Payloads/Users/UserProfileUpdatePayload.cs similarity index 92% rename from fluXis.Shared/API/Payloads/Users/UserProfileUpdatePayload.cs rename to fluXis.Game/Online/API/Payloads/Users/UserProfileUpdatePayload.cs index 47142a5e..441cf3a7 100644 --- a/fluXis.Shared/API/Payloads/Users/UserProfileUpdatePayload.cs +++ b/fluXis.Game/Online/API/Payloads/Users/UserProfileUpdatePayload.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; -namespace fluXis.Shared.API.Payloads.Users; +namespace fluXis.Game.Online.API.Payloads.Users; + +#nullable enable public class UserProfileUpdatePayload { diff --git a/fluXis.Game/Online/API/Requests/Auth/LoginRequest.cs b/fluXis.Game/Online/API/Requests/Auth/LoginRequest.cs index b767166d..bbcada43 100644 --- a/fluXis.Game/Online/API/Requests/Auth/LoginRequest.cs +++ b/fluXis.Game/Online/API/Requests/Auth/LoginRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Auth; -using fluXis.Shared.API.Responses.Auth; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Payloads.Auth; +using fluXis.Game.Online.API.Responses.Auth; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Auth; diff --git a/fluXis.Game/Online/API/Requests/Auth/Multifactor/TOTPVerifyRequest.cs b/fluXis.Game/Online/API/Requests/Auth/Multifactor/TOTPVerifyRequest.cs index 63d09b80..957ed3fe 100644 --- a/fluXis.Game/Online/API/Requests/Auth/Multifactor/TOTPVerifyRequest.cs +++ b/fluXis.Game/Online/API/Requests/Auth/Multifactor/TOTPVerifyRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Auth.Multifactor; -using fluXis.Shared.API.Responses.Auth.Multifactor; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Payloads.Auth.Multifactor; +using fluXis.Game.Online.API.Responses.Auth.Multifactor; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Auth.Multifactor; diff --git a/fluXis.Game/Online/API/Requests/Auth/RegisterRequest.cs b/fluXis.Game/Online/API/Requests/Auth/RegisterRequest.cs index bb963c92..c5caeae2 100644 --- a/fluXis.Game/Online/API/Requests/Auth/RegisterRequest.cs +++ b/fluXis.Game/Online/API/Requests/Auth/RegisterRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Auth; -using fluXis.Shared.API.Responses.Auth; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Payloads.Auth; +using fluXis.Game.Online.API.Responses.Auth; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Auth; diff --git a/fluXis.Game/Online/API/Requests/Chat/ChatChannelsRequest.cs b/fluXis.Game/Online/API/Requests/Chat/ChatChannelsRequest.cs index 159f2614..a9a6b631 100644 --- a/fluXis.Game/Online/API/Requests/Chat/ChatChannelsRequest.cs +++ b/fluXis.Game/Online/API/Requests/Chat/ChatChannelsRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Chat; +using fluXis.Game.Online.API.Models.Chat; namespace fluXis.Game.Online.API.Requests.Chat; diff --git a/fluXis.Game/Online/API/Requests/Chat/ChatJoinedChannelsRequest.cs b/fluXis.Game/Online/API/Requests/Chat/ChatJoinedChannelsRequest.cs index 4652ca0f..9692ad50 100644 --- a/fluXis.Game/Online/API/Requests/Chat/ChatJoinedChannelsRequest.cs +++ b/fluXis.Game/Online/API/Requests/Chat/ChatJoinedChannelsRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Chat; +using fluXis.Game.Online.API.Models.Chat; namespace fluXis.Game.Online.API.Requests.Chat; diff --git a/fluXis.Game/Online/API/Requests/Chat/ChatMessageRequest.cs b/fluXis.Game/Online/API/Requests/Chat/ChatMessageRequest.cs index 024d5594..ac1c407a 100644 --- a/fluXis.Game/Online/API/Requests/Chat/ChatMessageRequest.cs +++ b/fluXis.Game/Online/API/Requests/Chat/ChatMessageRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Chat; -using fluXis.Shared.Components.Chat; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Models.Chat; +using fluXis.Game.Online.API.Payloads.Chat; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Chat; diff --git a/fluXis.Game/Online/API/Requests/Chat/ChatMessagesRequest.cs b/fluXis.Game/Online/API/Requests/Chat/ChatMessagesRequest.cs index 859c2248..871d22af 100644 --- a/fluXis.Game/Online/API/Requests/Chat/ChatMessagesRequest.cs +++ b/fluXis.Game/Online/API/Requests/Chat/ChatMessagesRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Chat; +using fluXis.Game.Online.API.Models.Chat; namespace fluXis.Game.Online.API.Requests.Chat; diff --git a/fluXis.Game/Online/API/Requests/Clubs/ClubRequest.cs b/fluXis.Game/Online/API/Requests/Clubs/ClubRequest.cs index ef14b0c9..652dd4a3 100644 --- a/fluXis.Game/Online/API/Requests/Clubs/ClubRequest.cs +++ b/fluXis.Game/Online/API/Requests/Clubs/ClubRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; namespace fluXis.Game.Online.API.Requests.Clubs; diff --git a/fluXis.Game/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs b/fluXis.Game/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs index f2cb1c78..0ef3d504 100644 --- a/fluXis.Game/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs +++ b/fluXis.Game/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Requests.Leaderboards; diff --git a/fluXis.Game/Online/API/Requests/MapSets/MapSetRequest.cs b/fluXis.Game/Online/API/Requests/MapSets/MapSetRequest.cs index 5475e3a1..49e15234 100644 --- a/fluXis.Game/Online/API/Requests/MapSets/MapSetRequest.cs +++ b/fluXis.Game/Online/API/Requests/MapSets/MapSetRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; namespace fluXis.Game.Online.API.Requests.MapSets; diff --git a/fluXis.Game/Online/API/Requests/MapSets/MapSetUploadRequest.cs b/fluXis.Game/Online/API/Requests/MapSets/MapSetUploadRequest.cs index 18092ffb..b6cbbb98 100644 --- a/fluXis.Game/Online/API/Requests/MapSets/MapSetUploadRequest.cs +++ b/fluXis.Game/Online/API/Requests/MapSets/MapSetUploadRequest.cs @@ -1,5 +1,5 @@ using System.Net.Http; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.MapSets; diff --git a/fluXis.Game/Online/API/Requests/MapSets/MapSetsRequest.cs b/fluXis.Game/Online/API/Requests/MapSets/MapSetsRequest.cs index 9cd5eab4..2389f2a7 100644 --- a/fluXis.Game/Online/API/Requests/MapSets/MapSetsRequest.cs +++ b/fluXis.Game/Online/API/Requests/MapSets/MapSetsRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.MapSets; diff --git a/fluXis.Game/Online/API/Requests/Maps/MapLeaderboardRequest.cs b/fluXis.Game/Online/API/Requests/Maps/MapLeaderboardRequest.cs index 3430ba64..49377900 100644 --- a/fluXis.Game/Online/API/Requests/Maps/MapLeaderboardRequest.cs +++ b/fluXis.Game/Online/API/Requests/Maps/MapLeaderboardRequest.cs @@ -1,5 +1,5 @@ +using fluXis.Game.Online.API.Responses.Maps; using fluXis.Game.Screens.Select.Info.Scores; -using fluXis.Shared.API.Responses.Maps; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Maps; diff --git a/fluXis.Game/Online/API/Requests/Maps/MapLookupRequest.cs b/fluXis.Game/Online/API/Requests/Maps/MapLookupRequest.cs index b3609b73..c9f19f9e 100644 --- a/fluXis.Game/Online/API/Requests/Maps/MapLookupRequest.cs +++ b/fluXis.Game/Online/API/Requests/Maps/MapLookupRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Maps; diff --git a/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesRequest.cs b/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesRequest.cs index 5ac49e7e..d30d6f76 100644 --- a/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesRequest.cs +++ b/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; namespace fluXis.Game.Online.API.Requests.Maps.Votes; diff --git a/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesUpdateRequest.cs b/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesUpdateRequest.cs index 8889d61a..3969d427 100644 --- a/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesUpdateRequest.cs +++ b/fluXis.Game/Online/API/Requests/Maps/Votes/MapVotesUpdateRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Maps; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Payloads.Maps; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Maps.Votes; diff --git a/fluXis.Game/Online/API/Requests/MenuUpdatesRequest.cs b/fluXis.Game/Online/API/Requests/MenuUpdatesRequest.cs index b041fb30..aa1a4f0b 100644 --- a/fluXis.Game/Online/API/Requests/MenuUpdatesRequest.cs +++ b/fluXis.Game/Online/API/Requests/MenuUpdatesRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Other; +using fluXis.Game.Online.API.Models.Other; namespace fluXis.Game.Online.API.Requests; diff --git a/fluXis.Game/Online/API/Requests/Scores/ScoreSubmitRequest.cs b/fluXis.Game/Online/API/Requests/Scores/ScoreSubmitRequest.cs index ac83e3c9..762e1255 100644 --- a/fluXis.Game/Online/API/Requests/Scores/ScoreSubmitRequest.cs +++ b/fluXis.Game/Online/API/Requests/Scores/ScoreSubmitRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Responses.Scores; -using fluXis.Shared.Scoring; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Responses.Scores; +using fluXis.Game.Scoring; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Scores; diff --git a/fluXis.Game/Online/API/Requests/Users/OnlineUsersRequest.cs b/fluXis.Game/Online/API/Requests/Users/OnlineUsersRequest.cs index b9b8841b..ae04192c 100644 --- a/fluXis.Game/Online/API/Requests/Users/OnlineUsersRequest.cs +++ b/fluXis.Game/Online/API/Requests/Users/OnlineUsersRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.API.Responses.Users; +using fluXis.Game.Online.API.Responses.Users; namespace fluXis.Game.Online.API.Requests.Users; diff --git a/fluXis.Game/Online/API/Requests/Users/UserFollowersRequest.cs b/fluXis.Game/Online/API/Requests/Users/UserFollowersRequest.cs index d0a938a8..b92ed878 100644 --- a/fluXis.Game/Online/API/Requests/Users/UserFollowersRequest.cs +++ b/fluXis.Game/Online/API/Requests/Users/UserFollowersRequest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Requests.Users; diff --git a/fluXis.Game/Online/API/Requests/Users/UserMapsRequest.cs b/fluXis.Game/Online/API/Requests/Users/UserMapsRequest.cs index 19c60c35..79a71062 100644 --- a/fluXis.Game/Online/API/Requests/Users/UserMapsRequest.cs +++ b/fluXis.Game/Online/API/Requests/Users/UserMapsRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Requests.Users; diff --git a/fluXis.Game/Online/API/Requests/Users/UserProfileUpdateRequest.cs b/fluXis.Game/Online/API/Requests/Users/UserProfileUpdateRequest.cs index cd7f6e97..3510163d 100644 --- a/fluXis.Game/Online/API/Requests/Users/UserProfileUpdateRequest.cs +++ b/fluXis.Game/Online/API/Requests/Users/UserProfileUpdateRequest.cs @@ -1,7 +1,7 @@ using System.Net.Http; -using fluXis.Shared.API.Payloads.Users; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Utils; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Payloads.Users; +using fluXis.Game.Utils; using osu.Framework.IO.Network; namespace fluXis.Game.Online.API.Requests.Users; diff --git a/fluXis.Game/Online/API/Requests/Users/UserRequest.cs b/fluXis.Game/Online/API/Requests/Users/UserRequest.cs index 0bc14f1a..367a1d5d 100644 --- a/fluXis.Game/Online/API/Requests/Users/UserRequest.cs +++ b/fluXis.Game/Online/API/Requests/Users/UserRequest.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Online.API.Requests.Users; diff --git a/fluXis.Shared/API/Responses/Auth/LoginResponse.cs b/fluXis.Game/Online/API/Responses/Auth/LoginResponse.cs similarity index 82% rename from fluXis.Shared/API/Responses/Auth/LoginResponse.cs rename to fluXis.Game/Online/API/Responses/Auth/LoginResponse.cs index 7d1fa8f6..18255094 100644 --- a/fluXis.Shared/API/Responses/Auth/LoginResponse.cs +++ b/fluXis.Game/Online/API/Responses/Auth/LoginResponse.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Auth; +namespace fluXis.Game.Online.API.Responses.Auth; public class LoginResponse { diff --git a/fluXis.Shared/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs b/fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs similarity index 70% rename from fluXis.Shared/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs rename to fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs index 47e4976a..72b5b648 100644 --- a/fluXis.Shared/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs +++ b/fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPEnableResponse.cs @@ -1,7 +1,11 @@ -using fluXis.Shared.Utils; +using System; +using System.Collections.Generic; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Auth.Multifactor; +namespace fluXis.Game.Online.API.Responses.Auth.Multifactor; + +#nullable enable public class TOTPEnableResponse { diff --git a/fluXis.Shared/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs b/fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs similarity index 76% rename from fluXis.Shared/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs rename to fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs index 69a30642..3d47eded 100644 --- a/fluXis.Shared/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs +++ b/fluXis.Game/Online/API/Responses/Auth/Multifactor/TOTPVerifyResponse.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Auth.Multifactor; +namespace fluXis.Game.Online.API.Responses.Auth.Multifactor; public class TOTPVerifyResponse { diff --git a/fluXis.Shared/API/Responses/Auth/RegisterResponse.cs b/fluXis.Game/Online/API/Responses/Auth/RegisterResponse.cs similarity index 79% rename from fluXis.Shared/API/Responses/Auth/RegisterResponse.cs rename to fluXis.Game/Online/API/Responses/Auth/RegisterResponse.cs index 6d2cb7a2..69c47b56 100644 --- a/fluXis.Shared/API/Responses/Auth/RegisterResponse.cs +++ b/fluXis.Game/Online/API/Responses/Auth/RegisterResponse.cs @@ -1,7 +1,8 @@ -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Auth; +namespace fluXis.Game.Online.API.Responses.Auth; public class RegisterResponse { diff --git a/fluXis.Shared/API/Responses/Maps/MapLeaderboard.cs b/fluXis.Game/Online/API/Responses/Maps/MapLeaderboard.cs similarity index 67% rename from fluXis.Shared/API/Responses/Maps/MapLeaderboard.cs rename to fluXis.Game/Online/API/Responses/Maps/MapLeaderboard.cs index 1b8f0362..8e32ab73 100644 --- a/fluXis.Shared/API/Responses/Maps/MapLeaderboard.cs +++ b/fluXis.Game/Online/API/Responses/Maps/MapLeaderboard.cs @@ -1,9 +1,12 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Scores; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Maps; +namespace fluXis.Game.Online.API.Responses.Maps; public class MapLeaderboard { diff --git a/fluXis.Shared/API/Responses/Maps/MapLeaderboardClubs.cs b/fluXis.Game/Online/API/Responses/Maps/MapLeaderboardClubs.cs similarity index 68% rename from fluXis.Shared/API/Responses/Maps/MapLeaderboardClubs.cs rename to fluXis.Game/Online/API/Responses/Maps/MapLeaderboardClubs.cs index 92b877fa..4ab6f025 100644 --- a/fluXis.Shared/API/Responses/Maps/MapLeaderboardClubs.cs +++ b/fluXis.Game/Online/API/Responses/Maps/MapLeaderboardClubs.cs @@ -1,9 +1,12 @@ -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using fluXis.Game.Online.API.Models.Maps; +using fluXis.Game.Online.API.Models.Scores; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Maps; +namespace fluXis.Game.Online.API.Responses.Maps; public class MapLeaderboardClubs { diff --git a/fluXis.Shared/API/Responses/Scores/ScoreSubmissionStats.cs b/fluXis.Game/Online/API/Responses/Scores/ScoreSubmissionStats.cs similarity index 91% rename from fluXis.Shared/API/Responses/Scores/ScoreSubmissionStats.cs rename to fluXis.Game/Online/API/Responses/Scores/ScoreSubmissionStats.cs index b5056c5c..1031fb7f 100644 --- a/fluXis.Shared/API/Responses/Scores/ScoreSubmissionStats.cs +++ b/fluXis.Game/Online/API/Responses/Scores/ScoreSubmissionStats.cs @@ -1,8 +1,9 @@ -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Utils; +using System; +using fluXis.Game.Online.API.Models.Scores; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Scores; +namespace fluXis.Game.Online.API.Responses.Scores; public class ScoreSubmissionStats { diff --git a/fluXis.Shared/API/Responses/Users/OnlineUsers.cs b/fluXis.Game/Online/API/Responses/Users/OnlineUsers.cs similarity index 70% rename from fluXis.Shared/API/Responses/Users/OnlineUsers.cs rename to fluXis.Game/Online/API/Responses/Users/OnlineUsers.cs index e1279c92..a9b489c2 100644 --- a/fluXis.Shared/API/Responses/Users/OnlineUsers.cs +++ b/fluXis.Game/Online/API/Responses/Users/OnlineUsers.cs @@ -1,8 +1,11 @@ -using fluXis.Shared.Components.Users; -using fluXis.Shared.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Utils; using Newtonsoft.Json; -namespace fluXis.Shared.API.Responses.Users; +namespace fluXis.Game.Online.API.Responses.Users; public class OnlineUsers { diff --git a/fluXis.Game/Online/Activity/UserActivity.cs b/fluXis.Game/Online/Activity/UserActivity.cs index 593bdac9..f45ab9a0 100644 --- a/fluXis.Game/Online/Activity/UserActivity.cs +++ b/fluXis.Game/Online/Activity/UserActivity.cs @@ -1,10 +1,10 @@ using System; using fluXis.Game.Database.Maps; using fluXis.Game.Integration; +using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Screens.Gameplay; -using fluXis.Shared.Components.Multi; -using fluXis.Shared.Components.Users; using JetBrains.Annotations; using Newtonsoft.Json; diff --git a/fluXis.Game/Online/Chat/ChatChannel.cs b/fluXis.Game/Online/Chat/ChatChannel.cs index beae4b0b..2902d9f7 100644 --- a/fluXis.Game/Online/Chat/ChatChannel.cs +++ b/fluXis.Game/Online/Chat/ChatChannel.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using fluXis.Game.Online.API.Models.Chat; using fluXis.Game.Online.API.Requests.Chat; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Chat; namespace fluXis.Game.Online.Chat; diff --git a/fluXis.Game/Online/Chat/ChatClient.cs b/fluXis.Game/Online/Chat/ChatClient.cs index 41fb5119..6321c81f 100644 --- a/fluXis.Game/Online/Chat/ChatClient.cs +++ b/fluXis.Game/Online/Chat/ChatClient.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using fluXis.Game.Online.API.Packets.Chat; using fluXis.Game.Online.API.Requests.Chat; using fluXis.Game.Online.Fluxel; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.API; -using fluXis.Shared.API.Packets.Chat; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Online/Drawables/ClubTag.cs b/fluXis.Game/Online/Drawables/ClubTag.cs index 58068224..b1c78287 100644 --- a/fluXis.Game/Online/Drawables/ClubTag.cs +++ b/fluXis.Game/Online/Drawables/ClubTag.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Text; +using fluXis.Game.Online.API.Models.Clubs; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Online/Drawables/DrawableGroupBadge.cs b/fluXis.Game/Online/Drawables/DrawableGroupBadge.cs index 1166e4ea..9eef9e55 100644 --- a/fluXis.Game/Online/Drawables/DrawableGroupBadge.cs +++ b/fluXis.Game/Online/Drawables/DrawableGroupBadge.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; -using fluXis.Shared.Components.Groups; +using fluXis.Game.Online.API.Models.Groups; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Online/Drawables/DrawableUserCard.cs b/fluXis.Game/Online/Drawables/DrawableUserCard.cs index e808c89e..17f1ddd5 100644 --- a/fluXis.Game/Online/Drawables/DrawableUserCard.cs +++ b/fluXis.Game/Online/Drawables/DrawableUserCard.cs @@ -5,9 +5,9 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Menus; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.User; -using fluXis.Shared.Components.Users; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Online/Fluxel/FluxelClient.cs b/fluXis.Game/Online/Fluxel/FluxelClient.cs index ded1855c..fecc37d7 100644 --- a/fluXis.Game/Online/Fluxel/FluxelClient.cs +++ b/fluXis.Game/Online/Fluxel/FluxelClient.cs @@ -9,17 +9,16 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Online.Activity; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Packets; +using fluXis.Game.Online.API.Packets.Account; +using fluXis.Game.Online.API.Packets.Chat; +using fluXis.Game.Online.API.Packets.Multiplayer; +using fluXis.Game.Online.API.Packets.Other; +using fluXis.Game.Online.API.Packets.User; using fluXis.Game.Online.API.Requests.Auth; using fluXis.Game.Overlay.Notifications; -using fluXis.Shared.API; -using fluXis.Shared.API.Packets; -using fluXis.Shared.API.Packets.Account; -using fluXis.Shared.API.Packets.Chat; -using fluXis.Shared.API.Packets.Multiplayer; -using fluXis.Shared.API.Packets.Other; -using fluXis.Shared.API.Packets.User; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using Newtonsoft.Json.Linq; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Shared/API/FluxelReply.cs b/fluXis.Game/Online/Fluxel/FluxelReply.cs similarity index 80% rename from fluXis.Shared/API/FluxelReply.cs rename to fluXis.Game/Online/Fluxel/FluxelReply.cs index 780f299d..7c1cd3a9 100644 --- a/fluXis.Shared/API/FluxelReply.cs +++ b/fluXis.Game/Online/Fluxel/FluxelReply.cs @@ -1,6 +1,9 @@ -using Newtonsoft.Json; +#nullable enable -namespace fluXis.Shared.API; +using System; +using Newtonsoft.Json; + +namespace fluXis.Game.Online.Fluxel; public class FluxelReply { diff --git a/fluXis.Shared/API/FluxelRequest.cs b/fluXis.Game/Online/Fluxel/FluxelRequest.cs similarity index 78% rename from fluXis.Shared/API/FluxelRequest.cs rename to fluXis.Game/Online/Fluxel/FluxelRequest.cs index 87895f9a..616897da 100644 --- a/fluXis.Shared/API/FluxelRequest.cs +++ b/fluXis.Game/Online/Fluxel/FluxelRequest.cs @@ -1,7 +1,10 @@ -using fluXis.Shared.API.Packets; +using System; +using fluXis.Game.Online.API.Packets; using Newtonsoft.Json; -namespace fluXis.Shared.API; +namespace fluXis.Game.Online.Fluxel; + +#nullable enable public class FluxelRequest where T : IPacket diff --git a/fluXis.Game/Online/Fluxel/IAPIClient.cs b/fluXis.Game/Online/Fluxel/IAPIClient.cs index 82637cdc..5127c345 100644 --- a/fluXis.Game/Online/Fluxel/IAPIClient.cs +++ b/fluXis.Game/Online/Fluxel/IAPIClient.cs @@ -2,9 +2,8 @@ using System.Threading.Tasks; using fluXis.Game.Online.Activity; using fluXis.Game.Online.API; -using fluXis.Shared.API; -using fluXis.Shared.API.Packets; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Packets; using osu.Framework.Bindables; namespace fluXis.Game.Online.Fluxel; diff --git a/fluXis.Shared/API/PacketIDs.cs b/fluXis.Game/Online/Fluxel/PacketIDs.cs similarity index 97% rename from fluXis.Shared/API/PacketIDs.cs rename to fluXis.Game/Online/Fluxel/PacketIDs.cs index c20f258a..6e7acd46 100644 --- a/fluXis.Shared/API/PacketIDs.cs +++ b/fluXis.Game/Online/Fluxel/PacketIDs.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.API; +namespace fluXis.Game.Online.Fluxel; public static class PacketIDs { diff --git a/fluXis.Game/Online/Multiplayer/MultiplayerClient.cs b/fluXis.Game/Online/Multiplayer/MultiplayerClient.cs index a94e223d..1eba913c 100644 --- a/fluXis.Game/Online/Multiplayer/MultiplayerClient.cs +++ b/fluXis.Game/Online/Multiplayer/MultiplayerClient.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Multi; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; using osu.Framework.Graphics; using osu.Framework.Logging; diff --git a/fluXis.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/fluXis.Game/Online/Multiplayer/OnlineMultiplayerClient.cs index 39723aa5..8eb2abdf 100644 --- a/fluXis.Game/Online/Multiplayer/OnlineMultiplayerClient.cs +++ b/fluXis.Game/Online/Multiplayer/OnlineMultiplayerClient.cs @@ -1,11 +1,10 @@ using System.Threading.Tasks; using fluXis.Game.Online.API; using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Packets.Multiplayer; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.API; -using fluXis.Shared.API.Packets.Multiplayer; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; +using fluXis.Game.Scoring; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Shared/Spectator/ISpectatorClient.cs b/fluXis.Game/Online/Spectator/ISpectatorClient.cs similarity index 78% rename from fluXis.Shared/Spectator/ISpectatorClient.cs rename to fluXis.Game/Online/Spectator/ISpectatorClient.cs index 8277fa83..e936ee3a 100644 --- a/fluXis.Shared/Spectator/ISpectatorClient.cs +++ b/fluXis.Game/Online/Spectator/ISpectatorClient.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Spectator; +using System.Threading.Tasks; + +namespace fluXis.Game.Online.Spectator; public interface ISpectatorClient { diff --git a/fluXis.Shared/Spectator/ISpectatorServer.cs b/fluXis.Game/Online/Spectator/ISpectatorServer.cs similarity index 75% rename from fluXis.Shared/Spectator/ISpectatorServer.cs rename to fluXis.Game/Online/Spectator/ISpectatorServer.cs index 683aafc4..baa24259 100644 --- a/fluXis.Shared/Spectator/ISpectatorServer.cs +++ b/fluXis.Game/Online/Spectator/ISpectatorServer.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Spectator; +using System.Threading.Tasks; + +namespace fluXis.Game.Online.Spectator; public interface ISpectatorServer { diff --git a/fluXis.Shared/Spectator/SpectatorState.cs b/fluXis.Game/Online/Spectator/SpectatorState.cs similarity index 75% rename from fluXis.Shared/Spectator/SpectatorState.cs rename to fluXis.Game/Online/Spectator/SpectatorState.cs index 9070bb3f..00fc22ef 100644 --- a/fluXis.Shared/Spectator/SpectatorState.cs +++ b/fluXis.Game/Online/Spectator/SpectatorState.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace fluXis.Shared.Spectator; +namespace fluXis.Game.Online.Spectator; [MessagePackObject] public class SpectatorState diff --git a/fluXis.Game/Online/UserCache.cs b/fluXis.Game/Online/UserCache.cs index 052bbb07..fc4f74f0 100644 --- a/fluXis.Game/Online/UserCache.cs +++ b/fluXis.Game/Online/UserCache.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Users; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Logging; diff --git a/fluXis.Game/Overlay/Achievements/AchievementOverlay.cs b/fluXis.Game/Overlay/Achievements/AchievementOverlay.cs index 64912cf1..ebea9d61 100644 --- a/fluXis.Game/Overlay/Achievements/AchievementOverlay.cs +++ b/fluXis.Game/Overlay/Achievements/AchievementOverlay.cs @@ -3,8 +3,8 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Panel; +using fluXis.Game.Online.API.Models.Other; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Other; using osu.Framework.Allocation; using osu.Framework.Audio.Sample; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/Chat/ChatChannelsPanel.cs b/fluXis.Game/Overlay/Chat/ChatChannelsPanel.cs index 7e3782da..2143440e 100644 --- a/fluXis.Game/Overlay/Chat/ChatChannelsPanel.cs +++ b/fluXis.Game/Overlay/Chat/ChatChannelsPanel.cs @@ -6,10 +6,10 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Panel; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Chat; using fluXis.Game.Online.API.Requests.Chat; using fluXis.Game.Online.Chat; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Chat; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Chat/ChatOverlay.cs b/fluXis.Game/Overlay/Chat/ChatOverlay.cs index c377c22a..34328adb 100644 --- a/fluXis.Game/Overlay/Chat/ChatOverlay.cs +++ b/fluXis.Game/Overlay/Chat/ChatOverlay.cs @@ -8,11 +8,11 @@ using fluXis.Game.Graphics.UserInterface.Panel; using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Input; +using fluXis.Game.Online.API.Models.Chat; +using fluXis.Game.Online.API.Packets.Chat; using fluXis.Game.Online.Chat; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Chat.UI; -using fluXis.Shared.API.Packets.Chat; -using fluXis.Shared.Components.Chat; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game/Overlay/Chat/DrawableChatMessage.cs b/fluXis.Game/Overlay/Chat/DrawableChatMessage.cs index 9fc8a229..cf74694c 100644 --- a/fluXis.Game/Overlay/Chat/DrawableChatMessage.cs +++ b/fluXis.Game/Overlay/Chat/DrawableChatMessage.cs @@ -8,13 +8,12 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Menus; using fluXis.Game.Graphics.UserInterface.Text; +using fluXis.Game.Online.API.Models.Chat; +using fluXis.Game.Online.API.Packets.Chat; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.User; using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.API.Packets.Chat; -using fluXis.Shared.Components.Chat; -using fluXis.Shared.Utils.Extensions; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/Club/ClubOverlay.cs b/fluXis.Game/Overlay/Club/ClubOverlay.cs index 2dab1783..06913870 100644 --- a/fluXis.Game/Overlay/Club/ClubOverlay.cs +++ b/fluXis.Game/Overlay/Club/ClubOverlay.cs @@ -4,12 +4,12 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Tabs; using fluXis.Game.Input; +using fluXis.Game.Online.API.Models.Clubs; using fluXis.Game.Online.API.Requests.Clubs; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Club.Sidebar; using fluXis.Game.Overlay.Club.Tabs; using fluXis.Game.Overlay.Club.UI; -using fluXis.Shared.Components.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarActivity.cs b/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarActivity.cs index b6a5a62b..f75958fb 100644 --- a/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarActivity.cs +++ b/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarActivity.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics.Sprites; -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarStats.cs b/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarStats.cs index 74497a34..d82b1c43 100644 --- a/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarStats.cs +++ b/fluXis.Game/Overlay/Club/Sidebar/ClubSidebarStats.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics.Sprites; -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Club/Tabs/ClubMembersTab.cs b/fluXis.Game/Overlay/Club/Tabs/ClubMembersTab.cs index 42445793..b6e364e7 100644 --- a/fluXis.Game/Overlay/Club/Tabs/ClubMembersTab.cs +++ b/fluXis.Game/Overlay/Club/Tabs/ClubMembersTab.cs @@ -1,8 +1,8 @@ using System.Linq; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Tabs; +using fluXis.Game.Online.API.Models.Clubs; using fluXis.Game.Overlay.Club.Tabs.Members; -using fluXis.Shared.Components.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Club/Tabs/Members/ClubMemberEntry.cs b/fluXis.Game/Overlay/Club/Tabs/Members/ClubMemberEntry.cs index d966f80f..66559fa4 100644 --- a/fluXis.Game/Overlay/Club/Tabs/Members/ClubMemberEntry.cs +++ b/fluXis.Game/Overlay/Club/Tabs/Members/ClubMemberEntry.cs @@ -1,10 +1,10 @@ using fluXis.Game.Graphics.Containers; using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Online.API.Models.Clubs; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Overlay.User; using fluXis.Game.Utils; -using fluXis.Shared.Components.Clubs; -using fluXis.Shared.Components.Users; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/Club/UI/ClubHeader.cs b/fluXis.Game/Overlay/Club/UI/ClubHeader.cs index 70d58064..e9299244 100644 --- a/fluXis.Game/Overlay/Club/UI/ClubHeader.cs +++ b/fluXis.Game/Overlay/Club/UI/ClubHeader.cs @@ -3,7 +3,7 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; -using fluXis.Shared.Components.Clubs; +using fluXis.Game.Online.API.Models.Clubs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/MapSet/Buttons/MapSetDownloadButton.cs b/fluXis.Game/Overlay/MapSet/Buttons/MapSetDownloadButton.cs index 9fd636e1..fb345ec7 100644 --- a/fluXis.Game/Overlay/MapSet/Buttons/MapSetDownloadButton.cs +++ b/fluXis.Game/Overlay/MapSet/Buttons/MapSetDownloadButton.cs @@ -3,8 +3,8 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Map; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.UserInterface; diff --git a/fluXis.Game/Overlay/MapSet/MapSetHeader.cs b/fluXis.Game/Overlay/MapSet/MapSetHeader.cs index fa0b319d..4db6d969 100644 --- a/fluXis.Game/Overlay/MapSet/MapSetHeader.cs +++ b/fluXis.Game/Overlay/MapSet/MapSetHeader.cs @@ -3,8 +3,8 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Map.Drawables.Online; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Utils; -using fluXis.Shared.Components.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/MapSet/MapSetOverlay.cs b/fluXis.Game/Overlay/MapSet/MapSetOverlay.cs index a0f5350c..646f73b9 100644 --- a/fluXis.Game/Overlay/MapSet/MapSetOverlay.cs +++ b/fluXis.Game/Overlay/MapSet/MapSetOverlay.cs @@ -5,13 +5,13 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Tabs; using fluXis.Game.Input; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.API.Requests.MapSets; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.MapSet.Buttons; using fluXis.Game.Overlay.MapSet.Sidebar; using fluXis.Game.Overlay.MapSet.Tabs; using fluXis.Game.Overlay.MapSet.UI.Difficulties; -using fluXis.Shared.Components.Maps; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarMapper.cs b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarMapper.cs index 39f1b240..0b9e6cc3 100644 --- a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarMapper.cs +++ b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarMapper.cs @@ -2,7 +2,7 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarStats.cs b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarStats.cs index 5710ed06..fef3e10f 100644 --- a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarStats.cs +++ b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarStats.cs @@ -2,8 +2,8 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Utils; -using fluXis.Shared.Components.Maps; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarVoting.cs b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarVoting.cs index 2cb391ef..e3ad7b10 100644 --- a/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarVoting.cs +++ b/fluXis.Game/Overlay/MapSet/Sidebar/MapSetSidebarVoting.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/MapSet/UI/Difficulties/DifficultyChip.cs b/fluXis.Game/Overlay/MapSet/UI/Difficulties/DifficultyChip.cs index f0cf11b7..367b3a3d 100644 --- a/fluXis.Game/Overlay/MapSet/UI/Difficulties/DifficultyChip.cs +++ b/fluXis.Game/Overlay/MapSet/UI/Difficulties/DifficultyChip.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Map.Drawables; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/Network/Tabs/DashboardAccountTab.cs b/fluXis.Game/Overlay/Network/Tabs/DashboardAccountTab.cs index 0a2a8545..29fcbf2f 100644 --- a/fluXis.Game/Overlay/Network/Tabs/DashboardAccountTab.cs +++ b/fluXis.Game/Overlay/Network/Tabs/DashboardAccountTab.cs @@ -9,14 +9,14 @@ using fluXis.Game.Graphics.UserInterface.Files; using fluXis.Game.Graphics.UserInterface.Panel; using fluXis.Game.Online; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Online.API.Payloads.Users; using fluXis.Game.Online.API.Requests.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Network.Tabs.Account; using fluXis.Game.Overlay.Notifications; using fluXis.Game.Overlay.Notifications.Tasks; using fluXis.Game.Utils; -using fluXis.Shared.API.Payloads.Users; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/Toolbar/ToolbarButton.cs b/fluXis.Game/Overlay/Toolbar/ToolbarButton.cs index f26dcc71..9fbe5539 100644 --- a/fluXis.Game/Overlay/Toolbar/ToolbarButton.cs +++ b/fluXis.Game/Overlay/Toolbar/ToolbarButton.cs @@ -5,10 +5,10 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Input; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Mouse; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/Toolbar/ToolbarProfile.cs b/fluXis.Game/Overlay/Toolbar/ToolbarProfile.cs index 4e7c664f..9b6e5e31 100644 --- a/fluXis.Game/Overlay/Toolbar/ToolbarProfile.cs +++ b/fluXis.Game/Overlay/Toolbar/ToolbarProfile.cs @@ -9,12 +9,12 @@ using fluXis.Game.Graphics.UserInterface.Panel; using fluXis.Game.Graphics.UserInterface.Panel.Types; using fluXis.Game.Localization; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Auth; using fluXis.Game.Overlay.User; using fluXis.Game.Screens; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/User/Header/HeaderFollowButton.cs b/fluXis.Game/Overlay/User/Header/HeaderFollowButton.cs index 9b5dbf5a..d6bd936b 100644 --- a/fluXis.Game/Overlay/User/Header/HeaderFollowButton.cs +++ b/fluXis.Game/Overlay/User/Header/HeaderFollowButton.cs @@ -3,10 +3,10 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/Header/HeaderGroupChip.cs b/fluXis.Game/Overlay/User/Header/HeaderGroupChip.cs index 3b5da378..74c7cef8 100644 --- a/fluXis.Game/Overlay/User/Header/HeaderGroupChip.cs +++ b/fluXis.Game/Overlay/User/Header/HeaderGroupChip.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; -using fluXis.Shared.Components.Groups; +using fluXis.Game.Online.API.Models.Groups; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/ProfileHeader.cs b/fluXis.Game/Overlay/User/ProfileHeader.cs index 43f1087c..08b27e36 100644 --- a/fluXis.Game/Overlay/User/ProfileHeader.cs +++ b/fluXis.Game/Overlay/User/ProfileHeader.cs @@ -6,12 +6,12 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Online.API.Models.Groups; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Drawables; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.User.Header; using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/Sections/Maps/ProfileMapsSubsection.cs b/fluXis.Game/Overlay/User/Sections/Maps/ProfileMapsSubsection.cs index 0cae4c40..9d7f45d2 100644 --- a/fluXis.Game/Overlay/User/Sections/Maps/ProfileMapsSubsection.cs +++ b/fluXis.Game/Overlay/User/Sections/Maps/ProfileMapsSubsection.cs @@ -2,7 +2,7 @@ using System.Linq; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Map.Drawables.Card; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/Sections/ProfileMapsSection.cs b/fluXis.Game/Overlay/User/Sections/ProfileMapsSection.cs index d7666781..1b7474b4 100644 --- a/fluXis.Game/Overlay/User/Sections/ProfileMapsSection.cs +++ b/fluXis.Game/Overlay/User/Sections/ProfileMapsSection.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Overlay.User.Sections.Maps; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/Sections/ProfileStats.cs b/fluXis.Game/Overlay/User/Sections/ProfileStats.cs index 0cbe7daa..54f1a4c5 100644 --- a/fluXis.Game/Overlay/User/Sections/ProfileStats.cs +++ b/fluXis.Game/Overlay/User/Sections/ProfileStats.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Overlay/User/Sidebar/ProfileFollowerList.cs b/fluXis.Game/Overlay/User/Sidebar/ProfileFollowerList.cs index 2e58d6fb..1fa4012c 100644 --- a/fluXis.Game/Overlay/User/Sidebar/ProfileFollowerList.cs +++ b/fluXis.Game/Overlay/User/Sidebar/ProfileFollowerList.cs @@ -5,9 +5,9 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Users; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Users; using Humanizer; using JetBrains.Annotations; using osu.Framework.Allocation; diff --git a/fluXis.Game/Overlay/User/Sidebar/ProfileSidebarClub.cs b/fluXis.Game/Overlay/User/Sidebar/ProfileSidebarClub.cs index 99148496..7f30da9c 100644 --- a/fluXis.Game/Overlay/User/Sidebar/ProfileSidebarClub.cs +++ b/fluXis.Game/Overlay/User/Sidebar/ProfileSidebarClub.cs @@ -2,8 +2,8 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Clubs; using fluXis.Game.Overlay.Club; -using fluXis.Shared.Components.Clubs; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Overlay/User/UserProfileOverlay.cs b/fluXis.Game/Overlay/User/UserProfileOverlay.cs index d9f67606..749ea0fa 100644 --- a/fluXis.Game/Overlay/User/UserProfileOverlay.cs +++ b/fluXis.Game/Overlay/User/UserProfileOverlay.cs @@ -4,12 +4,12 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Input; using fluXis.Game.Online; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Users; using fluXis.Game.Online.Drawables; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.User.Sections; using fluXis.Game.Overlay.User.Sidebar; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Replays/AutoGenerator.cs b/fluXis.Game/Replays/AutoGenerator.cs index bad7e49d..f287cabe 100644 --- a/fluXis.Game/Replays/AutoGenerator.cs +++ b/fluXis.Game/Replays/AutoGenerator.cs @@ -3,9 +3,8 @@ using fluXis.Game.Input; using fluXis.Game.Map; using fluXis.Game.Map.Structures; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Screens.Gameplay.Input; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Replays; namespace fluXis.Game.Replays; diff --git a/fluXis.Shared/Replays/Replay.cs b/fluXis.Game/Replays/Replay.cs similarity index 65% rename from fluXis.Shared/Replays/Replay.cs rename to fluXis.Game/Replays/Replay.cs index 7fcf9740..aa95fc84 100644 --- a/fluXis.Shared/Replays/Replay.cs +++ b/fluXis.Game/Replays/Replay.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Replays; +using System.Collections.Generic; + +namespace fluXis.Game.Replays; public class Replay { diff --git a/fluXis.Shared/Replays/ReplayFrame.cs b/fluXis.Game/Replays/ReplayFrame.cs similarity index 78% rename from fluXis.Shared/Replays/ReplayFrame.cs rename to fluXis.Game/Replays/ReplayFrame.cs index ba1e5b3a..d9562383 100644 --- a/fluXis.Shared/Replays/ReplayFrame.cs +++ b/fluXis.Game/Replays/ReplayFrame.cs @@ -1,4 +1,6 @@ -namespace fluXis.Shared.Replays; +using System.Collections.Generic; + +namespace fluXis.Game.Replays; public class ReplayFrame { diff --git a/fluXis.Game/Replays/ReplayRecorder.cs b/fluXis.Game/Replays/ReplayRecorder.cs index d4b2bdaa..997d75dc 100644 --- a/fluXis.Game/Replays/ReplayRecorder.cs +++ b/fluXis.Game/Replays/ReplayRecorder.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using fluXis.Game.Input; -using fluXis.Shared.Replays; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Shared/Scoring/Enums/Judgement.cs b/fluXis.Game/Scoring/Enums/Judgement.cs similarity index 71% rename from fluXis.Shared/Scoring/Enums/Judgement.cs rename to fluXis.Game/Scoring/Enums/Judgement.cs index 8127bb6b..0ca8c6f4 100644 --- a/fluXis.Shared/Scoring/Enums/Judgement.cs +++ b/fluXis.Game/Scoring/Enums/Judgement.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Scoring.Enums; +namespace fluXis.Game.Scoring.Enums; public enum Judgement { diff --git a/fluXis.Shared/Scoring/Enums/ScoreRank.cs b/fluXis.Game/Scoring/Enums/ScoreRank.cs similarity index 66% rename from fluXis.Shared/Scoring/Enums/ScoreRank.cs rename to fluXis.Game/Scoring/Enums/ScoreRank.cs index 0f2c45e6..bba476d3 100644 --- a/fluXis.Shared/Scoring/Enums/ScoreRank.cs +++ b/fluXis.Game/Scoring/Enums/ScoreRank.cs @@ -1,4 +1,4 @@ -namespace fluXis.Shared.Scoring.Enums; +namespace fluXis.Game.Scoring.Enums; public enum ScoreRank { diff --git a/fluXis.Game/Scoring/HitWindows.cs b/fluXis.Game/Scoring/HitWindows.cs index c2691acd..ad080485 100644 --- a/fluXis.Game/Scoring/HitWindows.cs +++ b/fluXis.Game/Scoring/HitWindows.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Utils; -using fluXis.Shared.Scoring.Enums; namespace fluXis.Game.Scoring; diff --git a/fluXis.Game/Scoring/Processing/Health/DrainHealthProcessor.cs b/fluXis.Game/Scoring/Processing/Health/DrainHealthProcessor.cs index 54972388..df6f3a22 100644 --- a/fluXis.Game/Scoring/Processing/Health/DrainHealthProcessor.cs +++ b/fluXis.Game/Scoring/Processing/Health/DrainHealthProcessor.cs @@ -1,5 +1,5 @@ using System; -using fluXis.Shared.Scoring.Structs; +using fluXis.Game.Scoring.Structs; namespace fluXis.Game.Scoring.Processing.Health; diff --git a/fluXis.Game/Scoring/Processing/Health/HealthProcessor.cs b/fluXis.Game/Scoring/Processing/Health/HealthProcessor.cs index 6e76fe08..5c6bce0d 100644 --- a/fluXis.Game/Scoring/Processing/Health/HealthProcessor.cs +++ b/fluXis.Game/Scoring/Processing/Health/HealthProcessor.cs @@ -1,8 +1,8 @@ using System; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Screens.Gameplay; using fluXis.Game.Screens.Gameplay.Audio; -using fluXis.Shared.Scoring.Enums; -using fluXis.Shared.Scoring.Structs; using osu.Framework.Bindables; using osu.Framework.Utils; diff --git a/fluXis.Game/Scoring/Processing/Health/RequirementHeathProcessor.cs b/fluXis.Game/Scoring/Processing/Health/RequirementHeathProcessor.cs index 6f2ed8b9..50dbeb41 100644 --- a/fluXis.Game/Scoring/Processing/Health/RequirementHeathProcessor.cs +++ b/fluXis.Game/Scoring/Processing/Health/RequirementHeathProcessor.cs @@ -1,5 +1,5 @@ using fluXis.Game.Map; -using fluXis.Shared.Scoring.Structs; +using fluXis.Game.Scoring.Structs; namespace fluXis.Game.Scoring.Processing.Health; diff --git a/fluXis.Game/Scoring/Processing/JudgementDependant.cs b/fluXis.Game/Scoring/Processing/JudgementDependant.cs index 60902cfc..3261eed3 100644 --- a/fluXis.Game/Scoring/Processing/JudgementDependant.cs +++ b/fluXis.Game/Scoring/Processing/JudgementDependant.cs @@ -1,5 +1,5 @@ using fluXis.Game.Map; -using fluXis.Shared.Scoring.Structs; +using fluXis.Game.Scoring.Structs; namespace fluXis.Game.Scoring.Processing; diff --git a/fluXis.Game/Scoring/Processing/JudgementProcessor.cs b/fluXis.Game/Scoring/Processing/JudgementProcessor.cs index 9842bb2f..3e4b8f17 100644 --- a/fluXis.Game/Scoring/Processing/JudgementProcessor.cs +++ b/fluXis.Game/Scoring/Processing/JudgementProcessor.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using fluXis.Game.Map; -using fluXis.Shared.Scoring.Structs; +using fluXis.Game.Scoring.Structs; namespace fluXis.Game.Scoring.Processing; diff --git a/fluXis.Game/Scoring/Processing/ScoreProcessor.cs b/fluXis.Game/Scoring/Processing/ScoreProcessor.cs index 457a536a..3a350b7d 100644 --- a/fluXis.Game/Scoring/Processing/ScoreProcessor.cs +++ b/fluXis.Game/Scoring/Processing/ScoreProcessor.cs @@ -4,10 +4,9 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Map; using fluXis.Game.Mods; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; -using fluXis.Shared.Scoring.Structs; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Scoring.Structs; using osu.Framework.Bindables; namespace fluXis.Game.Scoring.Processing; diff --git a/fluXis.Game/Scoring/ReleaseWindows.cs b/fluXis.Game/Scoring/ReleaseWindows.cs index 3e8c8990..372e1c0d 100644 --- a/fluXis.Game/Scoring/ReleaseWindows.cs +++ b/fluXis.Game/Scoring/ReleaseWindows.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; namespace fluXis.Game.Scoring; diff --git a/fluXis.Shared/Scoring/ScoreInfo.cs b/fluXis.Game/Scoring/ScoreInfo.cs similarity index 91% rename from fluXis.Shared/Scoring/ScoreInfo.cs rename to fluXis.Game/Scoring/ScoreInfo.cs index 19013da7..293b9eed 100644 --- a/fluXis.Shared/Scoring/ScoreInfo.cs +++ b/fluXis.Game/Scoring/ScoreInfo.cs @@ -1,9 +1,12 @@ -using fluXis.Shared.Replays; -using fluXis.Shared.Scoring.Enums; -using fluXis.Shared.Scoring.Structs; +using System.Collections.Generic; +using fluXis.Game.Replays; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Scoring.Structs; using Newtonsoft.Json; -namespace fluXis.Shared.Scoring; +namespace fluXis.Game.Scoring; + +#nullable enable public class ScoreInfo { diff --git a/fluXis.Game/Scoring/ScoreManager.cs b/fluXis.Game/Scoring/ScoreManager.cs index 83c7204e..0f64aa14 100644 --- a/fluXis.Game/Scoring/ScoreManager.cs +++ b/fluXis.Game/Scoring/ScoreManager.cs @@ -7,7 +7,6 @@ using fluXis.Game.Map; using fluXis.Game.Scoring.Processing; using fluXis.Game.Utils; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Shared/Scoring/Structs/HitResult.cs b/fluXis.Game/Scoring/Structs/HitResult.cs similarity index 83% rename from fluXis.Shared/Scoring/Structs/HitResult.cs rename to fluXis.Game/Scoring/Structs/HitResult.cs index 58effe2d..3679c9c4 100644 --- a/fluXis.Shared/Scoring/Structs/HitResult.cs +++ b/fluXis.Game/Scoring/Structs/HitResult.cs @@ -1,7 +1,7 @@ -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using Newtonsoft.Json; -namespace fluXis.Shared.Scoring.Structs; +namespace fluXis.Game.Scoring.Structs; public class HitResult { diff --git a/fluXis.Game/Screens/Browse/Info/BrowseInfo.cs b/fluXis.Game/Screens/Browse/Info/BrowseInfo.cs index 4c1edade..72d88bee 100644 --- a/fluXis.Game/Screens/Browse/Info/BrowseInfo.cs +++ b/fluXis.Game/Screens/Browse/Info/BrowseInfo.cs @@ -8,9 +8,9 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Map; using fluXis.Game.Map.Drawables.Online; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Overlay.User; using fluXis.Game.Utils; -using fluXis.Shared.Components.Maps; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Browse/Info/BrowseInfoMap.cs b/fluXis.Game/Screens/Browse/Info/BrowseInfoMap.cs index 6d6f3518..6f79c4e7 100644 --- a/fluXis.Game/Screens/Browse/Info/BrowseInfoMap.cs +++ b/fluXis.Game/Screens/Browse/Info/BrowseInfoMap.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Map.Drawables; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Course/CourseGameplayScreen.cs b/fluXis.Game/Screens/Course/CourseGameplayScreen.cs index d7c4bb0f..3c2674a8 100644 --- a/fluXis.Game/Screens/Course/CourseGameplayScreen.cs +++ b/fluXis.Game/Screens/Course/CourseGameplayScreen.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using fluXis.Game.Database.Maps; using fluXis.Game.Mods; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Gameplay; -using fluXis.Shared.Scoring; using osu.Framework.Screens; namespace fluXis.Game.Screens.Course; diff --git a/fluXis.Game/Screens/Course/CourseScreen.cs b/fluXis.Game/Screens/Course/CourseScreen.cs index 2f6ca08e..071f6938 100644 --- a/fluXis.Game/Screens/Course/CourseScreen.cs +++ b/fluXis.Game/Screens/Course/CourseScreen.cs @@ -2,9 +2,9 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Input; using fluXis.Game.Mods; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Gameplay; using fluXis.Game.Skinning; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Audio.Sample; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Edit/EditorMap.cs b/fluXis.Game/Screens/Edit/EditorMap.cs index 3c5947d5..a2d698c1 100644 --- a/fluXis.Game/Screens/Edit/EditorMap.cs +++ b/fluXis.Game/Screens/Edit/EditorMap.cs @@ -12,7 +12,6 @@ using fluXis.Game.Map.Structures.Events; using fluXis.Game.Storyboards; using fluXis.Game.Utils; -using fluXis.Shared.Utils; using Newtonsoft.Json; using osu.Framework.Graphics; using SixLabors.ImageSharp; diff --git a/fluXis.Game/Screens/Edit/Tabs/Charting/ChartingContainer.cs b/fluXis.Game/Screens/Edit/Tabs/Charting/ChartingContainer.cs index ae5a5963..b0cd2ce1 100644 --- a/fluXis.Game/Screens/Edit/Tabs/Charting/ChartingContainer.cs +++ b/fluXis.Game/Screens/Edit/Tabs/Charting/ChartingContainer.cs @@ -17,7 +17,7 @@ using fluXis.Game.Screens.Edit.Tabs.Shared.Points; using fluXis.Game.Screens.Edit.Tabs.Shared.Toolbox; using fluXis.Game.Screens.Gameplay.Audio.Hitsounds; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Edit/Tabs/Design/Playfield/EditorDesignPlayfieldManager.cs b/fluXis.Game/Screens/Edit/Tabs/Design/Playfield/EditorDesignPlayfieldManager.cs index 6766ca9e..f0426192 100644 --- a/fluXis.Game/Screens/Edit/Tabs/Design/Playfield/EditorDesignPlayfieldManager.cs +++ b/fluXis.Game/Screens/Edit/Tabs/Design/Playfield/EditorDesignPlayfieldManager.cs @@ -1,7 +1,7 @@ using System.Linq; using fluXis.Game.Map.Structures.Events; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Screens.Gameplay.Ruleset; -using fluXis.Shared.Components.Maps; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Edit/Tabs/Shared/Points/Settings/PointSettingsTextBox.cs b/fluXis.Game/Screens/Edit/Tabs/Shared/Points/Settings/PointSettingsTextBox.cs index 4ba2e01f..ce0d09e9 100644 --- a/fluXis.Game/Screens/Edit/Tabs/Shared/Points/Settings/PointSettingsTextBox.cs +++ b/fluXis.Game/Screens/Edit/Tabs/Shared/Points/Settings/PointSettingsTextBox.cs @@ -48,7 +48,7 @@ private void load() Origin = Anchor.CentreRight, Direction = FillDirection.Horizontal, Spacing = new Vector2(5), - Children = new Drawable[] + Children = new[] { TextBox = new FluXisTextBox { diff --git a/fluXis.Game/Screens/Gameplay/GameplayScreen.cs b/fluXis.Game/Screens/Gameplay/GameplayScreen.cs index 6bd8f3b5..94eaf087 100644 --- a/fluXis.Game/Screens/Gameplay/GameplayScreen.cs +++ b/fluXis.Game/Screens/Gameplay/GameplayScreen.cs @@ -28,6 +28,7 @@ using fluXis.Game.Mods; using fluXis.Game.Online; using fluXis.Game.Online.Activity; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Scores; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Notifications; @@ -48,11 +49,8 @@ using fluXis.Game.Skinning.Default; using fluXis.Game.Storyboards; using fluXis.Game.Storyboards.Drawables; +using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Replays; -using fluXis.Shared.Scoring; -using fluXis.Shared.Utils; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Components/AccuracyDisplay.cs b/fluXis.Game/Screens/Gameplay/HUD/Components/AccuracyDisplay.cs index 41b0953c..8f81d97a 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Components/AccuracyDisplay.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Components/AccuracyDisplay.cs @@ -1,6 +1,6 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Components/HitErrorBar.cs b/fluXis.Game/Screens/Gameplay/HUD/Components/HitErrorBar.cs index a4b09df4..0598e4d7 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Components/HitErrorBar.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Components/HitErrorBar.cs @@ -1,8 +1,8 @@ using System.Linq; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Skinning; -using fluXis.Shared.Scoring.Structs; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementCounter.cs b/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementCounter.cs index 0460a448..07e0fd01 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementCounter.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementCounter.cs @@ -3,9 +3,9 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing; using fluXis.Game.Skinning; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementDisplay.cs b/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementDisplay.cs index a443cfbb..f93c1591 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementDisplay.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Components/JudgementDisplay.cs @@ -2,11 +2,11 @@ using System.Linq; using fluXis.Game.Configuration; using fluXis.Game.Integration; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Skinning; using fluXis.Game.Skinning.Bases.Judgements; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Scoring.Enums; -using fluXis.Shared.Scoring.Structs; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/HUD/GameplayHUD.cs b/fluXis.Game/Screens/Gameplay/HUD/GameplayHUD.cs index 1cce00ca..2893494d 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/GameplayHUD.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/GameplayHUD.cs @@ -15,9 +15,6 @@ namespace fluXis.Game.Screens.Gameplay.HUD; public partial class GameplayHUD : Container { - [Resolved] - private GameplayScreen screen { get; set; } - [Resolved] private PlayfieldManager playfieldManager { get; set; } diff --git a/fluXis.Game/Screens/Gameplay/HUD/LayoutManager.cs b/fluXis.Game/Screens/Gameplay/HUD/LayoutManager.cs index 97a9de4a..8a1d37d2 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/LayoutManager.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/LayoutManager.cs @@ -4,7 +4,7 @@ using System.Linq; using fluXis.Game.Configuration; using fluXis.Game.Screens.Gameplay.HUD.Components; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using Newtonsoft.Json; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/GameplayLeaderboard.cs b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/GameplayLeaderboard.cs index 46fba0a4..11b971ab 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/GameplayLeaderboard.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/GameplayLeaderboard.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using fluXis.Game.Configuration; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Gameplay.Ruleset.Playfields; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/LeaderboardEntry.cs b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/LeaderboardEntry.cs index 4807f173..d81c85bc 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/LeaderboardEntry.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/LeaderboardEntry.cs @@ -4,9 +4,9 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Online; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/SelfLeaderboardEntry.cs b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/SelfLeaderboardEntry.cs index edae6144..c6350ce1 100644 --- a/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/SelfLeaderboardEntry.cs +++ b/fluXis.Game/Screens/Gameplay/HUD/Leaderboard/SelfLeaderboardEntry.cs @@ -1,5 +1,5 @@ -using fluXis.Game.Scoring.Processing; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring.Processing; namespace fluXis.Game.Screens.Gameplay.HUD.Leaderboard; diff --git a/fluXis.Game/Screens/Gameplay/Replays/ReplayGameplayScreen.cs b/fluXis.Game/Screens/Gameplay/Replays/ReplayGameplayScreen.cs index 3b2d8680..10ad1a45 100644 --- a/fluXis.Game/Screens/Gameplay/Replays/ReplayGameplayScreen.cs +++ b/fluXis.Game/Screens/Gameplay/Replays/ReplayGameplayScreen.cs @@ -6,10 +6,10 @@ using fluXis.Game.Input; using fluXis.Game.Mods; using fluXis.Game.Online.Activity; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Replays; using fluXis.Game.Screens.Gameplay.Input; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Replays; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/Replays/ReplayOverlay.cs b/fluXis.Game/Screens/Gameplay/Replays/ReplayOverlay.cs index 68eea3b6..5aae8ba1 100644 --- a/fluXis.Game/Screens/Gameplay/Replays/ReplayOverlay.cs +++ b/fluXis.Game/Screens/Gameplay/Replays/ReplayOverlay.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Online; +using fluXis.Game.Replays; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Replays; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/DrawableLongNote.cs b/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/DrawableLongNote.cs index cce12f80..20fa1e35 100644 --- a/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/DrawableLongNote.cs +++ b/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/DrawableLongNote.cs @@ -1,8 +1,8 @@ using fluXis.Game.Input; using fluXis.Game.Map.Structures; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens.Gameplay.Ruleset.HitObjects.Long; using fluXis.Game.Skinning.Bases.HitObjects; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/HitObjectColumn.cs b/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/HitObjectColumn.cs index 5fa7bb14..e10ee862 100644 --- a/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/HitObjectColumn.cs +++ b/fluXis.Game/Screens/Gameplay/Ruleset/HitObjects/HitObjectColumn.cs @@ -5,8 +5,8 @@ using fluXis.Game.Map.Structures; using fluXis.Game.Map.Structures.Bases; using fluXis.Game.Scoring.Processing; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Screens.Gameplay.Ruleset.Playfields; -using fluXis.Shared.Scoring.Structs; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/Playfield.cs b/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/Playfield.cs index d83ba26b..4a55c521 100644 --- a/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/Playfield.cs +++ b/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/Playfield.cs @@ -4,6 +4,7 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Map; using fluXis.Game.Map.Structures.Events; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Scoring.Processing; using fluXis.Game.Scoring.Processing.Health; using fluXis.Game.Screens.Gameplay.Ruleset.HitObjects; @@ -11,7 +12,6 @@ using fluXis.Game.Screens.Gameplay.Ruleset.TimingLines; using fluXis.Game.Skinning; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.IEnumerableExtensions; diff --git a/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/PlayfieldManager.cs b/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/PlayfieldManager.cs index 96e17689..43459a86 100644 --- a/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/PlayfieldManager.cs +++ b/fluXis.Game/Screens/Gameplay/Ruleset/Playfields/PlayfieldManager.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using fluXis.Game.Configuration.Experiments; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Allocation; using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Gameplay/UI/Menus/FailMenu.cs b/fluXis.Game/Screens/Gameplay/UI/Menus/FailMenu.cs index c6bc6342..1d853be5 100644 --- a/fluXis.Game/Screens/Gameplay/UI/Menus/FailMenu.cs +++ b/fluXis.Game/Screens/Gameplay/UI/Menus/FailMenu.cs @@ -42,7 +42,7 @@ private void load(SkinManager skins, FluXisConfig config) RelativeSizeAxes = Axes.Both; Alpha = 0; - InternalChildren = new Drawable[] + InternalChildren = new[] { dim = new Box { diff --git a/fluXis.Game/Screens/Menu/MenuScreen.cs b/fluXis.Game/Screens/Menu/MenuScreen.cs index ff013418..f4f8783e 100644 --- a/fluXis.Game/Screens/Menu/MenuScreen.cs +++ b/fluXis.Game/Screens/Menu/MenuScreen.cs @@ -10,6 +10,7 @@ using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Localization; using fluXis.Game.Map; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Auth; using fluXis.Game.Overlay.Network; @@ -28,7 +29,6 @@ using fluXis.Game.Screens.Select; using fluXis.Game.UI; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Menu/MenuSplashes.cs b/fluXis.Game/Screens/Menu/MenuSplashes.cs index 71e1071b..39ce2b7b 100644 --- a/fluXis.Game/Screens/Menu/MenuSplashes.cs +++ b/fluXis.Game/Screens/Menu/MenuSplashes.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.IO.Network; using osu.Framework.Logging; using osu.Framework.Platform; diff --git a/fluXis.Game/Screens/Menu/UI/Updates/MenuUpdates.cs b/fluXis.Game/Screens/Menu/UI/Updates/MenuUpdates.cs index d2cf1d65..f90a0af9 100644 --- a/fluXis.Game/Screens/Menu/UI/Updates/MenuUpdates.cs +++ b/fluXis.Game/Screens/Menu/UI/Updates/MenuUpdates.cs @@ -1,7 +1,7 @@ using fluXis.Game.Graphics; +using fluXis.Game.Online.API.Models.Other; using fluXis.Game.Online.API.Requests; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Other; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/Gameplay/MultiGameplayScreen.cs b/fluXis.Game/Screens/Multiplayer/Gameplay/MultiGameplayScreen.cs index 1fc2bbc3..d8c1d6fb 100644 --- a/fluXis.Game/Screens/Multiplayer/Gameplay/MultiGameplayScreen.cs +++ b/fluXis.Game/Screens/Multiplayer/Gameplay/MultiGameplayScreen.cs @@ -5,10 +5,10 @@ using fluXis.Game.Mods; using fluXis.Game.Online.Activity; using fluXis.Game.Online.Multiplayer; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Structs; using fluXis.Game.Screens.Gameplay; using fluXis.Game.Screens.Gameplay.Ruleset.Playfields; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Structs; using osu.Framework.Allocation; using osu.Framework.Screens; diff --git a/fluXis.Game/Screens/Multiplayer/Gameplay/MultiResults.cs b/fluXis.Game/Screens/Multiplayer/Gameplay/MultiResults.cs index 3adc8c7a..c85757ed 100644 --- a/fluXis.Game/Screens/Multiplayer/Gameplay/MultiResults.cs +++ b/fluXis.Game/Screens/Multiplayer/Gameplay/MultiResults.cs @@ -6,8 +6,8 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Input; using fluXis.Game.Localization; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Multiplayer.Gameplay.Results; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScore.cs b/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScore.cs index 7ce41f57..4de4e9c0 100644 --- a/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScore.cs +++ b/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScore.cs @@ -1,10 +1,10 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Skinning; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScores.cs b/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScores.cs index b95fa446..75abc4d8 100644 --- a/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScores.cs +++ b/fluXis.Game/Screens/Multiplayer/Gameplay/Results/MultiResultsScores.cs @@ -2,7 +2,7 @@ using System.Linq; using fluXis.Game.Graphics.Containers; using fluXis.Game.Online; -using fluXis.Shared.Scoring; +using fluXis.Game.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs index a71e6bd0..a1e2ee55 100644 --- a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs +++ b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/MultiLobby.cs @@ -12,16 +12,15 @@ using fluXis.Game.Map; using fluXis.Game.Mods; using fluXis.Game.Online.Activity; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.API.Models.Multi; +using fluXis.Game.Online.API.Packets.Multiplayer; using fluXis.Game.Online.Fluxel; using fluXis.Game.Online.Multiplayer; using fluXis.Game.Overlay.Notifications; using fluXis.Game.Screens.Gameplay; using fluXis.Game.Screens.Multiplayer.Gameplay; using fluXis.Game.Screens.Multiplayer.SubScreens.Open.Lobby.UI; -using fluXis.Shared.API.Packets.Multiplayer; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Components.Multi; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntry.cs b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntry.cs index 02af27e3..0905169d 100644 --- a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntry.cs +++ b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntry.cs @@ -1,7 +1,6 @@ using fluXis.Game.Graphics.Containers; using fluXis.Game.Graphics.UserInterface; using fluXis.Game.Online.API.Models.Multi; -using fluXis.Shared.Components.Multi; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntryContent.cs b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntryContent.cs index e9d9a6ff..c273730a 100644 --- a/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntryContent.cs +++ b/fluXis.Game/Screens/Multiplayer/SubScreens/Open/Lobby/UI/PlayerList/PlayerListEntryContent.cs @@ -5,7 +5,6 @@ using fluXis.Game.Online; using fluXis.Game.Online.API.Models.Multi; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Multi; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Ranking/UI/LeaderboardUser.cs b/fluXis.Game/Screens/Ranking/UI/LeaderboardUser.cs index b0419797..7a6de5fc 100644 --- a/fluXis.Game/Screens/Ranking/UI/LeaderboardUser.cs +++ b/fluXis.Game/Screens/Ranking/UI/LeaderboardUser.cs @@ -3,10 +3,10 @@ using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Drawables; using fluXis.Game.Overlay.User; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; using osu.Framework.Allocation; using osu.Framework.Extensions; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Result/Center/ResultsCenter.cs b/fluXis.Game/Screens/Result/Center/ResultsCenter.cs index 288f8733..ba5e1425 100644 --- a/fluXis.Game/Screens/Result/Center/ResultsCenter.cs +++ b/fluXis.Game/Screens/Result/Center/ResultsCenter.cs @@ -1,7 +1,7 @@ using System.Linq; using fluXis.Game.Mods.Drawables; +using fluXis.Game.Scoring; using fluXis.Game.Utils; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Result/Center/ResultsCenterScore.cs b/fluXis.Game/Screens/Result/Center/ResultsCenterScore.cs index e2fc3db5..553bdc55 100644 --- a/fluXis.Game/Screens/Result/Center/ResultsCenterScore.cs +++ b/fluXis.Game/Screens/Result/Center/ResultsCenterScore.cs @@ -1,5 +1,5 @@ using fluXis.Game.Graphics.UserInterface.Text; -using fluXis.Shared.Scoring; +using fluXis.Game.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Result/Center/ResultsCenterStats.cs b/fluXis.Game/Screens/Result/Center/ResultsCenterStats.cs index b2b450dc..c5b093b1 100644 --- a/fluXis.Game/Screens/Result/Center/ResultsCenterStats.cs +++ b/fluXis.Game/Screens/Result/Center/ResultsCenterStats.cs @@ -2,8 +2,8 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface.Text; +using fluXis.Game.Scoring; using fluXis.Game.Utils; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Result/Header/ResultsPlayer.cs b/fluXis.Game/Screens/Result/Header/ResultsPlayer.cs index 7a42f67c..013ad542 100644 --- a/fluXis.Game/Screens/Result/Header/ResultsPlayer.cs +++ b/fluXis.Game/Screens/Result/Header/ResultsPlayer.cs @@ -2,10 +2,10 @@ using fluXis.Game.Graphics.Containers; using fluXis.Game.Graphics.Drawables; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Drawables; +using fluXis.Game.Scoring; using fluXis.Game.Utils; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Screens/Result/Results.cs b/fluXis.Game/Screens/Result/Results.cs index 590674e1..87c2fdbb 100644 --- a/fluXis.Game/Screens/Result/Results.cs +++ b/fluXis.Game/Screens/Result/Results.cs @@ -1,8 +1,8 @@ using System; using fluXis.Game.Database.Maps; using fluXis.Game.Input; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Input.Bindings; diff --git a/fluXis.Game/Screens/Result/ResultsContent.cs b/fluXis.Game/Screens/Result/ResultsContent.cs index 5aef19e9..b00e676a 100644 --- a/fluXis.Game/Screens/Result/ResultsContent.cs +++ b/fluXis.Game/Screens/Result/ResultsContent.cs @@ -1,9 +1,9 @@ using System; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Result.Center; using fluXis.Game.Screens.Result.Sides; using fluXis.Game.Screens.Result.Sides.Types; using fluXis.Game.Skinning; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -13,12 +13,6 @@ namespace fluXis.Game.Screens.Result; public partial class ResultsContent : CompositeDrawable { - [Resolved] - private Results screen { get; set; } - - [Resolved] - private SkinManager skins { get; set; } - [Resolved] private ScoreInfo score { get; set; } diff --git a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideJudgements.cs b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideJudgements.cs index 3c8ec304..fbff2552 100644 --- a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideJudgements.cs +++ b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideJudgements.cs @@ -1,7 +1,7 @@ -using fluXis.Game.Screens.Result.Sides.Presets; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Screens.Result.Sides.Presets; using fluXis.Game.Skinning; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Localisation; diff --git a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideMore.cs b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideMore.cs index bbcdf6de..f4d7769d 100644 --- a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideMore.cs +++ b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideMore.cs @@ -1,8 +1,8 @@ using System.Linq; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens.Result.Sides.Presets; using fluXis.Game.Utils; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Localisation; diff --git a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideRankings.cs b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideRankings.cs index 61367990..3ca97f7d 100644 --- a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideRankings.cs +++ b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideRankings.cs @@ -2,8 +2,8 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Text; using fluXis.Game.Online.API.Requests.Scores; +using fluXis.Game.Online.API.Responses.Scores; using fluXis.Game.Utils; -using fluXis.Shared.API.Responses.Scores; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Localisation; diff --git a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideVoting.cs b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideVoting.cs index cdd05601..cdcb795a 100644 --- a/fluXis.Game/Screens/Result/Sides/Types/ResultsSideVoting.cs +++ b/fluXis.Game/Screens/Result/Sides/Types/ResultsSideVoting.cs @@ -4,9 +4,9 @@ using fluXis.Game.Graphics.Sprites; using fluXis.Game.Graphics.UserInterface; using fluXis.Game.Graphics.UserInterface.Color; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Online.API.Requests.Maps.Votes; using fluXis.Game.Online.Fluxel; -using fluXis.Shared.Components.Maps; using Humanizer; using osu.Framework.Allocation; using osu.Framework.Graphics; @@ -28,7 +28,7 @@ public partial class ResultsSideVoting : ResultsSideContainer [Resolved] private IAPIClient api { get; set; } - private bool sendingRequest = false; + private bool sendingRequest; private int currentVote; private Container container; diff --git a/fluXis.Game/Screens/Result/SoloResults.cs b/fluXis.Game/Screens/Result/SoloResults.cs index bb7aa3fb..a7ffbf50 100644 --- a/fluXis.Game/Screens/Result/SoloResults.cs +++ b/fluXis.Game/Screens/Result/SoloResults.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using fluXis.Game.Database.Maps; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.API.Requests.Scores; +using fluXis.Game.Scoring; using fluXis.Game.Screens.Result.Sides.Types; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/fluXis.Game/Screens/Select/Info/Scores/ScoreList.cs b/fluXis.Game/Screens/Select/Info/Scores/ScoreList.cs index 5b69dc1b..a28d402a 100644 --- a/fluXis.Game/Screens/Select/Info/Scores/ScoreList.cs +++ b/fluXis.Game/Screens/Select/Info/Scores/ScoreList.cs @@ -19,16 +19,15 @@ using fluXis.Game.Map; using fluXis.Game.Online; using fluXis.Game.Online.API; +using fluXis.Game.Online.API.Models.Scores; using fluXis.Game.Online.API.Requests.Maps; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Notifications; using fluXis.Game.Overlay.Notifications.Tasks; +using fluXis.Game.Replays; using fluXis.Game.Scoring; +using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Replays; -using fluXis.Shared.Scoring; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Select/Info/Scores/ScoreListEntry.cs b/fluXis.Game/Screens/Select/Info/Scores/ScoreListEntry.cs index 25163fda..a6692b24 100644 --- a/fluXis.Game/Screens/Select/Info/Scores/ScoreListEntry.cs +++ b/fluXis.Game/Screens/Select/Info/Scores/ScoreListEntry.cs @@ -9,16 +9,16 @@ using fluXis.Game.Graphics.UserInterface.Color; using fluXis.Game.Graphics.UserInterface.Menus; using fluXis.Game.Mods; +using fluXis.Game.Online.API.Models.Users; using fluXis.Game.Online.Drawables; using fluXis.Game.Online.Fluxel; using fluXis.Game.Overlay.Mouse; using fluXis.Game.Overlay.User; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Skinning; using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; using Humanizer; using JetBrains.Annotations; using osu.Framework.Allocation; diff --git a/fluXis.Game/Screens/Select/List/Drawables/MapSet/DrawableMapSetDifficulty.cs b/fluXis.Game/Screens/Select/List/Drawables/MapSet/DrawableMapSetDifficulty.cs index 639a0c53..7e4a54fd 100644 --- a/fluXis.Game/Screens/Select/List/Drawables/MapSet/DrawableMapSetDifficulty.cs +++ b/fluXis.Game/Screens/Select/List/Drawables/MapSet/DrawableMapSetDifficulty.cs @@ -10,9 +10,9 @@ using fluXis.Game.Localization; using fluXis.Game.Map; using fluXis.Game.Map.Drawables; +using fluXis.Game.Online.API.Models.Maps; using fluXis.Game.Scoring; -using fluXis.Shared.Components.Maps; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Select/SelectScreen.cs b/fluXis.Game/Screens/Select/SelectScreen.cs index d70844bb..102b040d 100644 --- a/fluXis.Game/Screens/Select/SelectScreen.cs +++ b/fluXis.Game/Screens/Select/SelectScreen.cs @@ -39,7 +39,6 @@ using fluXis.Game.UI; using fluXis.Game.Utils; using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Replays; using osu.Framework.Allocation; using osu.Framework.Audio.Sample; using osu.Framework.Bindables; diff --git a/fluXis.Game/Screens/Skinning/SkinEditor.cs b/fluXis.Game/Screens/Skinning/SkinEditor.cs index e026ed1e..12be53ba 100644 --- a/fluXis.Game/Screens/Skinning/SkinEditor.cs +++ b/fluXis.Game/Screens/Skinning/SkinEditor.cs @@ -7,13 +7,13 @@ using fluXis.Game.Graphics.UserInterface.Menus; using fluXis.Game.Input; using fluXis.Game.Overlay.Notifications; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Screens.Edit.Input; using fluXis.Game.Screens.Edit.MenuBar; using fluXis.Game.Screens.Edit.Tabs.Shared.Points.Settings; using fluXis.Game.Skinning; using fluXis.Game.Skinning.Json; using fluXis.Game.Utils; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; diff --git a/fluXis.Game/Skinning/Bases/Judgements/AbstractJudgementText.cs b/fluXis.Game/Skinning/Bases/Judgements/AbstractJudgementText.cs index dd92f380..c3b44187 100644 --- a/fluXis.Game/Skinning/Bases/Judgements/AbstractJudgementText.cs +++ b/fluXis.Game/Skinning/Bases/Judgements/AbstractJudgementText.cs @@ -1,4 +1,4 @@ -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using osu.Framework.Graphics.Containers; namespace fluXis.Game.Skinning.Bases.Judgements; diff --git a/fluXis.Game/Skinning/Custom/CustomSkin.cs b/fluXis.Game/Skinning/Custom/CustomSkin.cs index a09365df..6c8c7234 100644 --- a/fluXis.Game/Skinning/Custom/CustomSkin.cs +++ b/fluXis.Game/Skinning/Custom/CustomSkin.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using fluXis.Game.Audio; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; using fluXis.Game.Screens.Course; using fluXis.Game.Skinning.Bases.Judgements; @@ -9,7 +10,6 @@ using fluXis.Game.Skinning.Custom.Judgements; using fluXis.Game.Skinning.Custom.Lighting; using fluXis.Game.Skinning.Json; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Audio.Sample; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -285,7 +285,7 @@ public AbstractJudgementText GetJudgement(Judgement judgement, bool isLate) public Drawable GetFailFlash() { - var path = SkinJson.GetOverrideOrDefault($"Gameplay/fail-flash") + ".png"; + var path = SkinJson.GetOverrideOrDefault("Gameplay/fail-flash") + ".png"; return storage.Exists(path) ? new SkinnableSprite(textures.Get(path)) { FillMode = FillMode.Fill } : null; } diff --git a/fluXis.Game/Skinning/Custom/Judgements/SkinnableJudgementText.cs b/fluXis.Game/Skinning/Custom/Judgements/SkinnableJudgementText.cs index 2d49a5d4..d467ec29 100644 --- a/fluXis.Game/Skinning/Custom/Judgements/SkinnableJudgementText.cs +++ b/fluXis.Game/Skinning/Custom/Judgements/SkinnableJudgementText.cs @@ -1,6 +1,6 @@ using System; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Skinning.Bases.Judgements; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/fluXis.Game/Skinning/Default/DefaultSkin.cs b/fluXis.Game/Skinning/Default/DefaultSkin.cs index 94c1c6c2..d423b4dc 100644 --- a/fluXis.Game/Skinning/Default/DefaultSkin.cs +++ b/fluXis.Game/Skinning/Default/DefaultSkin.cs @@ -1,5 +1,6 @@ using System; using fluXis.Game.Audio; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; using fluXis.Game.Screens.Course; using fluXis.Game.Skinning.Bases.Judgements; @@ -11,7 +12,6 @@ using fluXis.Game.Skinning.Default.Results; using fluXis.Game.Skinning.Default.Stage; using fluXis.Game.Skinning.Json; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Audio.Sample; using osu.Framework.Graphics; using osu.Framework.Graphics.Colour; diff --git a/fluXis.Game/Skinning/Default/Judgements/DefaultJudgementText.cs b/fluXis.Game/Skinning/Default/Judgements/DefaultJudgementText.cs index 41959d07..abfb0adf 100644 --- a/fluXis.Game/Skinning/Default/Judgements/DefaultJudgementText.cs +++ b/fluXis.Game/Skinning/Default/Judgements/DefaultJudgementText.cs @@ -1,7 +1,7 @@ using System; using fluXis.Game.Graphics.Sprites; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Skinning.Bases.Judgements; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Allocation; using osu.Framework.Graphics; using osuTK; diff --git a/fluXis.Game/Skinning/Default/Results/DefaultResultsRank.cs b/fluXis.Game/Skinning/Default/Results/DefaultResultsRank.cs index 6529b80d..1bd35a61 100644 --- a/fluXis.Game/Skinning/Default/Results/DefaultResultsRank.cs +++ b/fluXis.Game/Skinning/Default/Results/DefaultResultsRank.cs @@ -1,5 +1,5 @@ -using fluXis.Game.Utils.Extensions; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; +using fluXis.Game.Utils.Extensions; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Skinning/ISkin.cs b/fluXis.Game/Skinning/ISkin.cs index 36003c5e..5791aa95 100644 --- a/fluXis.Game/Skinning/ISkin.cs +++ b/fluXis.Game/Skinning/ISkin.cs @@ -1,10 +1,10 @@ using System; using fluXis.Game.Audio; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; using fluXis.Game.Screens.Course; using fluXis.Game.Skinning.Bases.Judgements; using fluXis.Game.Skinning.Json; -using fluXis.Shared.Scoring.Enums; using osu.Framework.Audio.Sample; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/fluXis.Game/Skinning/Json/SkinJson.cs b/fluXis.Game/Skinning/Json/SkinJson.cs index 745e2285..0ecd0e11 100644 --- a/fluXis.Game/Skinning/Json/SkinJson.cs +++ b/fluXis.Game/Skinning/Json/SkinJson.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Scoring.Enums; using JetBrains.Annotations; using Newtonsoft.Json; using osu.Framework.Graphics; diff --git a/fluXis.Game/Skinning/SkinManager.cs b/fluXis.Game/Skinning/SkinManager.cs index ac17d557..a9ecfc01 100644 --- a/fluXis.Game/Skinning/SkinManager.cs +++ b/fluXis.Game/Skinning/SkinManager.cs @@ -6,6 +6,7 @@ using fluXis.Game.Audio; using fluXis.Game.Configuration; using fluXis.Game.Overlay.Notifications; +using fluXis.Game.Scoring.Enums; using fluXis.Game.Scoring.Processing.Health; using fluXis.Game.Screens.Course; using fluXis.Game.Skinning.Bases.Judgements; @@ -13,8 +14,6 @@ using fluXis.Game.Skinning.Default; using fluXis.Game.Skinning.Json; using fluXis.Game.Utils; -using fluXis.Shared.Scoring.Enums; -using fluXis.Shared.Utils; using Newtonsoft.Json; using osu.Framework.Allocation; using osu.Framework.Audio; diff --git a/fluXis.Game/UI/Tips/LoadingTips.cs b/fluXis.Game/UI/Tips/LoadingTips.cs index 9f93910f..9621db29 100644 --- a/fluXis.Game/UI/Tips/LoadingTips.cs +++ b/fluXis.Game/UI/Tips/LoadingTips.cs @@ -1,5 +1,5 @@ using System.IO; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.IO.Network; using osu.Framework.Logging; using osu.Framework.Platform; diff --git a/fluXis.Game/Updater/UpdateChecker.cs b/fluXis.Game/Updater/UpdateChecker.cs index 4e645b5b..88b68fe6 100644 --- a/fluXis.Game/Updater/UpdateChecker.cs +++ b/fluXis.Game/Updater/UpdateChecker.cs @@ -4,7 +4,7 @@ using System.Net.Http; using fluXis.Game.Configuration; using fluXis.Game.Updater.GitHub; -using fluXis.Shared.Utils; +using fluXis.Game.Utils; using osu.Framework.IO.Network; using osu.Framework.Logging; diff --git a/fluXis.Game/Utils/CountryUtils.cs b/fluXis.Game/Utils/CountryUtils.cs index 5c94a36d..5357d632 100644 --- a/fluXis.Game/Utils/CountryUtils.cs +++ b/fluXis.Game/Utils/CountryUtils.cs @@ -1,6 +1,6 @@ using System; using fluXis.Game.Online; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; namespace fluXis.Game.Utils; diff --git a/fluXis.Game/Utils/Extensions/APIExtensions.cs b/fluXis.Game/Utils/Extensions/APIExtensions.cs index cb9ee0a6..00af9a3e 100644 --- a/fluXis.Game/Utils/Extensions/APIExtensions.cs +++ b/fluXis.Game/Utils/Extensions/APIExtensions.cs @@ -1,11 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using fluXis.Shared.Components.Clubs; -using fluXis.Shared.Components.Other; -using fluXis.Shared.Components.Scores; -using fluXis.Shared.Scoring; -using fluXis.Shared.Scoring.Enums; +using fluXis.Game.Online.API.Models.Clubs; +using fluXis.Game.Online.API.Models.Other; +using fluXis.Game.Online.API.Models.Scores; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Scoring; +using fluXis.Game.Scoring.Enums; using osu.Framework.Graphics; using osu.Framework.Graphics.Colour; using osu.Framework.Logging; @@ -35,6 +36,25 @@ public static ColourInfo CreateColorInfo(this List colors) } } + public static bool IsDeveloper(this APIUser user) + => user.Groups.Any(g => g.ID == "dev"); + + public static bool IsPurifier(this APIUser user) + { + if (user.IsDeveloper()) + return true; + + return user.Groups.Any(g => g.ID == "purifier"); + } + + public static bool CanModerate(this APIUser user) + { + if (user.IsDeveloper()) + return true; + + return user.Groups.Any(g => g.ID == "moderators"); + } + public static ScoreInfo ToScoreInfo(this APIScore score) => new() { Accuracy = score.Accuracy, diff --git a/fluXis.Game/Utils/Extensions/ReplayExtensions.cs b/fluXis.Game/Utils/Extensions/ReplayExtensions.cs index 1f7ceb3f..a3ec53d2 100644 --- a/fluXis.Game/Utils/Extensions/ReplayExtensions.cs +++ b/fluXis.Game/Utils/Extensions/ReplayExtensions.cs @@ -1,6 +1,6 @@ using fluXis.Game.Online; -using fluXis.Shared.Components.Users; -using fluXis.Shared.Replays; +using fluXis.Game.Online.API.Models.Users; +using fluXis.Game.Replays; namespace fluXis.Game.Utils.Extensions; diff --git a/fluXis.Shared/Utils/JsonUtils.cs b/fluXis.Game/Utils/JsonUtils.cs similarity index 93% rename from fluXis.Shared/Utils/JsonUtils.cs rename to fluXis.Game/Utils/JsonUtils.cs index 50b3e722..9669787d 100644 --- a/fluXis.Shared/Utils/JsonUtils.cs +++ b/fluXis.Game/Utils/JsonUtils.cs @@ -1,8 +1,12 @@ -using System.Diagnostics.CodeAnalysis; +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace fluXis.Shared.Utils; +namespace fluXis.Game.Utils; + +#nullable enable public static class JsonUtils { diff --git a/fluXis.Game/Utils/MapUtils.cs b/fluXis.Game/Utils/MapUtils.cs index de00ca6a..cc67f615 100644 --- a/fluXis.Game/Utils/MapUtils.cs +++ b/fluXis.Game/Utils/MapUtils.cs @@ -8,7 +8,7 @@ using fluXis.Game.Localization.Categories; using fluXis.Game.Map; using fluXis.Game.Map.Structures; -using fluXis.Shared.Components.Maps; +using fluXis.Game.Online.API.Models.Maps; using osu.Framework.Localisation; namespace fluXis.Game.Utils; diff --git a/fluXis.Shared/Utils/RandomizeUtils.cs b/fluXis.Game/Utils/RandomizeUtils.cs similarity index 95% rename from fluXis.Shared/Utils/RandomizeUtils.cs rename to fluXis.Game/Utils/RandomizeUtils.cs index 13681445..d57eaec4 100644 --- a/fluXis.Shared/Utils/RandomizeUtils.cs +++ b/fluXis.Game/Utils/RandomizeUtils.cs @@ -1,4 +1,7 @@ -namespace fluXis.Shared.Utils; +using System; +using System.Linq; + +namespace fluXis.Game.Utils; public static class RandomizeUtils { diff --git a/fluXis.Game/Utils/Sentry/SentryClient.cs b/fluXis.Game/Utils/Sentry/SentryClient.cs index 483b468b..4f778824 100644 --- a/fluXis.Game/Utils/Sentry/SentryClient.cs +++ b/fluXis.Game/Utils/Sentry/SentryClient.cs @@ -4,7 +4,7 @@ using System.Net.WebSockets; using fluXis.Game.Configuration; using fluXis.Game.Online.API; -using fluXis.Shared.Components.Users; +using fluXis.Game.Online.API.Models.Users; using osu.Framework; using osu.Framework.Allocation; using osu.Framework.Bindables; diff --git a/fluXis.Game/fluXis.Game.csproj b/fluXis.Game/fluXis.Game.csproj index 3e6a4531..f6f255dc 100644 --- a/fluXis.Game/fluXis.Game.csproj +++ b/fluXis.Game/fluXis.Game.csproj @@ -10,7 +10,6 @@ - @@ -22,6 +21,7 @@ + diff --git a/fluXis.Import.Quaver/QuaverImport.cs b/fluXis.Import.Quaver/QuaverImport.cs index 40e84a23..0e12ef38 100644 --- a/fluXis.Import.Quaver/QuaverImport.cs +++ b/fluXis.Import.Quaver/QuaverImport.cs @@ -6,8 +6,8 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Import; using fluXis.Game.Overlay.Notifications; +using fluXis.Game.Utils; using fluXis.Import.Quaver.Map; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu.Framework.Bindables; using osu.Framework.Logging; diff --git a/fluXis.Import.Stepmania/StepmaniaImport.cs b/fluXis.Import.Stepmania/StepmaniaImport.cs index b261cfb6..0ff418e8 100644 --- a/fluXis.Import.Stepmania/StepmaniaImport.cs +++ b/fluXis.Import.Stepmania/StepmaniaImport.cs @@ -5,9 +5,9 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Import; using fluXis.Game.Overlay.Notifications; +using fluXis.Game.Utils; using fluXis.Import.Stepmania.AutoImport; using fluXis.Import.Stepmania.Map; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu.Framework.Bindables; using osu.Framework.Logging; diff --git a/fluXis.Import.osu/OsuImport.cs b/fluXis.Import.osu/OsuImport.cs index 20e4c1b4..93b785d3 100644 --- a/fluXis.Import.osu/OsuImport.cs +++ b/fluXis.Import.osu/OsuImport.cs @@ -6,11 +6,11 @@ using fluXis.Game.Database.Maps; using fluXis.Game.Import; using fluXis.Game.Overlay.Notifications; +using fluXis.Game.Utils; using fluXis.Import.osu.Map; using fluXis.Import.osu.Map.Enums; using fluXis.Import.osu.AutoImport; using fluXis.Import.osu.Storyboards; -using fluXis.Shared.Utils; using JetBrains.Annotations; using osu_database_reader.BinaryFiles; using osu.Framework.Bindables; diff --git a/fluXis.Shared/API/Packets/Account/LogoutPacket.cs b/fluXis.Shared/API/Packets/Account/LogoutPacket.cs deleted file mode 100644 index abcd23b0..00000000 --- a/fluXis.Shared/API/Packets/Account/LogoutPacket.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace fluXis.Shared.API.Packets.Account; - -public class LogoutPacket : IPacket -{ - public string ID => PacketIDs.LOGOUT; -} diff --git a/fluXis.Shared/Utils/Extensions/UserExtensions.cs b/fluXis.Shared/Utils/Extensions/UserExtensions.cs deleted file mode 100644 index 884f109f..00000000 --- a/fluXis.Shared/Utils/Extensions/UserExtensions.cs +++ /dev/null @@ -1,25 +0,0 @@ -using fluXis.Shared.Components.Users; - -namespace fluXis.Shared.Utils.Extensions; - -public static class UserExtensions -{ - public static bool IsDeveloper(this APIUser user) - => user.Groups.Any(g => g.ID == "dev"); - - public static bool IsPurifier(this APIUser user) - { - if (user.IsDeveloper()) - return true; - - return user.Groups.Any(g => g.ID == "purifier"); - } - - public static bool CanModerate(this APIUser user) - { - if (user.IsDeveloper()) - return true; - - return user.Groups.Any(g => g.ID == "moderators"); - } -} diff --git a/fluXis.Shared/fluXis.Shared.csproj b/fluXis.Shared/fluXis.Shared.csproj deleted file mode 100644 index 65939df8..00000000 --- a/fluXis.Shared/fluXis.Shared.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net8.0 - enable - enable - 11 - - - - - - - - diff --git a/fluXis.sln b/fluXis.sln index a30e59f4..ab59cc52 100644 --- a/fluXis.sln +++ b/fluXis.sln @@ -26,8 +26,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fluXis.Import.osu", "fluXis EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fluXis.Import.Stepmania", "fluXis.Import.Stepmania\fluXis.Import.Stepmania.csproj", "{D6386B1C-DD5D-4EC6-AF18-79A20B64D468}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fluXis.Shared", "fluXis.Shared\fluXis.Shared.csproj", "{21AA3FE0-6B08-4DC6-BA96-154E54DA1D36}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU