- * The {@code AssetLoader} scans a root folder recursively, identifies files, + * The {@code ResourceLoader} scans a root folder recursively, identifies files, * and maps them to registered resource types based on file extensions and * {@link FileExtension} annotations. * It supports multiple resource types including {@link PreloadResource} (automatically loaded) @@ -25,7 +28,7 @@ import java.util.function.Function; *
* *Assets are stored in a static, thread-safe list and can be retrieved - * through {@link AssetManager}.
+ * through {@link ResourceManager}. * *Features:
*Usage example:
*{@code
- * AssetLoader loader = new AssetLoader("assets");
+ * ResourceLoader loader = new ResourceLoader("assets");
* double progress = loader.getProgress();
* List> loadedAssets = loader.getAssets();
* }
*/
-public class AssetLoader {
- private static final Logger logger = LogManager.getLogger(AssetLoader.class);
- private static final List- * {@code AssetManager} maintains a thread-safe registry of {@link Asset} objects + * {@code ResourceManager} maintains a thread-safe registry of {@link Asset} objects * and provides utility methods to retrieve assets by name, ID, or type. - * It works together with {@link AssetLoader} to register assets automatically + * It works together with {@link ResourceLoader} to register assets automatically * when they are loaded from the file system. *
* @@ -25,47 +25,47 @@ import java.util.concurrent.ConcurrentHashMap; *Example usage:
*{@code
* // Load assets from a loader
- * AssetLoader loader = new AssetLoader(new File("RootFolder"));
- * AssetManager.loadAssets(loader);
+ * ResourceLoader loader = new ResourceLoader(new File("RootFolder"));
+ * ResourceManager.loadAssets(loader);
*
* // Retrieve a single resource
- * ImageAsset background = AssetManager.get("background.jpg");
+ * ImageAsset background = ResourceManager.get("background.jpg");
*
* // Retrieve all fonts
- * List> fonts = AssetManager.getAllOfType(FontAsset.class);
+ * List> fonts = ResourceManager.getAllOfType(FontAsset.class);
*
* // Retrieve by asset name or optional lookup
- * Optional> maybeAsset = AssetManager.findByName("menu.css");
+ * Optional> maybeAsset = ResourceManager.findByName("menu.css");
* }
*
* Notes:
*Implementing classes allow an {@link org.toop.framework.asset.AssetLoader} + *
Implementing classes allow an {@link ResourceLoader} * to automatically merge multiple related files into a single resource instance.
* *Typical use cases include:
diff --git a/framework/src/main/java/org/toop/framework/asset/resources/FileExtension.java b/framework/src/main/java/org/toop/framework/asset/types/FileExtension.java similarity index 85% rename from framework/src/main/java/org/toop/framework/asset/resources/FileExtension.java rename to framework/src/main/java/org/toop/framework/asset/types/FileExtension.java index 1beb405..b3c42d5 100644 --- a/framework/src/main/java/org/toop/framework/asset/resources/FileExtension.java +++ b/framework/src/main/java/org/toop/framework/asset/types/FileExtension.java @@ -1,4 +1,7 @@ -package org.toop.framework.asset.resources; +package org.toop.framework.asset.types; + +import org.toop.framework.asset.ResourceLoader; +import org.toop.framework.asset.resources.BaseResource; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -9,7 +12,7 @@ import java.lang.annotation.ElementType; * Annotation to declare which file extensions a {@link BaseResource} subclass * can handle. * - *This annotation is processed by the {@link org.toop.framework.asset.AssetLoader} + *
This annotation is processed by the {@link ResourceLoader} * to automatically register resource types for specific file extensions. * Each extension listed will be mapped to the annotated resource class, * allowing the loader to instantiate the correct type when scanning files.
diff --git a/framework/src/main/java/org/toop/framework/asset/resources/LoadableResource.java b/framework/src/main/java/org/toop/framework/asset/types/LoadableResource.java similarity index 92% rename from framework/src/main/java/org/toop/framework/asset/resources/LoadableResource.java rename to framework/src/main/java/org/toop/framework/asset/types/LoadableResource.java index 69374f7..d25ba9e 100644 --- a/framework/src/main/java/org/toop/framework/asset/resources/LoadableResource.java +++ b/framework/src/main/java/org/toop/framework/asset/types/LoadableResource.java @@ -1,4 +1,6 @@ -package org.toop.framework.asset.resources; +package org.toop.framework.asset.types; + +import org.toop.framework.asset.ResourceLoader; /** * Represents a resource that can be explicitly loaded and unloaded. @@ -40,7 +42,7 @@ package org.toop.framework.asset.resources; * } * *This interface is commonly used with {@link PreloadResource} to allow automatic - * loading by an {@link org.toop.framework.asset.AssetLoader} if desired.
+ * loading by an {@link ResourceLoader} if desired. */ public interface LoadableResource { /** diff --git a/framework/src/main/java/org/toop/framework/asset/resources/PreloadResource.java b/framework/src/main/java/org/toop/framework/asset/types/PreloadResource.java similarity index 87% rename from framework/src/main/java/org/toop/framework/asset/resources/PreloadResource.java rename to framework/src/main/java/org/toop/framework/asset/types/PreloadResource.java index 6458751..07d213d 100644 --- a/framework/src/main/java/org/toop/framework/asset/resources/PreloadResource.java +++ b/framework/src/main/java/org/toop/framework/asset/types/PreloadResource.java @@ -1,13 +1,15 @@ -package org.toop.framework.asset.resources; +package org.toop.framework.asset.types; + +import org.toop.framework.asset.ResourceLoader; /** - * Marker interface for resources that should be **automatically loaded** by the {@link org.toop.framework.asset.AssetLoader}. + * Marker interface for resources that should be **automatically loaded** by the {@link ResourceLoader}. * *Extends {@link LoadableResource}, so any implementing class must provide the standard * {@link LoadableResource#load()} and {@link LoadableResource#unload()} methods, as well as the * {@link LoadableResource#isLoaded()} check.
* - *When a resource implements {@code PreloadResource}, the {@code AssetLoader} will invoke + *
When a resource implements {@code PreloadResource}, the {@code ResourceLoader} will invoke * {@link LoadableResource#load()} automatically after the resource is discovered and instantiated, * without requiring manual loading by the user.
* diff --git a/framework/src/main/java/org/toop/framework/audio/SoundManager.java b/framework/src/main/java/org/toop/framework/audio/SoundManager.java index 6a508cc..ed71388 100644 --- a/framework/src/main/java/org/toop/framework/audio/SoundManager.java +++ b/framework/src/main/java/org/toop/framework/audio/SoundManager.java @@ -1,15 +1,15 @@ package org.toop.framework.audio; -import javafx.application.Platform; -import javafx.scene.media.MediaPlayer; import org.toop.framework.SnowflakeGenerator; -import org.toop.framework.asset.Asset; -import org.toop.framework.asset.AssetManager; +import org.toop.framework.asset.ResourceManager; +import org.toop.framework.asset.ResourceMeta; import org.toop.framework.asset.resources.MusicAsset; import org.toop.framework.asset.resources.SoundEffectAsset; import org.toop.framework.audio.events.AudioEvents; import org.toop.framework.eventbus.EventFlow; +import javafx.scene.media.MediaPlayer; + import java.io.*; import java.util.*; import javax.sound.sampled.*; @@ -25,7 +25,7 @@ public class SoundManager { public SoundManager() { // Get all Audio Resources and add them to a list. - for (Asset