Merge branch 'rewrite/master' into feature/high-erect

source/funkin/ui/debug/DebugMenuSubState.hx

@@ -4,6 +4,7 @@ import flixel.math.FlxPoint;
 import flixel.FlxObject;
 import flixel.FlxSprite;
 import funkin.ui.MusicBeatSubState;
+import funkin.audio.FunkinSound;
 import funkin.ui.TextMenuList;
 import funkin.ui.debug.charting.ChartEditorState;
 import funkin.ui.MusicBeatSubState;
@@ -71,7 +72,7 @@ class DebugMenuSubState extends MusicBeatSubState
 
     if (controls.BACK)
     {
-      FlxG.sound.play(Paths.sound('cancelMenu'));
+      FunkinSound.playOnce(Paths.sound('cancelMenu'));
       exitDebugMenu();
     }
   }

source/funkin/ui/debug/anim/DebugBoundingState.hx

@@ -12,7 +12,6 @@ import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.graphics.frames.FlxFrame;
 import flixel.group.FlxGroup;
 import flixel.math.FlxPoint;
-import flixel.sound.FlxSound;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
 import funkin.util.MouseUtil;
@@ -179,7 +178,7 @@ class DebugBoundingState extends FlxState
       var objShit = js.html.URL.createObjectURL(swagList.item(0));
       trace(objShit);
 
-      var funnysound = new FlxSound().loadStream('https://cdn.discordapp.com/attachments/767500676166451231/817821618251759666/Flutter.mp3', false, false,
+      var funnysound = new FunkinSound().loadStream('https://cdn.discordapp.com/attachments/767500676166451231/817821618251759666/Flutter.mp3', false, false,
         null, function() {
           trace('LOADED SHIT??');
       });

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -15,7 +15,6 @@ import flixel.input.mouse.FlxMouseEvent;
 import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
-import flixel.sound.FlxSound;
 import flixel.system.debug.log.LogStyle;
 import flixel.system.FlxAssets.FlxSoundAsset;
 import flixel.text.FlxText;
@@ -1091,7 +1090,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
    * The chill audio track that plays in the chart editor.
    * Plays when the main music is NOT being played.
    */
-  var welcomeMusic:FlxSound = new FlxSound();
+  var welcomeMusic:FunkinSound = new FunkinSound();
 
   /**
    * The audio track for the instrumental.
@@ -3888,8 +3887,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   function handleCursor():Void
   {
     // Mouse sounds
-    if (FlxG.mouse.justPressed) FlxG.sound.play(Paths.sound("chartingSounds/ClickDown"));
-    if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp"));
+    if (FlxG.mouse.justPressed) FunkinSound.playOnce(Paths.sound("chartingSounds/ClickDown"));
+    if (FlxG.mouse.justReleased) FunkinSound.playOnce(Paths.sound("chartingSounds/ClickUp"));
 
     // Note: If a menu is open in HaxeUI, don't handle cursor behavior.
     var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging || isHaxeUIDialogOpen)

source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx

@@ -1,7 +1,6 @@
 package funkin.ui.debug.charting.handlers;
 
 import flixel.system.FlxAssets.FlxSoundAsset;
-import flixel.sound.FlxSound;
 import funkin.audio.VoicesGroup;
 import funkin.audio.FunkinSound;
 import funkin.play.character.BaseCharacter.CharacterType;
@@ -302,7 +301,8 @@ class ChartEditorAudioHandler
       trace('WARN: Failed to play sound $path, asset not found.');
       return;
     }
-    var snd:FunkinSound = FunkinSound.load(asset);
+    var snd:Null<FunkinSound> = FunkinSound.load(asset);
+    if (snd == null) return;
     snd.autoDestroy = true;
     snd.play(true);
     snd.volume = volume;

source/funkin/ui/debug/latency/LatencyState.hx

@@ -71,8 +71,6 @@ class LatencyState extends MusicBeatSubState
       // trace("EVENT LISTENER: " + key);
     });
 
-    // FlxG.sound.playMusic(Paths.sound('soundTest'));
-
     // funnyStatsGraph.hi
 
     Conductor.instance.forceBPM(60);
@@ -242,13 +240,6 @@ class LatencyState extends MusicBeatSubState
       }
     }
 
-    /* if (FlxG.keys.justPressed.SPACE)
-      {
-        FlxG.sound.music.stop();
-
-        FlxG.resetState();
-    }*/
-
     noteGrp.forEach(function(daNote:NoteSprite) {
       daNote.y = (strumLine.y - ((Conductor.instance.songPosition - Conductor.instance.instrumentalOffset) - daNote.noteData.time) * 0.45);
       daNote.x = strumLine.x + 30;

source/funkin/ui/debug/stage/StageBuilderState.hx

@@ -37,8 +37,6 @@ class StageBuilderState extends MusicBeatState
 
     FlxG.mouse.visible = true;
 
-    // var alsoSnd:FlxSound = new FlxSound();
-
     // snd = new Sound();
 
     // var swagBytes:ByteArray = new ByteArray(8192);