Merge branch 'api-8' into api-9

Author: dualspiral

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

@@ -26,8 +26,15 @@
 
 import org.spongepowered.api.event.CauseStackManager;
 import org.spongepowered.api.registry.RegistryHolder;
+import org.spongepowered.api.resource.Resource;
+import org.spongepowered.api.resource.ResourceManager;
+import org.spongepowered.api.resource.pack.Pack;
+import org.spongepowered.api.resource.pack.PackContents;
+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.
  */
@@ -48,6 +55,16 @@ public interface Engine extends RegistryHolder {
      */
     CauseStackManager causeStackManager();
 
+    /**
+     * @return The {@link PackRepository pack repository}
+     */
+    PackRepository packRepository();
+
+    /**
+     * @return The {@link ResourceManager resource manager}
+     */
+    ResourceManager resourceManager();
+
     /**
      * Gets the {@link Scheduler} used to schedule sync tasks on this {@link Engine}.
      *
@@ -61,4 +78,13 @@ public interface Engine extends RegistryHolder {
      * @return {@code true} if main thread, {@code false} if not
      */
     boolean onMainThread();
+
+    /**
+     * Rediscovers all {@link Resource resources} within all {@link Pack pack's} {@link PackContents contents}.
+     *
+     * <p>On the server, the future will always be completed.</p>
+     *
+     * @return A future that completes when reloading is complete
+     */
+    CompletableFuture<Void> reloadResources();
 }

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

@@ -25,7 +25,6 @@
 package org.spongepowered.api;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.spongepowered.api.asset.AssetManager;
 import org.spongepowered.api.config.ConfigManager;
 import org.spongepowered.api.data.DataManager;
 import org.spongepowered.api.data.persistence.DataBuilder;
@@ -160,13 +159,6 @@ default Client client() {
      */
     EventManager eventManager();
 
-    /**
-     * Gets the {@link AssetManager}.
-     *
-     * @return The asset manager
-     */
-    AssetManager assetManager();
-
     /**
      * Gets the {@link ConfigManager} used to load and manage configuration files
      * for plugins.
@@ -197,7 +189,7 @@ default Client client() {
      * @return The {@link SqlManager} instance.
      */
     SqlManager sqlManager();
-    
+
     /**
      * Gets the {@link ServiceProvider.GameScoped}, used to provide Sponge
      * services that plugins may provide. Services provided here are

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

@@ -26,7 +26,6 @@
 
 import com.google.inject.Inject;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.asset.AssetManager;
 import org.spongepowered.api.config.ConfigManager;
 import org.spongepowered.api.data.DataManager;
 import org.spongepowered.api.event.EventManager;
@@ -96,15 +95,6 @@ public static EventManager eventManager() {
         return Sponge.game().eventManager();
     }
 
-    /**
-     * Gets the {@link AssetManager} instance.
-     *
-     * @return The asset manager instance
-     */
-    public static AssetManager assetManager() {
-        return Sponge.game().assetManager();
-    }
-
     /**
      * Gets the {@link ConfigManager} used to load and manage configuration files
      * for plugins.

src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
@@ -74,6 +75,10 @@ public final class AdvancementTypes {
     private AdvancementTypes() {
     }
 
+    public static Registry<AdvancementType> registry() {
+        return Sponge.game().registry(RegistryTypes.ADVANCEMENT_TYPE);
+    }
+
     private static DefaultedRegistryReference<AdvancementType> key(final ResourceKey location) {
         return RegistryKey.of(RegistryTypes.ADVANCEMENT_TYPE, location).asDefaultedReference(Sponge::game);
     }

src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
@@ -134,6 +135,10 @@ public final class Triggers {
     private Triggers() {
     }
 
+    public static Registry<Trigger<?>> registry() {
+        return Sponge.game().registry(RegistryTypes.TRIGGER);
+    }
+
     private static DefaultedRegistryReference<Trigger<?>> key(final ResourceKey location) {
         return RegistryKey.of(RegistryTypes.TRIGGER, location).asDefaultedReference(Sponge::game);
     }

src/main/java/org/spongepowered/api/adventure/ResolveOperations.java

@@ -28,6 +28,7 @@
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
@@ -73,6 +74,10 @@ public class ResolveOperations {
     private ResolveOperations() {
     }
 
+    public static Registry<ResolveOperation> registry() {
+        return Sponge.game().registry(RegistryTypes.RESOLVE_OPERATION);
+    }
+
     private static DefaultedRegistryReference<ResolveOperation> key(final ResourceKey location) {
         return RegistryKey.of(RegistryTypes.RESOLVE_OPERATION, location).asDefaultedReference(Sponge::game);
     }

src/main/java/org/spongepowered/api/asset/Asset.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
@@ -1840,6 +1841,10 @@ public final class BlockTypes {
     private BlockTypes() {
     }
 
+    public static Registry<BlockType> registry() {
+        return Sponge.game().registry(RegistryTypes.BLOCK_TYPE);
+    }
+
     private static DefaultedRegistryReference<BlockType> key(final ResourceKey location) {
         return RegistryKey.of(RegistryTypes.BLOCK_TYPE, location).asDefaultedReference(Sponge::game);
     }