Merge branch 'dev'

Author: marchc1

CloneDash.Common/HumanLanguage.cs

@@ -27,7 +27,8 @@ public HumanLanguage(ReadOnlySpan<char> code){
 
 	public static readonly HumanLanguage Any = new("iv");
 
-	public static readonly HumanLanguage Chinese = new("zh");
+	public static readonly HumanLanguage SimplifiedChinese = new("zh-CN");
+	public static readonly HumanLanguage TraditionalChinese = new("zh-TW");
 	public static readonly HumanLanguage English = new("en");
 	public static readonly HumanLanguage Japanese = new("ja");
 	public static readonly HumanLanguage Korean = new("ko");

CloneDash.CustomAlbumsCompatibility/CustomAlbums/CustomCharts.cs

@@ -65,15 +65,18 @@ public class MD1_CustomChartsSong : MD1_Song
 			public MDMCChart WebChart;
 			public bool UsesWebChart = false;
 
-			public MD1_CustomChartsSong(in MDMCChart webChart) : base(null!) {
+			public MD1_CustomChartsSong(in MDMCChart webChart) : base() {
 				WebChart = webChart;
 				UsesWebChart = true;
 
-				Name = webChart.TitleRomanized ?? webChart.Title;
-				Author = webChart.Artist;
+				AddBaseJSONInfo(new() {
+					Name = webChart.Title,
+					Author = webChart.Artist,
+				});
+				AddLocalizedJSONInfo(Common.HumanLanguage.English, webChart.TitleRomanized, null);
 			}
 
-			public MD1_CustomChartsSong(string filepath) : base(null!) {
+			public MD1_CustomChartsSong(string filepath) : base() {
 				Filepath = filepath;
 				string? ext = Path.GetExtension(filepath);
 				switch (ext) {
@@ -89,9 +92,12 @@ public MD1_CustomChartsSong(string filepath) : base(null!) {
 
 					default: throw new NotImplementedException("Custom Charts: Bad filetype for CustomChartsSong constructor!");
 				}
+
+				if (Archive != null)
+					ProduceInfo(); // Produce info now so AddBaseJSONInfo gets what it needs
 			}
 
-			public MD1_CustomChartsSong(string pathID, string path) : base(null!) {
+			public MD1_CustomChartsSong(string pathID, string path) : base() {
 				string? ext = Path.GetExtension(path);
 				switch (ext) {
 					case ".mdm":
@@ -104,6 +110,9 @@ public MD1_CustomChartsSong(string pathID, string path) : base(null!) {
 						break;
 					default: throw new NotImplementedException("Custom Charts: Bad filetype for CustomChartsSong constructor!");
 				}
+
+				if (Archive != null)
+					ProduceInfo(); // Produce info now so AddBaseJSONInfo gets what it needs
 			}
 
 			~MD1_CustomChartsSong() {
@@ -192,8 +201,11 @@ protected override void ProduceCover(ChartCoverAvailableToMainThreadFn callback)
 					if (info == null)
 						return null;
 
-					Name = info.name;
-					Author = info.author;
+					AddBaseJSONInfo(new() {
+						Name = info.name,
+						Author = info.author
+					});
+
 					MD1_SongInfo ret = new() {
 						BPM = info.bpm,
 						LevelDesigners = [info.levelDesigner1, info.levelDesigner2, info.levelDesigner3, info.levelDesigner4],
@@ -288,7 +300,7 @@ private MD1_CustomAlbumsChart loadFromStream(Stream map, int difficulty = 0) {
 				Interlude.Spin(submessage: "Reading Custom Albums chart...");
 				if (bms == null) throw new Exception("BMS parsing exception");
 				var stageInfo = BmsLoader.TransmuteData(bms);
-				stageInfo.mapName = Name;
+				stageInfo.mapName = FetchMetadata().Name;
 				stageInfo.difficulty = difficulty;
 				stageInfo.scene = bms.Info["GENRE"]?.GetValue<string>() ?? string.Empty;
 				stageInfo.bpm = bms.Bpm;

CloneDash.MuseDash1Compatibility/Compatibility/MD1_Song.cs

@@ -11,6 +11,7 @@
 using Nucleus;
 using Nucleus.Audio;
 using Nucleus.Common.Audio;
+using Nucleus.Types;
 using OdinSerializer;
 using Raylib_cs;
 using System.Collections.Concurrent;
@@ -41,6 +42,24 @@ public class MuseDashSongInfoJSON
 	[JsonPropertyName("difficulty3")] public string Difficulty3 { get; set; } = "";
 	[JsonPropertyName("difficulty4")] public string Difficulty4 { get; set; } = "";
 	[JsonPropertyName("difficulty5")] public string Difficulty5 { get; set; } = "";
+
+	public void CloneInto(MuseDashSongInfoJSON into) {
+		into.UID = UID;
+		into.Name = Name;
+		into.Author = Author;
+		into.BPM = BPM;
+		into.Music = Music;
+		into.Demo = Demo;
+		into.Cover = Cover;
+		into.NoteJSON = NoteJSON;
+		into.Scene = Scene;
+		into.LevelDesigner = LevelDesigner;
+		into.Difficulty1 = Difficulty1;
+		into.Difficulty2 = Difficulty2;
+		into.Difficulty3 = Difficulty3;
+		into.Difficulty4 = Difficulty4;
+		into.Difficulty5 = Difficulty5;
+	}
 }
 
 public delegate void ChartCoverAvailableToMainThreadFn(MD1_SongCover? cover);
@@ -52,8 +71,6 @@ public class MD1_Song : ISong, IHasLowToHighDifficulties
 
 	public MD1_SongInfo? Info;
 
-	public string Name = "";
-	public string Author = "";
 
 	protected IAudioClip? AudioTrack;
 	protected IAudioClip? DemoTrack;
@@ -194,20 +211,25 @@ public List<MD1_SongChart> LoadSheets() {
 		return null;
 	}
 
+	public SongMetadata FetchMetadata() => FetchMetadata(HumanLanguage.GetCurrentLanguage()); 
 	public SongMetadata FetchMetadata(HumanLanguage desiredLanguage) {
-		GetInfo(); // This is annoying: it fixes an issue with custom albums, didnt feel like it would be a good idea to differentiate them though..
-		// TODO: language
-		return new() {
-			Name = Name,
-			Author = Author
-		};
+		if (__jsonInfoLanguages.TryGetValue(desiredLanguage, out MuseDashSongInfoJSON? languageInfo))
+			return new() {
+				Name = languageInfo.Name ?? __jsonInfo.Name,
+				Author = languageInfo.Author ?? __jsonInfo.Author
+			};
+		else
+			return new() {
+				Name = __jsonInfo.Name,
+				Author = __jsonInfo.Author
+			};
 	}
 
 	public IReadOnlyList<ISongChart> GetCharts() => LoadSheets();
 	public bool IsAsynchronouslyLoading() => DeferringDemoToAsyncHandler;
 	public void WaitForAsynchronousLoad(OnAsynchronousLoadingCompleteFn callback) => throw new NotImplementedException();
 
-	public IAudioClip? GetDemoAudio(){
+	public IAudioClip? GetDemoAudio() {
 		return GetDemoTrack();
 	}
 	public SongCoverInfo GetCoverTexture() {
@@ -230,11 +252,20 @@ public SongCoverInfo GetCoverTexture() {
 		});
 	}
 
-	private MuseDashSongInfoJSON __jsonInfo;
-	public MD1_Song(MuseDashSongInfoJSON info) {
-		__jsonInfo = info;
-		// Debug.Assert(info.Difficulty5 == "");
+	private readonly MuseDashSongInfoJSON __jsonInfo = new();
+	private readonly Dictionary<HumanLanguage, MuseDashSongInfoJSON> __jsonInfoLanguages = [];
+
+	public void AddBaseJSONInfo(MuseDashSongInfoJSON baseInfo) {
+		baseInfo.CloneInto(__jsonInfo);
+	}
+
+	public void AddLocalizedJSONInfo(HumanLanguage lang, string? name, string? author) {
+		__jsonInfoLanguages[lang] = new() {
+			Name = name!,
+			Author = author!
+		};
 	}
+
 	public static string? GetFixedFilename(string givenBase, string fileName, [NotNullWhen(true)] bool throwExp = true) {
 		return
 			MuseDash1Compatibility.StreamingFiles.FirstOrDefault(x => x.Contains(fileName.Replace("{name}", givenBase)))
@@ -248,7 +279,10 @@ public MD1_Song(MuseDashSongInfoJSON info) {
 
 	[JsonIgnore]
 	public string BaseName => GetInfo()!.Music.Substring(0, GetInfo()!.Music.Length - 6);
-	public override string ToString() => $"{Name} by {Author}";
+	public override string ToString() {
+		SongMetadata metadata = FetchMetadata();
+		return $"{metadata.Name} by {metadata.Author}";
+	}
 
 
 	public AssetsManager AssetsFile { get; private set; } = null;
@@ -269,7 +303,7 @@ private void LoadAssetFile() {
 				DemoFile = new();
 				DemoFile.LoadFiles(filepath);
 			}
-			else Logs.Warn($"CloneDash: MuseDashSong.LoadAssetFile could not generate a demo filepath for {Name}.");
+			else Logs.Warn($"CloneDash: MuseDashSong.LoadAssetFile could not generate a demo filepath for {__jsonInfo.Name}.");
 		}
 	}
 
@@ -334,7 +368,7 @@ protected virtual void ProduceCover(ChartCoverAvailableToMainThreadFn callback)
 		if (DashSheetOverrides.TryGetValue(mapID, out MD1_SongChart? sheet))
 			return sheet;
 
-		LoadAssetFile(); 
+		LoadAssetFile();
 		Interlude.Spin();
 
 		MD1_SongChart chart = new MD1_SongChart(this, mapID);
@@ -344,7 +378,7 @@ protected virtual void ProduceCover(ChartCoverAvailableToMainThreadFn callback)
 	/// <summary>
 	/// Called from charts only!!!
 	/// </summary>
-	public virtual MD1_GamemodeData? ProduceGamemodeData(MD1_SongChart chart, int mapID){
+	public virtual MD1_GamemodeData? ProduceGamemodeData(MD1_SongChart chart, int mapID) {
 		//MonoBehaviour map = (MonoBehaviour)AssetsFile.assetsFileList[0].Objects.First(x => x is MonoBehaviour mB && mB.m_Name.EndsWith($"_map{mapID}"));
 		MonoBehaviour? map = MuseDash1Compatibility.StreamingAssets.LoadAsset<MonoBehaviour>($"Assets/Static Resources/Data/Configs/StageInfos/{__jsonInfo.NoteJSON}{mapID}.asset").GetResult();
 		if (map == null)
@@ -373,9 +407,6 @@ protected virtual void ProduceCover(ChartCoverAvailableToMainThreadFn callback)
 	protected virtual MD1_SongInfo? ProduceInfo() {
 		List<string> SearchTags = [];
 
-		Name = __jsonInfo.Name;
-		Author = __jsonInfo.Author;
-
 		SearchTags.AddRange(__jsonInfo.Name.Split(' '));
 		MD1_SongInfo info = new MD1_SongInfo() {
 			BPM = __jsonInfo.BPM,
@@ -399,4 +430,11 @@ protected virtual void ProduceCover(ChartCoverAvailableToMainThreadFn callback)
 	bool IHasLowToHighDifficulties.GetDifficulties(Span<int> difficulties) {
 		return Difficulties.AsSpan().TryCopyTo(difficulties);
 	}
+
+	public IEnumerable<MuseDashSongInfoJSON> GetAvailableInfo() {
+		if (__jsonInfo != null)
+			yield return __jsonInfo;
+		foreach (var info in __jsonInfoLanguages)
+			yield return info.Value;
+	}
 }

CloneDash.MuseDash1Compatibility/Compatibility/MuseDash1Compatibility.cs

@@ -1,6 +1,7 @@
 // TODO: this file is WAY too bloated!!!
 
 using AssetStudio;
+using CloneDash.Common;
 using CloneDash.Common.Data;
 using CloneDash.Common.Gamemodes.MuseDash;
 using CloneDash.Common.Gamemodes.MuseDash.V1;
@@ -669,6 +670,10 @@ public static void BuildDashStructures() {
 					// var songsEN_raw = filesystem.ReadAllText("musedash", $"Assets/Static Resources/Data/Configs/english/{album.JsonName}_English.json");
 					var songs = Filesystem.ReadJSON<List<MuseDashSongInfoJSON>>("musedash", $"Assets/Static Resources/Data/Configs/others/{album.JsonName}.json");
 					var songsEN = Filesystem.ReadJSON<__musedashSong[]>("musedash", $"Assets/Static Resources/Data/Configs/english/{album.JsonName}_English.json");
+					var songsCN_S = Filesystem.ReadJSON<__musedashSong[]>("musedash", $"Assets/Static Resources/Data/Configs/chineses/{album.JsonName}_ChineseS.json");
+					var songsCN_T = Filesystem.ReadJSON<__musedashSong[]>("musedash", $"Assets/Static Resources/Data/Configs/chineset/{album.JsonName}_ChineseT.json");
+					var songsJP = Filesystem.ReadJSON<__musedashSong[]>("musedash", $"Assets/Static Resources/Data/Configs/japanese/{album.JsonName}_Japanese.json");
+					var songsKO = Filesystem.ReadJSON<__musedashSong[]>("musedash", $"Assets/Static Resources/Data/Configs/korean/{album.JsonName}_Korean.json");
 					// Debug.Assert(songs.Count == songsEN.Length);
 					// if (songs.Count != songsEN.Length) {
 					// 	Logs.Print($"inconsistency: {album.JsonName} songs length! songs ({songs.Count}) != songsEN ({songsEN.Length})");
@@ -679,17 +684,19 @@ public static void BuildDashStructures() {
 
 					for (int i = 0; i < songs.Count; i++) {
 						PatchSong(songs, i);
-						var song = new MD1_Song(songs[i]) {
-							Name = songsEN[i].name,
-							Author = songsEN[i].author,
-							Album = album
-						};
+						var song = new MD1_Song();
+						song.AddBaseJSONInfo(songs[i]);
+						song.AddLocalizedJSONInfo(HumanLanguage.English, songsEN[i].name, songsEN[i].author);
+						song.AddLocalizedJSONInfo(HumanLanguage.SimplifiedChinese, songsCN_S[i].name, songsCN_S[i].author);
+						song.AddLocalizedJSONInfo(HumanLanguage.TraditionalChinese, songsCN_T[i].name, songsCN_T[i].author);
+						song.AddLocalizedJSONInfo(HumanLanguage.Japanese, songsJP[i].name, songsJP[i].author);
+						song.AddLocalizedJSONInfo(HumanLanguage.Korean, songsKO[i].name, songsKO[i].author);
 						workSongs.Add(song);
 					}
 				});
 
 			Songs = [.. workSongs];
-			Songs.Sort((x, y) => x.Name.CompareTo(y.Name));
+			Songs.Sort((x, y) => x.FetchMetadata(HumanLanguage.Any).Name.CompareTo(y.FetchMetadata(HumanLanguage.Any).Name));
 #if I_AM_LAZY_I_WANT_TO_KNOW_THIS_NUMBER
 			Logs.Info($"total songs: {Songs.Count}, charts: {Songs.Sum(x => {
 				if (x.GetInfo() == null)
@@ -705,11 +712,13 @@ public static void BuildDashStructures() {
 #endif
 			HashSet<char> codepoints = [];
 			foreach (var song in Songs) {
-				string name = song.Name, author = song.Author;
-				for (int i = 0, c = name.Length; i < c; i++)
-					codepoints.Add(name[i]);
-				for (int i = 0, c = author.Length; i < c; i++)
-					codepoints.Add(author[i]);
+				foreach (MuseDashSongInfoJSON info in song.GetAvailableInfo()) {
+					string name = info.Name, author = info.Author;
+					for (int i = 0, c = name.Length; i < c; i++)
+						codepoints.Add(name[i]);
+					for (int i = 0, c = author.Length; i < c; i++)
+						codepoints.Add(author[i]);
+				}
 			}
 			CodepointsInUse = codepoints.ToArray();
 		}

CloneDash.MuseDash1Compatibility/Game/MuseDash1Game.cs

@@ -129,8 +129,8 @@ private static void clonedash_openmdlevel_execute(ConCommand cmd, in TokenizedCo
 		if (song == null) {
 			Logs.Warn("Can't find that song.");
 			Logs.Print("Here are some similar names:");
-			foreach (var s in MuseDash1Compatibility.FindSimilarSongs(md_level))
-				Logs.Print($"    {s.Name} ({s.BaseName})");
+			foreach (var s in MuseDash1Compatibility.FindSimilarSongs(md_level)) 
+				Logs.Print($"    {s.FetchMetadata().Name} ({s.BaseName})");
 			return;
 		}
 
@@ -142,7 +142,7 @@ private static void clonedash_openmdlevel_autocomplete(ConCommandBase cmd, strin
 		if (curArgPos == 1) {
 			var songs = MuseDash1Compatibility.FindSongsStartingWith(args.Arg(1));
 			returns = [.. songs.Select(s => s.BaseName)];
-			returnHelp = [.. songs.Select(s => $" '{s.Name}'")];
+			returnHelp = [.. songs.Select(s => $" '{s.FetchMetadata().Name}'")];
 		}
 		else if (curArgPos == 2) {
 			var values = Enum.GetValues<MuseDashDifficulty>();
@@ -624,7 +624,7 @@ public override void Initialize(params object[] _) {
 		using (StaticSequentialProfiler.StartStackFrame("CD_GameLevel.RichPresenceUpdate")) {
 			RichPresenceSystem.SetPresence(new() {
 				Details = "In Game",
-				State = $"Muse Dash 1 - '{gameParameters.Chart?.Song?.Name ?? "<null>"}'"
+				State = $"Muse Dash 1 - '{gameParameters.Chart?.Song?.FetchMetadata().Name ?? "<null>"}'"
 			});
 		}
 		using (StaticSequentialProfiler.StartStackFrame("CD_GameLevel.PrepareShaders")) {
@@ -1005,8 +1005,8 @@ public override void Think(FrameState frameState) {
 						settings.OnButtonClick += delegate (Button self, ButtonCode clickedButton) {
 							var panel = new Panel(RootPanel);
 							panel.SetPaintBackgroundEnabled(false);
-							panel.							Anchor = Anchor.Center;
-							panel.							Origin = Anchor.Center;
+							panel.Anchor = Anchor.Center;
+							panel.Origin = Anchor.Center;
 							panel.DynamicallySized = true;
 							panel.Size = new(0.9f);
 

CloneDash.MuseDash1Compatibility/Scenes/CloneDashMD1SceneUI.cs

@@ -104,9 +104,9 @@ public override void Paint(float width, float height) {
 		var fs = 24;
 		var y = 0;
 
-		Match boldRegexMatch = Util.BoldRegex.Match(chart.Song.Name);
+		Match boldRegexMatch = Util.BoldRegex.Match(chart.Song.FetchMetadata().Name);
 		Graphics2D.DrawText(16, 16 + y,
-							boldRegexMatch.Success ? boldRegexMatch.Groups[1].Value : chart.Song.Name,
+							boldRegexMatch.Success ? boldRegexMatch.Groups[1].Value : chart.Song.FetchMetadata().Name,
 							boldRegexMatch.Success ? Graphics2D.UI_MONO_BOLD_FONT_NAME : Graphics2D.UI_CN_JP_FONT_NAME,
 							fs);
 		y += fs + 4;

CloneDash/Program.cs

@@ -83,7 +83,7 @@ private static void LevelTransitions_OnLoadSongSelector(SongSelector selector, C
 		if (song is MD1_CustomChartsSong customChartsSong) {
 			customChartsSong.DownloadOrPullFromCache((c) => {
 				if (EngineCore.Level is not MainMenuLevel mml) {
-					Logs.Warn($"Downloading custom charts song '{c.Name}' completed downloading in a non-main menu context, ignoring.");
+					Logs.Warn($"Downloading custom charts song '{c.FetchMetadata().Name}' completed downloading in a non-main menu context, ignoring.");
 					return;
 				}
 

Nucleus.ModelEditor/UI/OutlinerNode.cs

@@ -114,7 +114,7 @@ public ITexture? ImageTexture {
 			set => Image.Texture = value;
 		}
 		public Color ImageColor {
-			get => Image.ImageColor1;
+			get => Image.ImageColor;
 			set => Image.ImageColor = value;
 		}