From 87e406e903973370500b843fce86be67b61be336 Mon Sep 17 00:00:00 2001
From: PopSlime <popslime@qq.com>
Date: Wed, 16 Nov 2022 12:08:11 +0800
Subject: [PATCH] Cleanup.

---
 Assets/Cryville/Crtr/ChartPlayer.cs | 32 +++++++++++++++--------------
 Assets/Cryville/Crtr/Settings.cs    |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Assets/Cryville/Crtr/ChartPlayer.cs b/Assets/Cryville/Crtr/ChartPlayer.cs
index 0d9310a..a63e004 100644
--- a/Assets/Cryville/Crtr/ChartPlayer.cs
+++ b/Assets/Cryville/Crtr/ChartPlayer.cs
@@ -85,7 +85,14 @@ namespace Cryville.Crtr {
 
 			texHandler = new DownloadHandlerTexture();
 #if BUILD
-			Play();
+			try {
+				Play();
+			}
+			catch (Exception ex) {
+				Game.LogException("Load/WorkerThread", "An error occured while loading the data", ex);
+				Popup.CreateException(ex);
+				ReturnToMenu();
+			}
 #endif
 
 			// Camera.main.RenderToCubemap();
@@ -160,25 +167,18 @@ namespace Cryville.Crtr {
 					var tex = texHandler.texture;
 					tex.wrapMode = TextureWrapMode.Clamp;
 					texs.Add(name, tex);
-					Logger.Log("main", 0, "Load/MainThread", "Loaded texture {0} ({1} bytes)", name, texLoader.downloadedBytes);
 					texLoader.Dispose();
 					texHandler.Dispose();
 					texLoader = null;
 				}
-				else if (texLoader.downloadProgress != 0) {
-					Logger.Log("main", 0, "Load/MainThread", "Loading texture {0} {1:P0}", name, texLoader.downloadProgress);
-				}
 #else
-					if (texLoader.isDone) {
-						var tex = texLoader.texture;
-						texs.Add(name, tex);
-						Logger.Log("main", 0, "Load/MainThread", "Loaded texture {0} ({1} bytes)", name, texLoader.bytesDownloaded);
-						texLoader.Dispose();
-						texLoader = null;
-					}
-					else if (texLoader.progress != 0) {
-						Logger.Log("main", 0, "Load/MainThread", "Loading texture {0} {1:P0}", name, texLoader.progress);
-					}
+				if (texLoader.isDone) {
+					var tex = texLoader.texture;
+					tex.wrapMode = TextureWrapMode.Clamp;
+					texs.Add(name, tex);
+					texLoader.Dispose();
+					texLoader = null;
+				}
 #endif
 			}
 			if (texLoader == null)
@@ -336,6 +336,7 @@ namespace Cryville.Crtr {
 			FileInfo rulesetFile = new FileInfo(
 				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
 			);
+			if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
 			FileInfo rulesetConfigFile = new FileInfo(
 				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
 			);
@@ -348,6 +349,7 @@ namespace Cryville.Crtr {
 			FileInfo skinFile = new FileInfo(
 				string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
 			);
+			if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
 			loadThread = new Thread(new ParameterizedThreadStart(Load));
 			loadThread.Start(new LoadInfo() {
 				chartFile = chartFile,
diff --git a/Assets/Cryville/Crtr/Settings.cs b/Assets/Cryville/Crtr/Settings.cs
index 8867656..ec4c7eb 100644
--- a/Assets/Cryville/Crtr/Settings.cs
+++ b/Assets/Cryville/Crtr/Settings.cs
@@ -112,7 +112,7 @@ namespace Cryville.Crtr {
 		[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
 		public float RenderDistance {
 			get {
-				return PlayerPrefs.GetFloat("RenderDistance", 6);
+				return PlayerPrefs.GetFloat("RenderDistance", 4);
 			}
 			set {
 				PlayerPrefs.SetFloat("RenderDistance", value);