Merge branch 'api-8' into api-9

Author: zml2008

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

@@ -24,19 +24,17 @@
  */
 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;
 import org.spongepowered.api.data.persistence.DataSerializable;
 import org.spongepowered.api.event.EventManager;
-import org.spongepowered.api.network.channel.ChannelRegistry;
+import org.spongepowered.api.network.channel.ChannelManager;
 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}.
      *
@@ -185,11 +176,11 @@ default Client client() {
     ConfigManager configManager();
 
     /**
-     * Gets the {@link ChannelRegistry} for creating network channels.
+     * Gets the {@link ChannelManager} for creating network channels.
      *
-     * @return The channel registry
+     * @return The channel manager
      */
-    ChannelRegistry channelRegistry();
+    ChannelManager channelManager();
 
     /**
      * Gets the {@link MetricsConfigManager} instance, allowing data/metric gathering

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.network.channel.ChannelManager;
 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.
      *
@@ -125,12 +116,12 @@ public static ConfigManager configManager() {
     }
 
     /**
-     * Gets the {@link ChannelRegistry} for creating network channels.
+     * Gets the {@link ChannelManager} for creating network channels.
      *
      * @return The channel registry
      */
-    public static ChannelRegistry channelRegistry() {
-        return Sponge.game().channelRegistry();
+    public static ChannelManager channelManager() {
+        return Sponge.game().channelManager();
     }
 
     /**

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

@@ -87,6 +87,11 @@ public final class Queries {
     public static final DataQuery UUID_MOST = of("UuidMost");
     public static final DataQuery POSITION = of("Pos");
 
+    // ProfileProperty
+    public static final DataQuery PROPERTY_NAME = of("name");
+    public static final DataQuery PROPERTY_VALUE = of("value");
+    public static final DataQuery PROPERTY_SIGNATURE = of("signature");
+
     // Suppress default constructor to ensure non-instantiability.
     private Queries() {
         throw new AssertionError("You should not be attempting to instantiate this class.");

src/main/java/org/spongepowered/api/data/persistence/Queries.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}.

…ered/api/item/recipe/RecipeRegistry.java …wered/api/item/recipe/RecipeManager.javasrc/main/java/org/spongepowered/api/item/recipe/RecipeRegistry.java renamed to src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java src/main/java/org/spongepowered/api/item/recipe/RecipeRegistry.java renamed to src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java

@@ -28,17 +28,17 @@
 import org.spongepowered.api.network.EngineConnection;
 
 /**
- * Represents a network channel bound to a {@link ChannelRegistry}. The channel
+ * Represents a network channel bound to a {@link ChannelManager}. The channel
  * can be used to send and receive data.
  */
 public interface Channel {
 
     /**
-     * Gets the registrar that this channel is bound to.
+     * Gets the manager that this channel is bound to.
      *
-     * @return The registrar
+     * @return The manager
      */
-    ChannelRegistry registry();
+    ChannelManager manager();
 
     /**
      * Gets this channel's bound key.

src/main/java/org/spongepowered/api/network/channel/Channel.java

@@ -31,10 +31,10 @@
 import java.util.Optional;
 
 /**
- * A registry handling custom payloads via {@link Channel}s to and from
+ * A manager handling custom payloads via {@link Channel}s to and from
  * {@link EngineConnection}s.
  */
-public interface ChannelRegistry {
+public interface ChannelManager {
 
     /**
      * Gets a channel binding if a channel exists for the given key.

…api/network/channel/ChannelRegistry.java …/api/network/channel/ChannelManager.javasrc/main/java/org/spongepowered/api/network/channel/ChannelRegistry.java renamed to src/main/java/org/spongepowered/api/network/channel/ChannelManager.java src/main/java/org/spongepowered/api/network/channel/ChannelRegistry.java renamed to src/main/java/org/spongepowered/api/network/channel/ChannelManager.java

@@ -36,7 +36,9 @@
 /**
  * Represents a property in a {@link GameProfile}'s profile property map.
  *
- * <p>This interface should not be implemented.</p>
+ * <p>This interface should not be implemented by third parties - use
+ * {@link #of(String, String)} or {@link #of(String, String, String)} to
+ * create instances instead.</p>
  *
  * @see #of(String, String)
  * @see #of(String, String, String)