remove fluXis.Shared project and merge into fluXis.Game

InventiveRhythm · Dec 4, 2024 · 588fef9 · 588fef9
1 parent 56e31ea
commit 588fef9
Show file tree

Hide file tree

Showing 283 changed files with 571 additions and 510 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;