update bs

Author: Lily

source/ClientPrefs.hx

@@ -9,9 +9,6 @@ import Controls;
 class ClientPrefs { //default settings if it can't find a save file containing your current settings
 	#if mobile
 	public static var screensaver:Bool = false;
-	#if android
-	public static var storageType:String = "EXTERNAL_DATA";
-	#end
 	#end
 	public static var mobileCAlpha:Float = FlxG.onMobile ? 0.6 : 0;
 	public static var mobileCEx:Bool = false;

source/Main.hx

@@ -117,9 +117,9 @@ class Main extends Sprite {
 		super();
 		#if mobile
 		#if android
-		SUtil.doPermissionsShit();
+		StorageUtil.requestPermissions();
 		#end
-		Sys.setCwd(SUtil.getStorageDirectory());
+		Sys.setCwd(StorageUtil.getStorageDirectory());
 		#end
 
 		CrashHandler.init();

source/editors/ChartingState.hx

@@ -4348,7 +4348,7 @@ class ChartingState extends MusicBeatState
 			if (difficulty.toLowerCase() != 'normal')
 				gamingName = gamingName + '-' + Paths.formatToSongPath(difficulty);
 
-			SUtil.saveContent('$gamingName.json', data.trim());
+			StorageUtil.saveContent('$gamingName.json', data.trim());
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);
@@ -4388,7 +4388,7 @@ class ChartingState extends MusicBeatState
 		if ((data != null) && (data.length > 0))
 		{
 			#if mobile
-			SUtil.saveContent('events.json', data.trim());
+			StorageUtil.saveContent('events.json', data.trim());
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);

source/editors/DialogueCharacterEditorState.hx

@@ -796,7 +796,7 @@ class DialogueCharacterEditorState extends MusicBeatState
 			var characterName:String = splittedImage[0].toLowerCase().replace(' ', '');
 
 			#if mobile
-			SUtil.saveContent('$characterName.json', data); // gacha horror referance
+			StorageUtil.saveContent('$characterName.json', data); // gacha horror referance
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);

source/editors/DialogueEditorState.hx

@@ -532,7 +532,7 @@ class DialogueEditorState extends MusicBeatState
 		if (data.length > 0)
 		{
 			#if mobile
-			SUtil.saveContent("dialogue.json", data);
+			StorageUtil.saveContent("dialogue.json", data);
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);

source/editors/MenuCharacterEditorState.hx

@@ -414,7 +414,7 @@ class MenuCharacterEditorState extends MusicBeatState
 			var characterName:String = splittedImage[splittedImage.length-1].toLowerCase().replace(' ', '');
 
 			#if mobile
-			SUtil.saveContent('$characterName.json', data); // gacha horror referance
+			StorageUtil.saveContent('$characterName.json', data); // gacha horror referance
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);

source/editors/WeekEditorState.hx

@@ -552,7 +552,7 @@ class WeekEditorState extends MusicBeatState
 		if (data.length > 0)
 		{
 			#if mobile
-			SUtil.saveContent('$weekFileName.json', data);
+			StorageUtil.saveContent('$weekFileName.json', data);
 			#else
 			_file = new FileReference();
 			_file.addEventListener(Event.COMPLETE, onSaveComplete);

source/import.hx

@@ -2,7 +2,7 @@
 import Paths;
 import haxe.ds.Vector as HaxeVector; //apparently denpa uses vectors, which is required for camera panning i guess
 
-import mobile.SUtil;
+import mobile.StorageUtil;
 
 #if sys
 import sys.*;

source/mobile/CopyState.hx

@@ -20,50 +20,49 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-
 package mobile;
 
 #if mobile
 import lime.utils.Assets as LimeAssets;
 import openfl.utils.Assets as OpenFLAssets;
-import flixel.addons.util.FlxAsyncLoop;
 import flixel.FlxG;
 import flixel.text.FlxText;
 import flixel.FlxSprite;
 import flixel.util.FlxColor;
+import flixel.util.FlxTimer;
 import openfl.utils.ByteArray;
 import haxe.io.Path;
+import flixel.ui.FlxBar;
+import flixel.ui.FlxBar.FlxBarFillDirection;
+import lime.system.ThreadPool;
 #if sys
 import sys.io.File;
 import sys.FileSystem;
 #end
-
 using StringTools;
 
-#if (android && cpp)
-@:headerInclude('sys/utsname.h')
-#end
+/**
+ * ...
+ * @author: Karim Akra
+ */
 class CopyState extends MusicBeatState
 {
+	private static final textFilesExtensions:Array<String> = ['ini', 'txt', 'xml', 'hxs', 'hx', 'lua', 'json', 'frag', 'vert'];
+	public static final IGNORE_FOLDER_FILE_NAME:String = "CopyState-Ignore.txt";
+	private static var directoriesToIgnore:Array<String> = [];
 	public static var locatedFiles:Array<String> = [];
 	public static var maxLoopTimes:Int = 0;
-	public static final IGNORE_FOLDER_FILE_NAME:String = "ignore.txt";
 
 	public var loadingImage:FlxSprite;
-	public var bottomBG:FlxSprite;
+	public var loadingBar:FlxBar;
 	public var loadedText:FlxText;
-	public var copyLoop:FlxAsyncLoop;
+	public var thread:ThreadPool;
 
-	var loopTimes:Int = 0;
-	var failedFiles:Array<String> = [];
 	var failedFilesStack:Array<String> = [];
-	var canUpdate:Bool = true;
+	var failedFiles:Array<String> = [];
 	var shouldCopy:Bool = false;
-	#if android
-	var archPrefix:String = "";
-	#end
-
-	private static final textFilesExtensions:Array<String> = ['ini', 'txt', 'xml', 'hxs', 'hx', 'lua', 'json', 'frag', 'vert'];
+	var canUpdate:Bool = true;
+	var loopTimes:Int = 0;
 
 	override function create()
 	{
@@ -77,41 +76,44 @@ class CopyState extends MusicBeatState
 		}
 
 		CoolUtil.showPopUp("Seems like you have some missing files that are necessary to run the game\nPress OK to begin the copy process", "Notice!");
-		
+
 		shouldCopy = true;
 
 		add(new FlxSprite(0, 0).makeGraphic(FlxG.width, FlxG.height, 0xffcaff4d));
 
-		loadingImage = new FlxSprite(0, 0, Paths.image('funkay'));
+		loadingImage = new FlxSprite(0, 0, Paths.image('funkay', 'shared'));
 		loadingImage.setGraphicSize(0, FlxG.height);
 		loadingImage.updateHitbox();
 		loadingImage.screenCenter();
 		add(loadingImage);
 
-		bottomBG = new FlxSprite(0, FlxG.height - 26).makeGraphic(FlxG.width, 26, 0xFF000000);
-		bottomBG.alpha = 0.6;
-		add(bottomBG);
+		loadingBar = new FlxBar(0, FlxG.height - 26, FlxBarFillDirection.LEFT_TO_RIGHT, FlxG.width, 26);
+		loadingBar.setRange(0, maxLoopTimes);
+		add(loadingBar);
 
-		loadedText = new FlxText(bottomBG.x, bottomBG.y + 4, FlxG.width, '', 16);
+		loadedText = new FlxText(loadingBar.x, loadingBar.y + 4, FlxG.width, '', 16);
 		loadedText.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, CENTER);
 		add(loadedText);
 
-		var ticks:Int = 15;
-		if (maxLoopTimes <= 15)
-			ticks = 1;
-
-		copyLoop = new FlxAsyncLoop(maxLoopTimes, copyAsset, ticks);
-		add(copyLoop);
-		copyLoop.start();
+		thread = new ThreadPool(0, CoolUtil.getCPUThreadsCount(), MULTI_THREADED);
+		new FlxTimer().start(0.5, (tmr) -> {
+			thread.run(function(poop, shit) {
+				for (file in locatedFiles)
+				{
+					loopTimes++;
+					copyAsset(file);
+				}
+			}, null);
+		});
 
 		super.create();
 	}
 
 	override function update(elapsed:Float)
 	{
-		if (shouldCopy && copyLoop != null)
+		if (shouldCopy)
 		{
-			if (copyLoop.finished && canUpdate)
+			if (loopTimes >= maxLoopTimes && canUpdate)
 			{
 				if (failedFiles.length > 0)
 				{
@@ -120,29 +122,32 @@ class CopyState extends MusicBeatState
 						FileSystem.createDirectory('logs');
 					File.saveContent('logs/' + Date.now().toString().replace(' ', '-').replace(':', "'") + '-CopyState' + '.txt', failedFilesStack.join('\n'));
 				}
-				canUpdate = false;
-				FlxG.sound.play(Paths.sound('confirmMenu')).onComplete = () -> {
+				
+				FlxG.sound.play(Paths.sound('confirmMenu')).onComplete = () ->
+				{
 					FlxG.switchState(InitState.new);
 				};
+		
+				canUpdate = false;
 			}
 
-			if (maxLoopTimes == 0)
+			if (loopTimes >= maxLoopTimes)
 				loadedText.text = "Completed!";
 			else
 				loadedText.text = '$loopTimes/$maxLoopTimes';
+
+			loadingBar.percent = Math.min((loopTimes / maxLoopTimes) * 100, 100);
 		}
 		super.update(elapsed);
 	}
 
-	public function copyAsset()
+	public function copyAsset(file:String)
 	{
-		var file = locatedFiles[loopTimes];
-		loopTimes++;
 		if (!FileSystem.exists(file))
 		{
 			var directory = Path.directory(file);
 			if (!FileSystem.exists(directory))
-				SUtil.mkDirs(directory);
+				FileSystem.createDirectory(directory);
 			try
 			{
 				if (OpenFLAssets.exists(getFile(file)))
@@ -176,7 +181,7 @@ class CopyState extends MusicBeatState
 			if (fileData == null)
 				fileData = '';
 			if (!FileSystem.exists(directory))
-				SUtil.mkDirs(directory);
+				FileSystem.createDirectory(directory);
 			File.saveContent(Path.join([directory, fileName]), fileData);
 		}
 		catch (e:haxe.Exception)
@@ -188,7 +193,7 @@ class CopyState extends MusicBeatState
 
 	public function getFileBytes(file:String):ByteArray
 	{
-		switch (Path.extension(file))
+		switch (Path.extension(file).toLowerCase())
 		{
 			case 'otf' | 'ttf':
 				return ByteArray.fromFile(file);
@@ -199,11 +204,13 @@ class CopyState extends MusicBeatState
 
 	public static function getFile(file:String):String
 	{
-		if(OpenFLAssets.exists(file)) return file;
+		if (OpenFLAssets.exists(file))
+			return file;
 
 		@:privateAccess
-		for(library in LimeAssets.libraries.keys()){
-			if(OpenFLAssets.exists('$library:$file') && library != 'default')
+		for (library in LimeAssets.libraries.keys())
+		{
+			if (OpenFLAssets.exists('$library:$file') && library != 'default')
 				return '$library:$file';
 		}
 
@@ -213,28 +220,38 @@ class CopyState extends MusicBeatState
 	public static function checkExistingFiles():Bool
 	{
 		locatedFiles = OpenFLAssets.list();
-		
+
 		// removes unwanted assets
 		var assets = locatedFiles.filter(folder -> folder.startsWith('assets/'));
 		var mods = locatedFiles.filter(folder -> folder.startsWith('mods/'));
 		locatedFiles = assets.concat(mods);
+		locatedFiles = locatedFiles.filter(file -> !FileSystem.exists(file));
 
 		var filesToRemove:Array<String> = [];
 
 		for (file in locatedFiles)
 		{
-			if (FileSystem.exists(file) || OpenFLAssets.exists(getFile(Path.join([Path.directory(getFile(file)), IGNORE_FOLDER_FILE_NAME]))))
+			if (filesToRemove.contains(file))
+				continue;
+
+			if(file.endsWith(IGNORE_FOLDER_FILE_NAME) && !directoriesToIgnore.contains(Path.directory(file)))
+				directoriesToIgnore.push(Path.directory(file));
+
+			if (directoriesToIgnore.length > 0)
 			{
-				filesToRemove.push(file);
+				for (directory in directoriesToIgnore)
+				{
+					if (file.startsWith(directory))
+						filesToRemove.push(file);
+				}
 			}
 		}
 
-		for (file in filesToRemove)
-			locatedFiles.remove(file);
+		locatedFiles = locatedFiles.filter(file -> !filesToRemove.contains(file));
 
 		maxLoopTimes = locatedFiles.length;
 
-		return (maxLoopTimes < 0);
+		return (maxLoopTimes <= 0);
 	}
 }
-#end
+#end

source/mobile/MobileControls.hx

@@ -1,3 +1,25 @@
+/*
+ * Copyright (C) 2025 Mobile Porting Team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
 package mobile;
 
 import flixel.FlxG;
@@ -9,9 +31,6 @@ import mobile.flixel.FlxButton;
 import mobile.flixel.FlxHitbox;
 import mobile.flixel.FlxVirtualPad;
 
-/**
- * @author Mihai Alexandru (M.A. Jigsaw)
- */
 class MobileControls extends FlxSpriteGroup
 {
 	public static var customVirtualPad(get, set):FlxVirtualPad;