e

Author: Yuta12342

source/backend/MusicBeatState.hx

@@ -1,5 +1,6 @@
 package backend;
 
+import haxe.ds.HashMap;
 import backend.window.CppAPI;
 import flixel.FlxState;
 import backend.PsychCamera;
@@ -310,24 +311,49 @@ class MusicBeatState extends FlxState
 
 		}
 	}
+	var preloadFunctions:Map<String, (FlxState)->Void> = [
+		"PlayState" => function(state:FlxState) {
+			if (state is PlayState) {
+				@:privateAccess
+				(cast state:PlayState).generateSong();
+			}
+		}
+	];
 
-	var preloadFunction:()->Void = null;
+	public function hashCode():Int
+	{
+		return Type.getClassName(Type.getClass(this)).hashcode();
+	}
 
-	public function preloadState(switchState:Bool = false):Void
+	public function preloadState(switchState:Bool = false, state:FlxState, ?proceedOnError:Bool = true)
 	{
+		var stateClassName = Type.getClassName(Type.getClass(state)).split(".")[Lambda.count(Type.getClassName(Type.getClass(state)).split(".")) - 1];
+		var preloadFunction = preloadFunctions.get(stateClassName);
+		var errored = false;
+		if (preloadFunction == null)
+		{
+			trace('No preload function for state: ' + stateClassName);
+		}
 		var preloader = function()
 		{
 			if (preloadFunction != null)
 			{
-				preloadFunction();
+				trace('Preloading state: ' + stateClassName);
+				try {
+					preloadFunction(state);
+				} catch (e:Dynamic) {
+					trace('Error during state preloading: ' + e);
+				}
 				preloadFunction = null;
 			}
-			if (switchState)
+			if (switchState && (!errored || proceedOnError))
 				return MusicBeatState.switchState(this);
-		 }
+		};
 
-		 yutautil.Threader.runInThread(preloader(), 1, 'State Preloader - ${Type.getClassName(Type.getClass(this))}');
-		}	
+		var stateName = Type.getClassName(Type.getClass(state));
+
+		yutautil.Threader.runInThread(preloader(), 1, 'State Preloader');
+	}
 
 
 	public static function preloadAndSwitchState(state:MusicBeatState)
@@ -340,7 +366,7 @@ class MusicBeatState extends FlxState
 			return;
 		}
 
-		state.preloadState(true);
+		state.preloadState(true, state);
 	}
 
 	public static function switchState(nextState:FlxState = null)

source/states/PlayState.hx

@@ -137,6 +137,10 @@ class PlayState extends MusicBeatState
 
 	public var comboOffsetCustom:Null<Array<Int>> = null;
 
+	// override function preloadFunction():Void {
+	// 	generateSong();
+	// }
+
 	public var BF_X:Float = 770;
 	public var BF_Y:Float = 100;
 	public var BF2_X:Float = 770;
@@ -456,6 +460,12 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
+
+		// if (SONG != null)
+		// {
+		// 	preloadFunction = generateSong;
+		// }
+
 		if (SONG == null) {
 			var songLowercase:String = Paths.formatToSongPath('tutorial');
 			var poop:String = Highscore.formatSong(songLowercase, storyDifficulty);	
@@ -2288,6 +2298,7 @@ class PlayState extends MusicBeatState
 
 	private function generateSong():Void
 	{
+		trace('Generating Song: ${SONG.song}');
 		// FlxG.log.add(ChartParser.parse());
 		songSpeed = PlayState.SONG.speed;
 		songSpeedType = ClientPrefs.getGameplaySetting('scrolltype');

source/states/freeplay/FreeplayState.hx

@@ -1313,7 +1313,7 @@ class FreeplayState extends MusicBeatState
 							alreadyClicked = true;
 							MusicBeatState.reopen = false; //Fix a sticker bug
 							LoadingState.prepareToSong();
-							LoadingState.loadAndSwitchState(APEntryState.inArchipelagoMode ? new archipelago.APPlayState() : new states.PlayState());
+							MusicBeatState.preloadAndSwitchState(APEntryState.inArchipelagoMode ? new archipelago.APPlayState() : new states.PlayState());
 						}
 						#if !SHOW_LOADING_SCREEN FlxG.sound.music.stop(); #end
 						stopMusicPlay = true;

source/yutautil/CollectionUtils.hx

@@ -520,6 +520,35 @@ class CollectionUtils
 			return Type.createInstance(CLASS, args != null ? args : []);
 	}
 
+	public static inline function hashcode(input:Dynamic):Int
+	{
+		if (Std.is(input, String))
+		{
+			var hash = 0;
+			for (i in 0...input.length) {
+				var char = input.charCodeAt(i);
+				hash = (hash * 31 + char) & 0xffffffff;
+			}
+			return hash;
+		}
+		else if (Std.is(input, Int) || Std.is(input, Float))
+		{
+			return Std.int(input);
+		}
+		else if (Std.is(input, Array))
+		{
+			return input.hashCode();
+		}
+		else if (Std.is(input, IMap))
+		{
+			return input.hashCode();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
 	public static inline function callOn<T>(item:T, func:T->Dynamic):Dynamic
 	{
 		return func(item);