eep.

Author: Yuta12342

source/backend/modules/FunkinSound.hx renamed to source/backend/modules/FunkinMusic.hx

@@ -1,10 +1,9 @@
 package backend.modules;
 
-package backend.modules;
-
 import flixel.system.FlxSound;
+import backend.FunkinSound;
 
-class FunkinSound extends SoundLayer {
+class FunkinMusic extends SoundLayer {
     public var bpm:Float;
     public var sections:Array<{start:Float, end:Float}>;
     public var currentSectionIndex:Int;
@@ -22,7 +21,7 @@ class FunkinSound extends SoundLayer {
         var totalDuration:Float = this.sound.length; // Get total duration of the sound in seconds
 
         // Create sections based on the calculated start and end times
-        for (i in 0...Int(totalDuration / sectionDuration)) {
+        for (i in 0...Std.int(totalDuration / sectionDuration)) {
             var start:Float = i * sectionDuration;
             var end:Float = (i + 1) * sectionDuration;
             this.sections.push({start: start, end: end});
@@ -33,8 +32,8 @@ class FunkinSound extends SoundLayer {
         this.sections.push({start: start, end: end});
     }
 
-    public function play():Void {
-        this.sound.play();
+    public override function play():Void {
+        super.play();
         this.sound.onComplete = this.onSoundComplete;
     }
 

source/backend/modules/SoundLayer.hx

@@ -1,10 +1,11 @@
 package backend.modules;
 
 import flixel.system.FlxSound;
+import backend.FunkinSound;
 
 // Represents a single sound layer
 class SoundLayer {
-	public var sound:FlxSound;
+	public var sound:FunkinSound;
 	public var id:String;
 
 	public function new(id:String, soundPath:String) {

source/psychlua/IntegratedScript.hx

@@ -41,7 +41,7 @@ class IntegratedLuaScript {
         file.close();
 
         // Run the script through FunkinLua
-        new FunkinLua(tempFilePath);
+        new FunkinLua(tempFilePath).call("onCreate", []);
         // trace("Internal Lua script loaded successfully: " + name);
 
         // Delete the temporary file
@@ -106,7 +106,7 @@ class IntegratedHScript {
         file.writeString(scriptText);
         file.close();
 
-        new HScript(null, tempFilePath);
+        new HScript(null, tempFilePath).call("onCreate", []);
         // trace("Internal HScript loaded successfully: " + name);
 
         // Delete the temporary file

source/states/FirstCheckState.hx

@@ -1,5 +1,6 @@
 package states;
 
+import yutautil.AprilFools;
 import archipelago.APEntryState;
 import yutautil.modules.SyncUtils;
 import flixel.input.keyboard.FlxKey;
@@ -81,6 +82,16 @@ class FirstCheckState extends MusicBeatState
 		// combinedText.y = 200;
 		// add(combinedText);
 
+		if (AprilFools.allowAF)
+		{
+			var aprilFoolsText = new FlxText(0, 0, FlxG.width, "April Fools!");
+			aprilFoolsText.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, LEFT);
+			add(aprilFoolsText);
+		}
+		else {
+			ClientPrefs.data.aprilFools = true;
+		}
+
 		if (!relaunch)
 		{
 			updateRibbon = new FlxSprite(0, FlxG.height - 75).makeGraphic(FlxG.width, 75, 0x88FFFFFF, true);

source/states/TitleState.hx

@@ -144,7 +144,12 @@ class TitleState extends MusicBeatState
 		#if TITLE_SCREEN_EASTER_EGG easterEggData(); #end
 
 		logoBl = new FlxSprite(logoPosition.x, logoPosition.y);
-		logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
+		try {
+			logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
+		} catch (e:haxe.Exception) {
+			trace('[ERROR] Failed to load logoBumpin atlas: ' + e.details());
+			logoBl.frames = null;
+		}
 		if (logoBl.frames == null) { 
 			logoBl.frames = Paths.getSparrowAtlas('bump');
 			usingDefaultLogo = true;

source/yutautil/AprilFools.hx

@@ -7,9 +7,9 @@ import yutautil.ExtendedDate;
 class AprilFools {
     private var _allowAF:Bool = false;
 
-    public var allowAF(get, never):Bool;
+    public static var allowAF(get, never):Bool;
 
-    private function get_allowAF():Bool {
+    private static function get_allowAF():Bool {
         return ClientPrefs.data.aprilFools && ExtendedDate.global().isAprilFools();
     }
 }