Improvements

Author: aromaa

src/main/java/org/spongepowered/api/command/parameter/managed/ValueCompleter.java

@@ -26,6 +26,7 @@
 
 import org.spongepowered.api.command.CommandCompletion;
 import org.spongepowered.api.command.parameter.CommandContext;
+import org.spongepowered.api.registry.RegistryHolder;
 
 import java.util.List;
 
@@ -46,4 +47,14 @@ public interface ValueCompleter {
      */
     List<CommandCompletion> complete(CommandContext context, String currentInput);
 
+    /**
+     * Creates a new {@link ValueCompleter} that is bound to
+     * a specific {@link RegistryHolder registry holder}.
+     *
+     * @param registryHolder The owning {@link RegistryHolder registry holder}.
+     * @return The bound {@link ValueCompleter}.
+     */
+    default ValueCompleter bind(RegistryHolder registryHolder) {
+        return this;
+    }
 }

src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java

@@ -55,6 +55,11 @@ default String usage(@NonNull final String key) {
         return key;
     }
 
+    @Override
+    default ValueParameter<T> bind(RegistryHolder registryHolder) {
+        return this;
+    }
+
     /**
      * A {@link ValueParameter} that does not rely on the {@link CommandContext}
      * or {@link Parameter.Key} to parse its results.
@@ -119,24 +124,4 @@ default List<CommandCompletion> complete(final CommandContext context, final Str
         }
 
     }
-
-    /**
-     * A {@link ValueParameter} that relies on registry data
-     * and is unable to parse its results until it has been
-     * bound.
-     *
-     * @param <T> The type of object that is returned from the
-     *            {@link ValueParser} upon successful parsing.
-     */
-    interface Bindable<T> extends ValueParameter<T> {
-
-        /**
-         * Creates a new {@link ValueParameter} that is bound to
-         * a specific {@link RegistryHolder registry holder}.
-         *
-         * @param registryHolder The owning {@link RegistryHolder registry holder}.
-         * @return The bound {@link ValueParameter}.
-         */
-        ValueParameter<T> bind(RegistryHolder registryHolder);
-    }
 }

src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameterModifier.java

@@ -32,6 +32,7 @@
 import org.spongepowered.api.command.parameter.ArgumentReader;
 import org.spongepowered.api.command.parameter.CommandContext;
 import org.spongepowered.api.command.parameter.Parameter;
+import org.spongepowered.api.registry.RegistryHolder;
 
 import java.util.List;
 import java.util.Optional;
@@ -146,4 +147,14 @@ default List<CommandCompletion> modifyCompletion(
         return exceptionMessage;
     }
 
+    /**
+     * Creates a new {@link ValueParameterModifier} that is bound to
+     * a specific {@link RegistryHolder registry holder}.
+     *
+     * @param registryHolder The owning {@link RegistryHolder registry holder}.
+     * @return The bound {@link ValueParameterModifier}.
+     */
+    default ValueParameterModifier<T> bind(RegistryHolder registryHolder) {
+        return this;
+    }
 }

src/main/java/org/spongepowered/api/command/parameter/managed/ValueParser.java

@@ -32,6 +32,7 @@
 import org.spongepowered.api.command.parameter.managed.clientcompletion.ClientCompletionType;
 import org.spongepowered.api.command.parameter.managed.clientcompletion.ClientCompletionTypes;
 import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.registry.RegistryHolder;
 
 import java.util.Collections;
 import java.util.List;
@@ -113,4 +114,14 @@ default List<ClientCompletionType> clientCompletionType() {
         return Collections.emptyList();
     }
 
+    /**
+     * Creates a new {@link ValueParser} that is bound to
+     * a specific {@link RegistryHolder registry holder}.
+     *
+     * @param registryHolder The owning {@link RegistryHolder registry holder}.
+     * @return The bound {@link ValueParser}.
+     */
+    default ValueParser<T> bind(RegistryHolder registryHolder) {
+        return this;
+    }
 }

src/main/java/org/spongepowered/api/event/lifecycle/RegisterCommandEvent.java

@@ -29,6 +29,7 @@
 import org.spongepowered.api.command.manager.CommandMapping;
 import org.spongepowered.api.command.registrar.CommandRegistrar;
 import org.spongepowered.api.event.GenericEvent;
+import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.eventgen.annotations.NoFactoryMethod;
 import org.spongepowered.plugin.PluginContainer;
 
@@ -64,6 +65,13 @@
 @NoFactoryMethod
 public interface RegisterCommandEvent<C> extends GenericEvent<C>, LifecycleEvent {
 
+    /**
+     * Gets the owning {@link RegistryHolder registry holder}.
+     *
+     * @return The registry holder.
+     */
+    RegistryHolder registryHolder();
+
     /**
      * Registers a command with the appropriate {@link CommandRegistrar}.
      *

src/main/java/org/spongepowered/api/world/server/WorldManager.java

@@ -120,17 +120,18 @@ default List<ResourceKey> offlineWorldKeys() {
     /**
      * Loads a {@link ServerWorld world} by a {@link ResourceKey key}.
      *
-     * <p>If a world with the given name is already loaded then it is returned instead.</p>
+     * <p>If a world with the given name is already loaded, the operation fails.</p>
      *
      * @param key The key
-     * @return The world, if found.
+     * @return The world, if loaded.
      */
-    CompletableFuture<Optional<ServerWorld>> loadWorld(ResourceKey key);
+    default CompletableFuture<Optional<ServerWorld>> loadWorld(ResourceKey key) {
+        return this.loadWorld(key, ServerWorldProperties.LoadOptions.load());
+    }
 
     /**
-     * Loads a {@link ServerWorld world} by a {@link ResourceKey key}.
-     *
-     * <p>If a world with the given name is already loaded then it is returned instead.</p>
+     * Loads a {@link ServerWorld world} by a {@link ResourceKey key}
+     * with the provided {@link ServerWorldProperties.LoadOptions load options}.
      *
      * @param key The key
      * @param propertiesLoadOptions The options used to load the {@link ServerWorldProperties properties}.
@@ -161,19 +162,20 @@ default List<ResourceKey> offlineWorldKeys() {
     CompletableFuture<Boolean> unloadWorld(ServerWorld world);
 
     /**
-     * Loads an offline {@link ServerWorldProperties properties}.
+     * Loads the {@link ServerWorldProperties properties}.
      *
      * <p>It is left up to the implementation on what conditions cause a failure of loading properties.</p>
      *
      * @param key The key
      * @return The properties
      */
-    CompletableFuture<Optional<ServerWorldProperties>> loadProperties(ResourceKey key);
+    default CompletableFuture<Optional<ServerWorldProperties>> loadProperties(ResourceKey key) {
+        return this.loadProperties(key, ServerWorldProperties.LoadOptions.load());
+    }
 
     /**
-     * Loads an offline {@link ServerWorldProperties properties}.
-     *
-     * <p>It is left up to the implementation on what conditions cause a failure of loading properties.</p>
+     * Loads the {@link ServerWorldProperties properties} with
+     * the provided {@link ServerWorldProperties.LoadOptions load options}.
      *
      * @param key The key
      * @param propertiesLoadOptions The options used to load the {@link ServerWorldProperties properties}.