Embed Folder + Default Sound + Window Icon

Signed-off-by: CrusherNotDrip <crushernotdrip@tilnotdrip.org>

Author: CrusherNotDrip

assets/embed/default.wav

@@ -1,8 +1,11 @@
 package;
 
+import funkin.Paths;
+import funkin.graphics.FunkinImage;
 import funkin.ui.overlay.FunkinOverlay;
 import h3d.Engine;
 import hxd.App;
+import hxd.Window;
 
 class Main extends App
 {
@@ -31,6 +34,8 @@ class Main extends App
   {
     setScene(new funkin.ui.title.TitleScene());
     overlay = new FunkinOverlay();
+
+    Window.getInstance().setIcon(new FunkinImage(Paths.embedFileSystem.get('icons/iconOG.png')).toBitmap());
   }
 
   override function update(dt:Float)

assets/embed/icons/icon16.png

@@ -2,6 +2,7 @@ package funkin;
 
 import funkin.resource.FunkinContent;
 import funkin.resource.FunkinFileSystem;
+import hxd.fs.EmbedFileSystem;
 
 /**
  * This is a paths class mostly used for getting content from files.
@@ -31,12 +32,19 @@ class Paths
    */
   public static final fileSystem:FunkinFileSystem = new FunkinFileSystem();
 
+  /**
+   * The embedded assets file system.
+   */
+  public static final embedFileSystem:FunkinFileSystem = new FunkinFileSystem();
+
   /**
    * (Re)initializes the File System.
    */
   public static function init():Void
   {
     // TODO: This is very temporary, and looks very awful!
     fileSystem.child = new hxd.fs.LocalFileSystem('../../../assets', null);
+
+    embedFileSystem.child = EmbedFileSystem.create('../../../assets/embed');
   }
 }

assets/embed/icons/iconOG.png

@@ -14,7 +14,17 @@ class FunkinContent
   public function audio(key:String):Sound
   {
     final path:String = PathTools.withExtension(key, Paths.AUDIO_EXT);
-    final entry:FileEntry = Paths.fileSystem.get(path);
+    var entry:FileEntry = null;
+
+    try
+    {
+      entry = Paths.fileSystem.get(path);
+    }
+    catch (e)
+    {
+      trace('[ERROR] `$path` was not found. Returning default sound...');
+      entry = Paths.embedFileSystem.get('default.wav');
+    }
 
     // TODO: Cache this instead of creating a new one every time.
     return new Sound(entry);