[API8] Add datapack support

build.gradle

@@ -175,6 +175,7 @@ sortClassFields {
     add 'main', 'org.spongepowered.api.item.inventory.equipment.EquipmentTypes'
     add 'main', 'org.spongepowered.api.item.inventory.query.QueryOperationTypes'
     add 'main', 'org.spongepowered.api.item.potion.PotionTypes'
+    add 'main', 'org.spongepowered.api.resource.pack.PackTypes'
     add 'main', 'org.spongepowered.api.scoreboard.CollisionRules'
     add 'main', 'org.spongepowered.api.scoreboard.Visibilities'
     add 'main', 'org.spongepowered.api.scoreboard.criteria.Criteria'

src/main/java/org/spongepowered/api/Engine.java

@@ -25,8 +25,12 @@
 package org.spongepowered.api;
 
 import org.spongepowered.api.client.Client;
+import org.spongepowered.api.resource.ResourceManager;
+import org.spongepowered.api.resource.pack.PackRepository;
 import org.spongepowered.api.scheduler.Scheduler;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * Shared functionality between {@link Client} and {@link Server} engines.
  */
@@ -39,6 +43,29 @@ public interface Engine {
      */
     Scheduler getScheduler();
 
+    /**
+     * Gets the {@link ResourceManager} for the server instance. As of
+     * Minecraft 1.13 there is only one instance of the resource manager per
+     * server/client instance. It is not per-world.
+     *
+     * @return The resource manager
+     */
+    ResourceManager getResourceManager();
+
+    /**
+     * Gets the {@link PackRepository} for the game, which discovers and
+     * activates resource and data packs.
+     */
+    PackRepository getPackRepository();
+
+    /**
+     * Reloads resources from the {@link ResourceManager} using active packs
+     * from the {@link PackRepository}.
+     *
+     * @return The future when it will finish.
+     */
+    CompletableFuture<Void> reloadResources();
+
     /**
      * Checks if the {@link Thread#currentThread() current thread} is the main thread of the engine.
      *

src/main/java/org/spongepowered/api/Game.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api;
 
-import org.spongepowered.api.asset.AssetManager;
 import org.spongepowered.api.client.Client;
 import org.spongepowered.api.config.ConfigManager;
 import org.spongepowered.api.data.DataManager;
@@ -163,15 +162,6 @@ default EventManager getEventManager() {
         return Sponge.getEventManager();
     }
 
-    /**
-     * Gets the {@link AssetManager}.
-     *
-     * @return The asset manager
-     */
-    default AssetManager getAssetManager() {
-        return Sponge.getAssetManager();
-    }
-
     /**
      * Gets the {@link ConfigManager} used to load and manage configuration files
      * for plugins.

src/main/java/org/spongepowered/api/Sponge.java

@@ -28,7 +28,6 @@
 
 import com.google.inject.Inject;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.asset.AssetManager;
 import org.spongepowered.api.command.manager.CommandManager;
 import org.spongepowered.api.config.ConfigManager;
 import org.spongepowered.api.data.DataManager;
@@ -58,7 +57,6 @@ public final class Sponge {
     @Inject private static PropertyRegistry propertyRegistry;
     @Inject private static PluginManager pluginManager;
     @Inject private static EventManager eventManager;
-    @Inject private static AssetManager assetManager;
     @Inject private static ConfigManager configManager;
     @Inject private static ServiceManager serviceManager;
     @Inject private static ChannelRegistrar channelRegistrar;
@@ -140,15 +138,6 @@ public static EventManager getEventManager() {
         return check(eventManager);
     }
 
-    /**
-     * Gets the {@link AssetManager} instance.
-     *
-     * @return The asset manager instance
-     */
-    public static AssetManager getAssetManager() {
-        return check(assetManager);
-    }
-
     /**
      * Gets the {@link ConfigManager} used to load and manage configuration files
      * for plugins.

src/main/java/org/spongepowered/api/asset/AssetManager.java → src/main/java/org/spongepowered/api/event/resource/ResourceEvent.java

@@ -22,39 +22,34 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.asset;
+package org.spongepowered.api.event.resource;
 
-import org.spongepowered.api.plugin.Plugin;
-import org.spongepowered.api.plugin.PluginContainer;
-
-import java.util.Optional;
+import org.spongepowered.api.Engine;
+import org.spongepowered.api.event.Event;
+import org.spongepowered.api.resource.ResourceManager;
 
 /**
- * The AssetManager offers a convenient way to easily retrieve resources from
- * Sponge {@link Plugin}s. The asset manager will attempt to find the
- * asset of the specified name at: <code>assets/&lt;plugin_id&gt;</code>
+ * Base class for events related to resources.
  */
-public interface AssetManager {
+public interface ResourceEvent extends Event {
+
+    /**
+     * Gets the engine of the resources
+     * @return The engine
+     */
+    Engine getEngine();
 
     /**
-     * Returns the {@link Asset} of the specified name for the specified
-     * {@link Plugin} instance.
-     *
-     * @param plugin Plugin instance
-     * @param name Name of resource to retrieve
-     * @return Asset if present, empty otherwise
+     * Gets the {@link ResourceManager}.
+     * @return The resource manager
      */
-    Optional<Asset> getAsset(PluginContainer plugin, String name);
+    ResourceManager getResourceManager();
 
     /**
-     * Returns the {@link Asset} of the specified name within the domain of the
-     * implementation. This method will typically call
-     * {@link #getAsset(PluginContainer, String)} using a dummy
-     * {@link PluginContainer} for the SpongeAPI implementation.
-     *
-     * @param name Name of resource to retrieve
-     * @return Asset if present, empty otherwise
+     * Fired after a {@link ResourceManager} has been reloaded. This can be
+     * used to reload some systems that are resource based.
      */
-    Optional<Asset> getAsset(String name);
+    interface Reload extends ResourceEvent {
 
+    }
 }