Finally remove GameRegistry

- RecipeRegistry -> RecipeManager
- RecipeManager appropriately server scoped now
- Remove AdventureRegistry, Kyori advises this is un-necessary as their
libraries code and documentation will show that, if desired, collections
of their content are able to be queried in INDEX classes. Basically,
this is an Adventure lib issue, not Sponge issue

Signed-off-by: Chris Sanders <[email protected]>

Author: Zidane

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

@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 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;
 import org.spongepowered.api.data.persistence.DataBuilder;
@@ -35,8 +35,6 @@
 import org.spongepowered.api.plugin.PluginManager;
 import org.spongepowered.api.registry.BuilderProvider;
 import org.spongepowered.api.registry.FactoryProvider;
-import org.spongepowered.api.registry.GameRegistry;
-import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.registry.ScopedRegistryHolder;
 import org.spongepowered.api.scheduler.Scheduler;
 import org.spongepowered.api.service.ServiceProvider;
@@ -96,7 +94,7 @@ public interface Game extends ScopedRegistryHolder {
      * @param locale The locale to lookup (e.g. {@code en_US}.
      * @return The locale
      */
-    Locale locale(String locale);
+    Locale locale(@NonNull String locale);
 
     /**
      * Returns if the {@link Client} is available for use. The result of this method is entirely
@@ -126,13 +124,6 @@ default Client client() {
      */
     Platform platform();
 
-    /**
-     * Gets the {@link GameRegistry}.
-     *
-     * @return The game registry
-     */
-    GameRegistry registry();
-
     /**
      * Retrieves the {@link BuilderProvider}.
      *

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

@@ -34,6 +34,7 @@
 import org.spongepowered.api.entity.living.player.gamemode.GameMode;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
+import org.spongepowered.api.item.recipe.RecipeManager;
 import org.spongepowered.api.map.MapStorage;
 import org.spongepowered.api.network.ServerSideConnection;
 import org.spongepowered.api.profile.GameProfileManager;
@@ -67,6 +68,13 @@ public interface Server extends ForwardingAudience, Engine, LocaleSource {
      */
     WorldManager worldManager();
 
+    /**
+     * Retrieves the {@link RecipeManager}.
+     *
+     * @return The recipe manager
+     */
+    RecipeManager recipeManager();
+
     /**
      * Gets if multiple {@link ServerWorld worlds} will be loaded by the server.
      *

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

@@ -25,14 +25,14 @@
 package org.spongepowered.api;
 
 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;
 import org.spongepowered.api.event.lifecycle.LifecycleEvent;
 import org.spongepowered.api.network.channel.ChannelRegistry;
 import org.spongepowered.api.plugin.PluginManager;
-import org.spongepowered.api.registry.GameRegistry;
 import org.spongepowered.api.scheduler.Scheduler;
 import org.spongepowered.api.service.ServiceProvider;
 import org.spongepowered.api.sql.SqlManager;
@@ -44,7 +44,7 @@
  */
 public final class Sponge {
 
-    @Inject private static Game game;
+    @Inject private @Nullable static Game game;
 
     /**
      * Gets the {@link Game} instance. There is ever only going
@@ -69,15 +69,6 @@ public static Platform platform() {
         return Sponge.game().platform();
     }
 
-    /**
-     * Gets the {@link GameRegistry} instance.
-     *
-     * @return The game registry instance
-     */
-    public static GameRegistry registry() {
-        return Sponge.game().registry();
-    }
-
     /**
      * Gets the {@link DataManager} instance.
      *

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

@@ -36,12 +36,12 @@
 import java.util.function.Supplier;
 
 /**
- * A registry holds all registered recipes for a given game.
+ * Manages registered recipes.
  * Register new Recipes during {@link org.spongepowered.api.event.lifecycle.RegisterDataPackValueEvent}
  * using {@link RecipeRegistration}s.
  * To disable a recipe override it with an empty result.
  */
-public interface RecipeRegistry {
+public interface RecipeManager {
 
     /**
      * Gets a recipe by its {@link ResourceKey key}.