fucking macos

.github/workflows/main.yml

@@ -13,47 +13,6 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  buildMac:
-    runs-on: macos-latest
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - uses: krdlab/setup-haxe@master
-        with:
-          haxe-version: 4.3.0
-      - name: Cache HaxeLib
-        uses: actions/cache@v2
-        with:
-          path: |
-            /tmp/haxelib
-          key: Haxelib
-      # Cache to prevent 30 minute compile time for smallest of changes
-      - name: Cache FNFBRBIN
-        uses: actions/cache@v2
-        with:
-          path: |
-            /tmp/fnfbrbin
-          key: Bin
-      # Runs a set of commands using the runners shell
-
-          # haxelib git hxCodec https://github.com/polybiusproxy/hxCodec
-      - name: Install Haxelib
-        run: |
-          haxelib setup /tmp/haxelib
-          sh installDeps.bat
-        shell: sh
-      - name: Create Version Tag
-        run: echo "${{github.run_id}}" > VERSION
-      - name: Compile
-        run: haxelib run lime build macos --app-version="4.3.0-${{ github.run_id}}" -Dghaction
-      - name: Publish Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: MacBuild
-          path: /tmp/fnfbrbin/macos/bin/
   buildLinux:
     runs-on: ubuntu-latest
 

source/OptionsMenu.hx

@@ -363,7 +363,6 @@ class OptionsMenu extends MusicBeatState
 		}
 
 		if (isCat){
-
 			if (currentSelectedCat.getOptions()[curSelected].acceptValues){
 				if((FlxG.keys.pressed.SHIFT && FlxG.keys.pressed.RIGHT || _right ) && currentSelectedCat.getOptions()[curSelected].right()) 
 					updateAlphabet(grpControls.members[curSelected],currentSelectedCat.getOptions()[curSelected].display);

source/PauseSubState.hx

@@ -12,7 +12,9 @@ import flixel.input.keyboard.FlxKey;
 import flixel.sound.FlxSound;
 import flixel.text.FlxText;
 import flixel.tweens.FlxEase; 
+import flixel.graphics.FlxGraphic;
 import flixel.tweens.FlxTween;
+import openfl.display.BitmapData;
 // import flixel.tweens.FlxTweenManager;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
@@ -88,11 +90,13 @@ class PauseSubState extends MusicBeatSubstate {
 		FlxG.sound.music.onComplete = null;
 		FlxG.sound.music.looped = true;
 		// FlxG.sound.list.add(pauseMusic);
-
-		bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
-		bg.alpha = 0;
+		var bit=new BitmapData(FlxG.width,FlxG.height,true,);
+		bit.draw(FlxG.stage);
+		bg = new FlxSprite().loadGraphic(FlxGraphic.fromBitmapData(bit));
+		bg.alpha = 1;
 		bg.scrollFactor.set();
 		add(bg);
+
 		CoolUtil.setFramerate(60,null,true);
 
 		levelInfo = new FlxText(20, -15, 0, "", 32);
@@ -146,7 +150,7 @@ class PauseSubState extends MusicBeatSubstate {
 			FlxTween.tween(songText,{x : sX},0.9,{ease:FlxEase.cubeInOut});
 		}
 		changeSelection();
-
+		FlxG.state.persistentDraw = false;
 		quitHeldBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar','shared'));
 		quitHeldBG.screenCenter(X);
 		quitHeldBG.scrollFactor.set();
@@ -278,7 +282,7 @@ class PauseSubState extends MusicBeatSubstate {
 		for (_ => v in grpMenuShit.members)
 		{
 			ready = false;
-			FlxTween.tween(v,{x : -(100 + v.width),alpha : 0},time,{ease:FlxEase.quartIn});
+			FlxTween.tween(v,{x : -(100 + v.width)},time,{ease:FlxEase.quartIn});
 		}
 	}
 	function quit(){
@@ -410,7 +414,7 @@ class PauseSubState extends MusicBeatSubstate {
 		Conductor.songPosition = FlxG.sound.music.time = time;
 		disappearMenu(0.4);
 		callInterp("pauseResume",[]);
-		FlxTween.tween(bg,{alpha:0},2.5,{ease:FlxEase.quartOut});
+		// FlxTween.tween(bg,{alpha:0},2.5,{ease:FlxEase.quartOut});
 
 
 		var spr = new FlxSprite();

source/PlayState.hx

@@ -18,7 +18,6 @@ import lime.media.AudioManager;
 import openfl.Lib; 
 import Section.SwagSection;
 import Song.SwagSong;
-import WiggleEffect.WiggleEffectType;
 import flixel.FlxBasic;
 import flixel.FlxCamera;
 import flixel.FlxG;
@@ -2187,9 +2186,9 @@ class PlayState extends ScriptMusicBeatState
 		if(!_dadShow && SONG.needsVoices){
 			var note:Note = null;
 			if(notes.length > 0){
-				var daNote:Note = notes.members[0];
+				// var daNote:Note = notes.members[0];
 				while (notes.members[0] != null){
-					daNote = notes.members[0];
+					var daNote = notes.members[0];
 					if (daNote.skipNote || daNote.mustPress || !daNote.wasGoodHit) break;
 					daNote.active = false;
 					vocals.volume = 0;
@@ -2199,9 +2198,8 @@ class PlayState extends ScriptMusicBeatState
 			}
 		}
 		if(eventNotes.length > 0){
-			var note:Note = null;
 			while (eventNotes[0] != null && eventNotes[0].strumTime < Conductor.songPosition){
-				note = eventNotes.shift();
+				var note = eventNotes.shift();
 				try{
 					note.hit((note.mustPress ? 0 : 1),note);
 					note.destroy();

source/ScriptableState.hx

@@ -227,8 +227,9 @@ class SelectScriptableState extends SearchMenuState{
 
 	override function changeSelection(change:Int = 0){
 		super.changeSelection(change);
-		if (songs[curSelected] != "" && descriptions[songs[curSelected]] != null ){
-		  updateInfoText('${defText}; ' + descriptions[songs[curSelected]]);
+		var song = songs[curSelected];
+		if (song != "" && descriptions[song] != null ){
+		  updateInfoText('${defText}; ' + descriptions[song]);
 		}else{
 		  updateInfoText('${defText}; No description for this script.');
 		}

source/TitleState.hx

@@ -135,7 +135,6 @@ class TitleState extends MusicBeatState
 	public static var outdated:Bool = false;
 	public static var checkedUpdate:Bool = false;
 	public static var updatedVer:String = "";
-	public static var osuBeatmapLoc:String = "";
 	public static var songScores:Scorekillme;
 	public static var pauseMenuMusic:Sound;
 
@@ -649,20 +648,6 @@ class TitleState extends MusicBeatState
 		trace('Found ${stages.length} stages');
 		#end
 	}
-	#if !android
-	public static function findosuBeatmaps(){
-		var loc = "";
-		#if windows
-			if (Sys.getEnv("LOCALAPPDATA") != null && FileSystem.exists('${Sys.getEnv("LOCALAPPDATA")}/osu!/Songs/')) loc = '${Sys.getEnv("LOCALAPPDATA")}/osu!/Songs/';
-			if (Sys.getEnv("LOCALAPPDATA") != null && FileSystem.exists('${Sys.getEnv("LOCALAPPDATA")}/osu-stable/Songs/')) loc = '${Sys.getEnv("LOCALAPPDATA")}/osu-stable/Songs/';
-		#else
-			if (Sys.getEnv("HOME") != null && FileSystem.exists('${Sys.getEnv("HOME")}/.local/share/osu-stable/Songs/')) loc = '${Sys.getEnv("HOME")}/.local/share/osu-stable/Songs/';
-			// if (loc == "") trace('${Sys.getEnv("HOME")}/.local/share/osu-stable/songs/ doesnt exist!');
-		#end
-
-		osuBeatmapLoc = loc;
-	}
-	#end
 
 	override public function create():Void
 	{
@@ -831,9 +816,6 @@ class TitleState extends MusicBeatState
 				if((CoolUtil.font = if(SELoader.exists('mods/font.ttf')) SELoader.getPath('mods/font.ttf') else Paths.font(CoolUtil.fontName)
 					) != Paths.font("vcr.ttf")) flixel.system.FlxAssets.FONT_DEFAULT = CoolUtil.font;
 			#end
-			#if !android
-				findosuBeatmaps();
-			#end
 			var isUsingPaths = false;
 			if(SELoader.exists('path.txt')){
 				SELoader.PATH = SELoader.loadText('path.txt');

version.downloadMe

@@ -1,4 +1,4 @@
-24.05.06.2000;
+24.05.08.2044;
 * Multimenu Favourites
 * An option to have the note ratings come from the notes instead of the side of the strumline
 * A bunch of optimizations(I hope)