Replace all instances of openfl/lime Assets with funkin.Assets

source/funkin/Paths.hx

@@ -2,7 +2,6 @@ package funkin;
 
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.utils.AssetType;
-import openfl.utils.Assets as OpenFlAssets;
 
 /**
  * A core class which handles determining asset paths.
@@ -44,11 +43,11 @@ class Paths
     if (currentLevel != null)
     {
       var levelPath:String = getLibraryPathForce(file, currentLevel);
-      if (OpenFlAssets.exists(levelPath, type)) return levelPath;
+      if (Assets.exists(levelPath, type)) return levelPath;
     }
 
     var levelPath:String = getLibraryPathForce(file, 'shared');
-    if (OpenFlAssets.exists(levelPath, type)) return levelPath;
+    if (Assets.exists(levelPath, type)) return levelPath;
 
     return getPreloadPath(file);
   }

source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx

@@ -7,7 +7,6 @@ import flxanimate.frames.FlxAnimateFrames;
 import flixel.graphics.frames.FlxFrame;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import flixel.math.FlxPoint;
 import flxanimate.animate.FlxKeyFrame;
 

source/funkin/graphics/shaders/AdjustColorShader.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class AdjustColorShader extends FlxRuntimeShader
 {

source/funkin/graphics/shaders/BlendModesShader.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 import openfl.display.BitmapData;
 import openfl.display.ShaderInput;
 

source/funkin/graphics/shaders/GaussianBlurShader.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 /**
  * Note... not actually gaussian!

source/funkin/graphics/shaders/Grayscale.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class Grayscale extends FlxRuntimeShader
 {

source/funkin/graphics/shaders/HSVShader.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class HSVShader extends FlxRuntimeShader
 {

source/funkin/graphics/shaders/MosaicEffect.hx

@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import openfl.utils.Assets;
-import funkin.Paths;
 import flixel.math.FlxPoint;
 
 class MosaicEffect extends FlxRuntimeShader

source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx

@@ -2,7 +2,6 @@ package funkin.graphics.shaders;
 
 import openfl.display.BitmapData;
 import openfl.display.BlendMode;
-import openfl.utils.Assets;
 
 class RuntimeCustomBlendShader extends RuntimePostEffectShader
 {

source/funkin/graphics/shaders/RuntimeRainShader.hx

@@ -5,7 +5,6 @@ import openfl.display.BitmapData;
 import openfl.display.ShaderParameter;
 import openfl.display.ShaderParameterType;
 import flixel.util.FlxColor;
-import openfl.utils.Assets;
 
 typedef Light =
 {

source/funkin/import.hx

@@ -3,6 +3,7 @@ package;
 #if !macro
 // Only import these when we aren't in a macro.
 import funkin.util.Constants;
+import funkin.Assets;
 import funkin.Paths;
 import funkin.Preferences;
 import flixel.FlxG; // This one in particular causes a compile error if you're using macros.

source/funkin/input/Cursor.hx

@@ -1,7 +1,6 @@
 package funkin.input;
 
 import haxe.ui.backend.flixel.CursorHelper;
-import openfl.utils.Assets;
 import lime.app.Future;
 import openfl.display.BitmapData;
 

source/funkin/play/Countdown.hx

@@ -11,7 +11,6 @@ import funkin.modding.events.ScriptEvent.CountdownScriptEvent;
 import flixel.util.FlxTimer;
 import funkin.util.EaseUtil;
 import funkin.audio.FunkinSound;
-import openfl.utils.Assets;
 import funkin.data.notestyle.NoteStyleRegistry;
 import funkin.play.notes.notestyle.NoteStyle;
 

source/funkin/play/GameOverSubState.hx

@@ -15,7 +15,6 @@ import funkin.ui.freeplay.FreeplayState;
 import funkin.ui.MusicBeatSubState;
 import funkin.ui.story.StoryMenuState;
 import funkin.util.MathUtil;
-import openfl.utils.Assets;
 import funkin.effects.RetroCameraFade;
 import flixel.math.FlxPoint;
 

source/funkin/play/character/CharacterData.hx

@@ -11,7 +11,6 @@ import funkin.play.character.ScriptedCharacter.ScriptedSparrowCharacter;
 import funkin.util.assets.DataAssets;
 import funkin.util.VersionUtil;
 import haxe.Json;
-import openfl.utils.Assets;
 
 class CharacterDataParser
 {

source/funkin/play/components/HealthIcon.hx

@@ -5,7 +5,6 @@ import flixel.FlxSprite;
 import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import funkin.play.character.CharacterData.CharacterDataParser;
-import openfl.utils.Assets;
 import funkin.graphics.FunkinSprite;
 import funkin.util.MathUtil;
 

source/funkin/play/components/PopUpStuff.hx

@@ -8,7 +8,6 @@ import funkin.graphics.FunkinSprite;
 import funkin.play.PlayState;
 import funkin.util.TimerUtil;
 import funkin.util.EaseUtil;
-import openfl.utils.Assets;
 import funkin.data.notestyle.NoteStyleRegistry;
 import funkin.play.notes.notestyle.NoteStyle;
 

source/funkin/play/song/Song.hx

@@ -16,7 +16,6 @@ import funkin.modding.IScriptedClass.IPlayStateScriptedClass;
 import funkin.modding.events.ScriptEvent;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.util.SortUtil;
-import openfl.utils.Assets;
 
 /**
  * This is a data structure managing information about the current song.

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

@@ -24,7 +24,6 @@ import haxe.ui.core.Screen;
 import haxe.ui.events.UIEvent;
 import haxe.ui.RuntimeComponentBuilder;
 import lime.utils.Assets as LimeAssets;
-import openfl.Assets;
 import openfl.events.Event;
 import openfl.events.IOErrorEvent;
 import openfl.geom.Rectangle;

source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx

@@ -3,7 +3,6 @@ package funkin.ui.debug.charting.components;
 import funkin.data.event.SongEventRegistry;
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import flixel.FlxObject;
 import flixel.FlxBasic;
 import flixel.FlxSprite;

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

@@ -13,7 +13,6 @@ import funkin.audio.waveform.WaveformSprite;
 import flixel.util.FlxColor;
 import haxe.io.Bytes;
 import haxe.io.Path;
-import openfl.utils.Assets;
 
 /**
  * Functions for loading audio for the chart editor.

source/funkin/ui/freeplay/AlbumRoll.hx

@@ -11,7 +11,6 @@ import funkin.data.freeplay.album.AlbumRegistry;
 import funkin.util.assets.FlxAnimationUtil;
 import funkin.graphics.FunkinSprite;
 import funkin.util.SortUtil;
-import openfl.utils.Assets;
 
 /**
  * The graphic for the album roll in the FreeplayState.

source/funkin/ui/freeplay/FreeplayState.hx

@@ -51,7 +51,6 @@ import funkin.ui.transition.LoadingState;
 import funkin.ui.transition.StickerSubState;
 import funkin.util.MathUtil;
 import funkin.util.SortUtil;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import funkin.data.freeplay.style.FreeplayStyleRegistry;
 import funkin.data.song.SongData.SongMusicData;
@@ -1859,7 +1858,7 @@ class FreeplayState extends MusicBeatSubState
     albumRoll.setDifficultyStars(daSong?.difficultyRating);
   }
 
-  // Clears the cache of songs, frees up memory, they' ll have to be loaded in later tho function clearDaCache(actualSongTho:String)
+  // Clears the cache of songs to free up memory, they'll have to be loaded in later tho
   function clearDaCache(actualSongTho:String):Void
   {
     for (song in songs)

source/funkin/ui/freeplay/backcards/BackingCard.hx

@@ -18,7 +18,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 

source/funkin/ui/freeplay/backcards/BoyfriendCard.hx

@@ -18,7 +18,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 
@@ -177,20 +176,21 @@ class BoyfriendCard extends BackingCard
   }
 
   var beatFreq:Int = 1;
-  var beatFreqList:Array<Int> = [1,2,4,8];
+  var beatFreqList:Array<Int> = [1, 2, 4, 8];
 
-  public override function beatHit():Void {
+  public override function beatHit():Void
+  {
     // increases the amount of beats that need to go by to pulse the glow because itd flash like craazy at high bpms.....
-    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm/140)];
+    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm / 140)];
 
-    if(Conductor.instance.currentBeat % beatFreq != 0) return;
+    if (Conductor.instance.currentBeat % beatFreq != 0) return;
     FlxTween.cancelTweensOf(glow);
     FlxTween.cancelTweensOf(glowDark);
 
     glow.alpha = 0.8;
-    FlxTween.tween(glow, {alpha: 0}, 16/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glow, {alpha: 0}, 16 / 24, {ease: FlxEase.quartOut});
     glowDark.alpha = 0;
-    FlxTween.tween(glowDark, {alpha: 0.6}, 18/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glowDark, {alpha: 0.6}, 18 / 24, {ease: FlxEase.quartOut});
   }
 
   public override function introDone():Void

source/funkin/ui/freeplay/backcards/NewCharacterCard.hx

@@ -20,7 +20,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 import funkin.graphics.shaders.AdjustColorShader;

source/funkin/ui/freeplay/backcards/PicoCard.hx

@@ -20,7 +20,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 import funkin.graphics.shaders.AdjustColorShader;
@@ -233,20 +232,21 @@ class PicoCard extends BackingCard
   }
 
   var beatFreq:Int = 1;
-  var beatFreqList:Array<Int> = [1,2,4,8];
+  var beatFreqList:Array<Int> = [1, 2, 4, 8];
 
-  public override function beatHit():Void {
+  public override function beatHit():Void
+  {
     // increases the amount of beats that need to go by to pulse the glow because itd flash like craazy at high bpms.....
-    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm/140)];
+    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm / 140)];
 
-    if(Conductor.instance.currentBeat % beatFreq != 0) return;
+    if (Conductor.instance.currentBeat % beatFreq != 0) return;
     FlxTween.cancelTweensOf(glow);
     FlxTween.cancelTweensOf(glowDark);
 
     glow.alpha = 1;
-    FlxTween.tween(glow, {alpha: 0}, 16/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glow, {alpha: 0}, 16 / 24, {ease: FlxEase.quartOut});
     glowDark.alpha = 0;
-    FlxTween.tween(glowDark, {alpha: 1}, 18/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glowDark, {alpha: 1}, 18 / 24, {ease: FlxEase.quartOut});
   }
 
   public override function introDone():Void

source/funkin/ui/options/FunkinSoundTray.hx

@@ -6,7 +6,6 @@ import flixel.system.FlxAssets;
 import flixel.tweens.FlxEase;
 import openfl.display.Bitmap;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import funkin.util.MathUtil;
 
 /**

source/funkin/ui/story/StoryMenuState.hx

@@ -23,7 +23,6 @@ import funkin.ui.MusicBeatState;
 import funkin.ui.transition.LoadingState;
 import funkin.ui.transition.StickerSubState;
 import funkin.util.MathUtil;
-import openfl.utils.Assets;
 
 class StoryMenuState extends MusicBeatState
 {

source/funkin/ui/transition/LoadingState.hx

@@ -3,24 +3,23 @@ package funkin.ui.transition;
 import flixel.FlxSprite;
 import flixel.math.FlxMath;
 import flixel.tweens.FlxEase;
-import funkin.graphics.FunkinSprite;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
+import flixel.util.typeLimit.NextState;
+import funkin.graphics.FunkinSprite;
 import funkin.graphics.shaders.ScreenWipeShader;
 import funkin.play.PlayState;
 import funkin.play.PlayStatePlaylist;
 import funkin.play.song.Song.SongDifficulty;
 import funkin.ui.MusicBeatState;
 import haxe.io.Path;
-import funkin.graphics.FunkinSprite;
 import lime.app.Future;
 import lime.app.Promise;
 import lime.utils.AssetLibrary;
 import lime.utils.AssetManifest;
 import lime.utils.Assets as LimeAssets;
 import openfl.filters.ShaderFilter;
-import openfl.utils.Assets;
-import flixel.util.typeLimit.NextState;
+import openfl.utils.Assets as OpenFLAssets;
 
 class LoadingState extends MusicBeatSubState
 {
@@ -98,7 +97,7 @@ class LoadingState extends MusicBeatSubState
 
   function checkLoadSong(path:String):Void
   {
-    if (!Assets.cache.hasSound(path))
+    if (!OpenFLAssets.cache.hasSound(path))
     {
       var library = Assets.getLibrary('songs');
       var symbolPath = path.split(':').pop();

source/funkin/ui/transition/StickerSubState.hx

@@ -2,7 +2,6 @@ package funkin.ui.transition;
 
 import flixel.FlxSprite;
 import haxe.Json;
-import lime.utils.Assets;
 import funkin.graphics.FunkinSprite;
 // import flxtyped group
 import funkin.ui.MusicBeatSubState;
@@ -56,7 +55,7 @@ class StickerSubState extends MusicBeatSubState
     // make sure that ONLY plays mp3/ogg files
     // if there's no mp3/ogg file, then it regenerates/reloads the random folder
 
-    var assetsInList = openfl.utils.Assets.list();
+    var assetsInList = Assets.list();
 
     var soundFilterFunc = function(a:String) {
       return a.startsWith('assets/shared/sounds/stickersounds/');
@@ -84,7 +83,7 @@ class StickerSubState extends MusicBeatSubState
     var filterFunc = function(a:String) {
       return a.startsWith('assets/shared/sounds/stickersounds/' + soundSelection + '/');
     };
-    var assetsInList3 = openfl.utils.Assets.list();
+    var assetsInList3 = Assets.list();
     sounds = assetsInList3.filter(filterFunc);
     for (i in 0...sounds.length)
     {