Skip to content

Commit 982553c

Browse files
authored
Merge pull request #90 from Gml-Launcher/develop
Update to 2025.1.1
2 parents 5637788 + 22a9461 commit 982553c

File tree

95 files changed

+59
-3003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+59
-3003
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "src/CmlLib.Core.Installer.Forge"]
22
path = src/CmlLib.Core.Installer.Forge
3-
url = https://github.com/GamerVII-NET/CmlLib.Core.Installer.Forge
3+
url = https://github.com/Gml-Launcher/CmlLib.Core.Installer.Forge.git
44
[submodule "src/CmlLib.ExtendedCore"]
55
path = src/CmlLib.ExtendedCore
6-
url = https://github.com/GamerVII-NET/CmlLib.Core.git
6+
url = https://github.com/Gml-Launcher/CmlLib.Core.git
77
[submodule "src/Pingo"]
88
path = src/Pingo
99
url = https://github.com/GamerVII-NET/Pingo.git
@@ -12,4 +12,4 @@
1212
url = https://github.com/Gml-Launcher/CmlLib.Core.Installer.NeoForge
1313
[submodule "src/Modrinth.Api"]
1414
path = src/Modrinth.Api
15-
url = git@github.com:Gml-Launcher/Modrinth.Api.git
15+
url = https://github.com/Gml-Launcher/Modrinth.Api.git

src/Gml.Core.Interfaces/IGmlManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public interface IGmlManager
1717
IProfileServersProcedures Servers { get; }
1818
INotificationProcedures Notifications { get; }
1919
IModsProcedures Mods { get; }
20+
IStorageService Storage { get; }
2021
void RestoreSettings<T>() where T : IVersionFile;
2122
}
2223
}

src/Gml.Core.Interfaces/Integrations/INewsListenerProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public interface INewsListenerProvider
99
{
1010
IReadOnlyCollection<INewsProvider> Providers { get; }
1111
Task<ICollection<INewsData>> GetNews(int count = 20);
12-
Task RefreshAsync(long nubmer = 0);
12+
Task RefreshAsync(long count = 0);
1313
Task AddListener(INewsProvider newsProvider);
1414
Task RemoveListener(INewsProvider newsProvider);
1515
Task Restore();

src/Gml.Core.Interfaces/Launcher/IGameProfile.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ public interface IGameProfile : IDisposable
6464
/// <summary>
6565
/// Base64 encoded icon for the profile.
6666
/// </summary>
67-
string IconBase64 { get; set; }
67+
string? IconBase64 { get; set; }
6868

6969
/// <summary>
7070
/// Key for the background image.
7171
/// </summary>
72-
string BackgroundImageKey { get; set; }
72+
string? BackgroundImageKey { get; set; }
7373

7474
/// <summary>
7575
/// Description of the game profile.
@@ -136,8 +136,18 @@ public interface IGameProfile : IDisposable
136136
/// Indicates whether the profile can be modified.
137137
/// </summary>
138138
bool CanEdit { get; }
139+
140+
/// <summary>
141+
/// Represents the execution priority of the game profile, which determines its order or importance
142+
/// when being processed or invoked within the application.
143+
/// </summary>
139144
int Priority { get; set; }
140145

146+
/// <summary>
147+
/// Represents the recommended amount of RAM, in megabytes, for optimal performance within the profile configuration.
148+
/// </summary>
149+
int RecommendedRam { get; set; }
150+
141151
/// <summary>
142152
/// Validates the game profile.
143153
/// </summary>

src/Gml.Core.Interfaces/Procedures/IProfileProcedures.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public interface IProfileProcedures
4848
Task UpdateProfile(IGameProfile profile, string newProfileName, string displayName, Stream? icon,
4949
Stream? backgroundImage,
5050
string updateDtoDescription, bool isEnabled,
51-
string jvmArguments, string gameArguments, int priority);
51+
string jvmArguments, string gameArguments, int priority, int recommendedRam);
5252
Task<string[]> InstallAuthLib(IGameProfile profile);
5353
Task<IGameProfileInfo?> GetCacheProfile(IGameProfile baseProfile);
5454
Task SetCacheProfile(IGameProfileInfo profile);

src/Gml.Core.Interfaces/Procedures/IUserProcedures.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Task<IUser> GetAuthData(
1616
string protocol,
1717
IPAddress? address,
1818
string? customUuid,
19-
string? hwid);
19+
string? hwid,
20+
bool isSlim);
2021
Task<IUser?> GetUserByUuid(string uuid);
2122
Task<IUser?> GetUserByName(string userName);
2223
Task<IUser?> GetUserBySkinGuid(string guid);

src/Gml.Core/Core/Services/Storage/IStorageService.cs renamed to src/Gml.Core.Interfaces/Storage/IStorageService.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
using System.Linq.Expressions;
44
using System.Text.Json;
55
using System.Threading.Tasks;
6-
using Gml.Models.Storage;
76
using GmlCore.Interfaces.Launcher;
8-
using GmlCore.Interfaces.News;
97
using GmlCore.Interfaces.Sentry;
10-
using GmlCore.Interfaces.User;
118

12-
namespace Gml.Core.Services.Storage
9+
namespace GmlCore.Interfaces.Storage
1310
{
1411
/// <summary>
1512
/// Represents a service for managing local storage.

src/Gml.Core.Interfaces/User/IUser.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public interface IUser
1414
string? TextureCloakGuid { get; set; }
1515
public string ServerUuid { get; set; }
1616
bool IsBanned { get; set; }
17+
bool IsSlim { get; set; }
1718
public DateTime ServerExpiredDate { get; set; }
1819
public DateTime ExpiredDate { get; set; }
1920
List<ISession> Sessions { get; set; }

src/Gml.Core.Sample.Console/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ private static async Task AuthenticateUser(IGmlManager gmlManager)
468468
"1.0",
469469
IPAddress.Parse("127.0.0.1"),
470470
null,
471-
null);
471+
null,
472+
false);
472473

473474
if (user != null)
474475
{

0 commit comments

Comments
 (0)