-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fl-opacity
- Loading branch information
Showing
368 changed files
with
8,700 additions
and
3,491 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
osu.Desktop/LegacyIpc/LegacyIpcDifficultyCalculationRequest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| namespace osu.Desktop.LegacyIpc | ||
| { | ||
| /// <summary> | ||
| /// A difficulty calculation request from the legacy client. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Synchronise any changes with osu!stable. | ||
| /// </remarks> | ||
| public class LegacyIpcDifficultyCalculationRequest | ||
| { | ||
| public string BeatmapFile { get; set; } | ||
| public int RulesetId { get; set; } | ||
| public int Mods { get; set; } | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
osu.Desktop/LegacyIpc/LegacyIpcDifficultyCalculationResponse.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| namespace osu.Desktop.LegacyIpc | ||
| { | ||
| /// <summary> | ||
| /// A difficulty calculation response returned to the legacy client. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Synchronise any changes with osu!stable. | ||
| /// </remarks> | ||
| public class LegacyIpcDifficultyCalculationResponse | ||
| { | ||
| public double StarRating { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using osu.Framework.Platform; | ||
| using Newtonsoft.Json.Linq; | ||
|
|
||
| namespace osu.Desktop.LegacyIpc | ||
| { | ||
| /// <summary> | ||
| /// An <see cref="IpcMessage"/> that can be used to communicate to and from legacy clients. | ||
| /// <para> | ||
| /// In order to deserialise types at either end, types must be serialised as their <see cref="System.Type.AssemblyQualifiedName"/>, | ||
| /// however this cannot be done since osu!stable and osu!lazer live in two different assemblies. | ||
| /// <br /> | ||
| /// To get around this, this class exists which serialises a payload (<see cref="LegacyIpcMessage.Data"/>) as an <see cref="System.Object"/> type, | ||
| /// which can be deserialised at either end because it is part of the core library (mscorlib / System.Private.CorLib). | ||
| /// The payload contains the data to be sent over the IPC channel. | ||
| /// <br /> | ||
| /// At either end, Json.NET deserialises the payload into a <see cref="JObject"/> which is manually converted back into the expected <see cref="LegacyIpcMessage.Data"/> type, | ||
| /// which then further contains another <see cref="JObject"/> representing the data sent over the IPC channel whose type can likewise be lazily matched through | ||
| /// <see cref="LegacyIpcMessage.Data.MessageType"/>. | ||
| /// </para> | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Synchronise any changes with osu-stable. | ||
| /// </remarks> | ||
| public class LegacyIpcMessage : IpcMessage | ||
| { | ||
| public LegacyIpcMessage() | ||
| { | ||
| // Types/assemblies are not inter-compatible, so always serialise/deserialise into objects. | ||
| base.Type = typeof(object).FullName; | ||
| } | ||
|
|
||
| public new string Type => base.Type; // Hide setter. | ||
|
|
||
| public new object Value | ||
| { | ||
| get => base.Value; | ||
| set => base.Value = new Data | ||
| { | ||
| MessageType = value.GetType().Name, | ||
| MessageData = value | ||
| }; | ||
| } | ||
|
|
||
| public class Data | ||
| { | ||
| public string MessageType { get; set; } | ||
| public object MessageData { get; set; } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using System; | ||
| using System.Linq; | ||
| using Newtonsoft.Json.Linq; | ||
| using osu.Framework.Logging; | ||
| using osu.Framework.Platform; | ||
| using osu.Game.Beatmaps; | ||
| using osu.Game.Beatmaps.Legacy; | ||
| using osu.Game.Rulesets; | ||
| using osu.Game.Rulesets.Catch; | ||
| using osu.Game.Rulesets.Mania; | ||
| using osu.Game.Rulesets.Mods; | ||
| using osu.Game.Rulesets.Osu; | ||
| using osu.Game.Rulesets.Taiko; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace osu.Desktop.LegacyIpc | ||
| { | ||
| /// <summary> | ||
| /// Provides IPC to legacy osu! clients. | ||
| /// </summary> | ||
| public class LegacyTcpIpcProvider : TcpIpcProvider | ||
| { | ||
| private static readonly Logger logger = Logger.GetLogger("legacy-ipc"); | ||
|
|
||
| public LegacyTcpIpcProvider() | ||
| : base(45357) | ||
| { | ||
| MessageReceived += msg => | ||
| { | ||
| try | ||
| { | ||
| logger.Add("Processing legacy IPC message..."); | ||
| logger.Add($" {msg.Value}", LogLevel.Debug); | ||
|
|
||
| // See explanation in LegacyIpcMessage for why this is done this way. | ||
| var legacyData = ((JObject)msg.Value).ToObject<LegacyIpcMessage.Data>(); | ||
| object value = parseObject((JObject)legacyData!.MessageData, legacyData.MessageType); | ||
|
|
||
| return new LegacyIpcMessage | ||
| { | ||
| Value = onLegacyIpcMessageReceived(value) | ||
| }; | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| logger.Add($"Processing IPC message failed: {msg.Value}", exception: ex); | ||
| return null; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private object parseObject(JObject value, string type) | ||
| { | ||
| switch (type) | ||
| { | ||
| case nameof(LegacyIpcDifficultyCalculationRequest): | ||
| return value.ToObject<LegacyIpcDifficultyCalculationRequest>() | ||
| ?? throw new InvalidOperationException($"Failed to parse request {value}"); | ||
|
|
||
| case nameof(LegacyIpcDifficultyCalculationResponse): | ||
| return value.ToObject<LegacyIpcDifficultyCalculationResponse>() | ||
| ?? throw new InvalidOperationException($"Failed to parse request {value}"); | ||
|
|
||
| default: | ||
| throw new ArgumentException($"Unsupported object type {type}"); | ||
| } | ||
| } | ||
|
|
||
| private object onLegacyIpcMessageReceived(object message) | ||
| { | ||
| switch (message) | ||
| { | ||
| case LegacyIpcDifficultyCalculationRequest req: | ||
| try | ||
| { | ||
| var ruleset = getLegacyRulesetFromID(req.RulesetId); | ||
|
|
||
| Mod[] mods = ruleset.ConvertFromLegacyMods((LegacyMods)req.Mods).ToArray(); | ||
| WorkingBeatmap beatmap = new FlatFileWorkingBeatmap(req.BeatmapFile, _ => ruleset); | ||
|
|
||
| return new LegacyIpcDifficultyCalculationResponse | ||
| { | ||
| StarRating = ruleset.CreateDifficultyCalculator(beatmap).Calculate(mods).StarRating | ||
| }; | ||
| } | ||
| catch | ||
| { | ||
| return new LegacyIpcDifficultyCalculationResponse(); | ||
| } | ||
|
|
||
| default: | ||
| throw new ArgumentException($"Unsupported message type {message}"); | ||
| } | ||
| } | ||
|
|
||
| private static Ruleset getLegacyRulesetFromID(int rulesetId) | ||
| { | ||
| switch (rulesetId) | ||
| { | ||
| case 0: | ||
| return new OsuRuleset(); | ||
|
|
||
| case 1: | ||
| return new TaikoRuleset(); | ||
|
|
||
| case 2: | ||
| return new CatchRuleset(); | ||
|
|
||
| case 3: | ||
| return new ManiaRuleset(); | ||
|
|
||
| default: | ||
| throw new ArgumentException("Invalid ruleset id"); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.