Update impl for command interface renames

SpongePowered · May 3, 2021 · 1d1e7f7 · 1d1e7f7
1 parent 1e6f7a3
commit 1d1e7f7
Show file tree

Hide file tree

Showing 18 changed files with 112 additions and 113 deletions.
diff --git a/SpongeAPI b/SpongeAPI
diff --git a/...java/org/spongepowered/common/command/registrar/tree/builder/AbstractCommandTreeNode.java b/...java/org/spongepowered/common/command/registrar/tree/builder/AbstractCommandTreeNode.java
@@ -33,7 +33,7 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.command.CommandCause;
-import org.spongepowered.api.command.registrar.tree.ClientSuggestionProvider;
+import org.spongepowered.api.command.registrar.tree.CommandCompletionProvider;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.command.brigadier.tree.ForcedRedirectNode;
 
@@ -50,7 +50,7 @@ public abstract class AbstractCommandTreeNode<T extends CommandTreeNode<@NonNull
     private @Nullable CommandTreeNode<?> redirect = null;
     private @Nullable Map<String, AbstractCommandTreeNode<?, ?>> children = null;
     private boolean executable = false;
-    private @Nullable ClientSuggestionProvider suggestionProvider = null;
+    private @Nullable CommandCompletionProvider suggestionProvider = null;
     private Predicate<CommandCause> requirement = c -> true;
 
     public ImmutableMap<String, AbstractCommandTreeNode<?, ?>> getChildren() {
@@ -93,14 +93,14 @@ public abstract class AbstractCommandTreeNode<T extends CommandTreeNode<@NonNull
     }
 
     @Override
-    public @NonNull T suggestions(final @Nullable ClientSuggestionProvider suggestionProvider) {
+    public @NonNull T completions(final @Nullable CommandCompletionProvider suggestionProvider) {
         this.suggestionProvider = suggestionProvider;
         return this.getThis();
     }
 
     @Override
-    public @NonNull T customSuggestions() {
-        return this.suggestions((ClientSuggestionProvider) SuggestionProviders.ASK_SERVER);
+    public @NonNull T customCompletions() {
+        return this.completions((CommandCompletionProvider) SuggestionProviders.ASK_SERVER);
     }
 
     @Override
@@ -124,11 +124,12 @@ public boolean isExecutable() {
         return this.executable;
     }
 
+    @SuppressWarnings("unchecked")
     public SuggestionProvider<SharedSuggestionProvider> suggestionProvider() {
         return (SuggestionProvider<SharedSuggestionProvider>) this.suggestionProvider;
     }
 
-    public @Nullable CommandTreeNode<?> getRedirect() {
+    public @Nullable CommandTreeNode<@NonNull ?> getRedirect() {
         return this.redirect;
     }
 

diff --git a/...n/java/org/spongepowered/common/command/registrar/tree/builder/AmountCommandTreeNode.java b/...n/java/org/spongepowered/common/command/registrar/tree/builder/AmountCommandTreeNode.java
@@ -25,7 +25,7 @@
 package org.spongepowered.common.command.registrar.tree.builder;
 
 import com.mojang.brigadier.arguments.ArgumentType;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 
 public final class AmountCommandTreeNode extends ArgumentCommandTreeNode<CommandTreeNode.Amount> implements CommandTreeNode.Amount {
@@ -34,7 +34,7 @@ public final class AmountCommandTreeNode extends ArgumentCommandTreeNode<Command
     private final ArgumentType<?> ifMultiple;
     private boolean single;
 
-    public AmountCommandTreeNode(final ClientCompletionKey<CommandTreeNode.Amount> parameterType,
+    public AmountCommandTreeNode(final CommandTreeNodeType<Amount> parameterType,
             final ArgumentType<?> ifSingle,
             final ArgumentType<?> ifMultiple) {
         super(parameterType);

diff --git a/...java/org/spongepowered/common/command/registrar/tree/builder/ArgumentCommandTreeNode.java b/...java/org/spongepowered/common/command/registrar/tree/builder/ArgumentCommandTreeNode.java
@@ -27,17 +27,16 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.SharedSuggestionProvider;
-import net.minecraft.commands.synchronization.SuggestionProviders;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.command.brigadier.tree.ForcedRedirectArgumentSuggestionNode;
 
 public abstract class ArgumentCommandTreeNode<T extends CommandTreeNode<T>>
         extends AbstractCommandTreeNode<T, CommandNode<SharedSuggestionProvider>> {
 
-    private final ClientCompletionKey<T> parameterType;
+    private final CommandTreeNodeType<T> parameterType;
 
-    public ArgumentCommandTreeNode(final ClientCompletionKey<T> parameterType) {
+    public ArgumentCommandTreeNode(final CommandTreeNodeType<T> parameterType) {
         this.parameterType = parameterType;
     }
 
@@ -53,7 +52,7 @@ protected CommandNode<SharedSuggestionProvider> createElement(final String nodeK
 
     protected abstract ArgumentType<?> getArgumentType();
 
-    public ClientCompletionKey<T> getClientCompletionKey() {
+    public CommandTreeNodeType<T> getClientCompletionKey() {
         return this.parameterType;
     }
 

diff --git a/...in/java/org/spongepowered/common/command/registrar/tree/builder/BasicCommandTreeNode.java b/...in/java/org/spongepowered/common/command/registrar/tree/builder/BasicCommandTreeNode.java
@@ -25,14 +25,14 @@
 package org.spongepowered.common.command.registrar.tree.builder;
 
 import com.mojang.brigadier.arguments.ArgumentType;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 
 public final class BasicCommandTreeNode extends ArgumentCommandTreeNode<CommandTreeNode.Basic> implements CommandTreeNode.Basic {
 
     private final ArgumentType<?> type;
 
-    public BasicCommandTreeNode(final ClientCompletionKey<Basic> parameterType, final ArgumentType<?> type) {
+    public BasicCommandTreeNode(final CommandTreeNodeType<Basic> parameterType, final ArgumentType<?> type) {
         super(parameterType);
         this.type = type;
     }

diff --git a/...n/java/org/spongepowered/common/command/registrar/tree/builder/EntityCommandTreeNode.java b/...n/java/org/spongepowered/common/command/registrar/tree/builder/EntityCommandTreeNode.java
@@ -28,7 +28,7 @@
 import net.minecraft.commands.arguments.EntityArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 
 // TODO
@@ -39,7 +39,7 @@ public final class EntityCommandTreeNode
     private boolean playersOnly = false;
     private boolean oneOnly = false;
 
-    public EntityCommandTreeNode(final @Nullable ClientCompletionKey<EntitySelection> parameterType) {
+    public EntityCommandTreeNode(final @Nullable CommandTreeNodeType<EntitySelection> parameterType) {
         super(parameterType);
     }
 

diff --git a/...in/java/org/spongepowered/common/command/registrar/tree/builder/RangeCommandTreeNode.java b/...in/java/org/spongepowered/common/command/registrar/tree/builder/RangeCommandTreeNode.java
@@ -27,10 +27,9 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
@@ -44,7 +43,7 @@ public final class RangeCommandTreeNode<T extends Number>
     private final BiFunction<T, T, ArgumentType<?>> typeCreator;
 
     public RangeCommandTreeNode(
-            final ClientCompletionKey<Range<T>> parameterType,
+            final CommandTreeNodeType<Range<T>> parameterType,
             final BiFunction<T, T, ArgumentType<?>> typeCreator,
             final T defaultMin,
             final T defaultMax) {

diff --git a/...n/java/org/spongepowered/common/command/registrar/tree/builder/StringCommandTreeNode.java b/...n/java/org/spongepowered/common/command/registrar/tree/builder/StringCommandTreeNode.java
@@ -27,14 +27,14 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 
 public final class StringCommandTreeNode extends ArgumentCommandTreeNode<CommandTreeNode.StringParser> implements CommandTreeNode.StringParser {
 
     private Types type = Types.PHRASE;
 
-    public StringCommandTreeNode(final ClientCompletionKey<@NonNull StringParser> parameterType) {
+    public StringCommandTreeNode(final CommandTreeNodeType<@NonNull StringParser> parameterType) {
         super(parameterType);
     }
 

diff --git a/.../key/SpongeAmountClientCompletionKey.java → .../key/SpongeAmountCommandTreeNodeType.java b/.../key/SpongeAmountClientCompletionKey.java → .../key/SpongeAmountCommandTreeNodeType.java
@@ -27,17 +27,17 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.AbstractResourceKeyed;
 import org.spongepowered.common.command.registrar.tree.builder.AmountCommandTreeNode;
 
-public final class SpongeAmountClientCompletionKey extends AbstractResourceKeyed implements ClientCompletionKey<CommandTreeNode.@NonNull Amount> {
+public final class SpongeAmountCommandTreeNodeType extends AbstractResourceKeyed implements CommandTreeNodeType<CommandTreeNode.@NonNull Amount> {
 
     private final ArgumentType<?> ifSingle;
     private final ArgumentType<?> ifMultiple;
 
-    public SpongeAmountClientCompletionKey(final ResourceKey key, final ArgumentType<?> ifSingle, final ArgumentType<?> ifMultiple) {
+    public SpongeAmountCommandTreeNodeType(final ResourceKey key, final ArgumentType<?> ifSingle, final ArgumentType<?> ifMultiple) {
         super(key);
 
         this.ifSingle = ifSingle;

diff --git a/...e/key/SpongeBasicClientCompletionKey.java → ...e/key/SpongeBasicCommandTreeNodeType.java b/...e/key/SpongeBasicClientCompletionKey.java → ...e/key/SpongeBasicCommandTreeNodeType.java
@@ -27,16 +27,16 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.AbstractResourceKeyed;
 import org.spongepowered.common.command.registrar.tree.builder.BasicCommandTreeNode;
 
-public final class SpongeBasicClientCompletionKey extends AbstractResourceKeyed implements ClientCompletionKey<CommandTreeNode.@NonNull Basic> {
+public final class SpongeBasicCommandTreeNodeType extends AbstractResourceKeyed implements CommandTreeNodeType<CommandTreeNode.@NonNull Basic> {
 
     private final ArgumentType<?> argumentType;
 
-    public SpongeBasicClientCompletionKey(final ResourceKey key, final ArgumentType<?> argumentType) {
+    public SpongeBasicCommandTreeNodeType(final ResourceKey key, final ArgumentType<?> argumentType) {
         super(key);
 
         this.argumentType = argumentType;

diff --git a/.../key/SpongeEntityClientCompletionKey.java → .../key/SpongeEntityCommandTreeNodeType.java b/.../key/SpongeEntityClientCompletionKey.java → .../key/SpongeEntityCommandTreeNodeType.java
@@ -26,15 +26,15 @@
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.command.registrar.tree.builder.EntityCommandTreeNode;
 
-public final class SpongeEntityClientCompletionKey implements ClientCompletionKey<CommandTreeNode.EntitySelection> {
+public final class SpongeEntityCommandTreeNodeType implements CommandTreeNodeType<CommandTreeNode.EntitySelection> {
 
     private final ResourceKey key;
 
-    public SpongeEntityClientCompletionKey(final ResourceKey key) {
+    public SpongeEntityCommandTreeNodeType(final ResourceKey key) {
         this.key = key;
     }
 

diff --git a/...e/key/SpongeRangeClientCompletionKey.java → ...e/key/SpongeRangeCommandTreeNodeType.java b/...e/key/SpongeRangeClientCompletionKey.java → ...e/key/SpongeRangeCommandTreeNodeType.java
@@ -32,7 +32,7 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.AbstractResourceKeyed;
 import org.spongepowered.common.command.registrar.tree.builder.RangeCommandTreeNode;
@@ -44,20 +44,20 @@
 import net.minecraft.commands.synchronization.brigadier.IntegerArgumentSerializer;
 import net.minecraft.commands.synchronization.brigadier.LongArgumentSerializer;
 
-public final class SpongeRangeClientCompletionKey<N extends Number> extends AbstractResourceKeyed implements ClientCompletionKey<CommandTreeNode.@NonNull Range<@NonNull N>> {
+public final class SpongeRangeCommandTreeNodeType<N extends Number> extends AbstractResourceKeyed implements CommandTreeNodeType<CommandTreeNode.@NonNull Range<@NonNull N>> {
 
-    public static @Nullable SpongeRangeClientCompletionKey<?> createFrom(final ResourceKey key, final ArgumentSerializer<?> serializer) {
+    public static @Nullable SpongeRangeCommandTreeNodeType<?> createFrom(final ResourceKey key, final ArgumentSerializer<?> serializer) {
         if (serializer instanceof FloatArgumentSerializer) {
-            return new SpongeRangeClientCompletionKey<>(key, FloatArgumentType::floatArg, Float.MIN_VALUE, Float.MAX_VALUE);
+            return new SpongeRangeCommandTreeNodeType<>(key, FloatArgumentType::floatArg, Float.MIN_VALUE, Float.MAX_VALUE);
         }
         if (serializer instanceof DoubleArgumentSerializer) {
-            return new SpongeRangeClientCompletionKey<>(key, DoubleArgumentType::doubleArg, Double.MIN_VALUE, Double.MAX_VALUE);
+            return new SpongeRangeCommandTreeNodeType<>(key, DoubleArgumentType::doubleArg, Double.MIN_VALUE, Double.MAX_VALUE);
         }
         if (serializer instanceof IntegerArgumentSerializer) {
-            return new SpongeRangeClientCompletionKey<>(key, IntegerArgumentType::integer, Integer.MIN_VALUE, Integer.MAX_VALUE);
+            return new SpongeRangeCommandTreeNodeType<>(key, IntegerArgumentType::integer, Integer.MIN_VALUE, Integer.MAX_VALUE);
         }
         if (serializer instanceof LongArgumentSerializer) {
-            return new SpongeRangeClientCompletionKey<>(key, LongArgumentType::longArg, Long.MIN_VALUE, Long.MAX_VALUE);
+            return new SpongeRangeCommandTreeNodeType<>(key, LongArgumentType::longArg, Long.MIN_VALUE, Long.MAX_VALUE);
         }
         return null;
     }
@@ -66,7 +66,7 @@ public final class SpongeRangeClientCompletionKey<N extends Number> extends Abst
     private final N min;
     private final N max;
 
-    private SpongeRangeClientCompletionKey(final ResourceKey key, final BiFunction<N, N, ArgumentType<?>> typeCreator, final N min, final N max) {
+    private SpongeRangeCommandTreeNodeType(final ResourceKey key, final BiFunction<N, N, ArgumentType<?>> typeCreator, final N min, final N max) {
         super(key);
 
         this.typeCreator = typeCreator;

diff --git a/.../key/SpongeStringClientCompletionKey.java → .../key/SpongeStringCommandTreeNodeType.java b/.../key/SpongeStringClientCompletionKey.java → .../key/SpongeStringCommandTreeNodeType.java
@@ -26,14 +26,14 @@
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.command.registrar.tree.ClientCompletionKey;
+import org.spongepowered.api.command.registrar.tree.CommandTreeNodeType;
 import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
 import org.spongepowered.common.AbstractResourceKeyed;
 import org.spongepowered.common.command.registrar.tree.builder.StringCommandTreeNode;
 
-public final class SpongeStringClientCompletionKey extends AbstractResourceKeyed implements ClientCompletionKey<CommandTreeNode.@NonNull StringParser> {
+public final class SpongeStringCommandTreeNodeType extends AbstractResourceKeyed implements CommandTreeNodeType<CommandTreeNode.@NonNull StringParser> {
 
-    public SpongeStringClientCompletionKey(final ResourceKey key) {
+    public SpongeStringCommandTreeNodeType(final ResourceKey key) {
         super(key);
     }
 

diff --git a/src/main/java/org/spongepowered/common/registry/SpongeRegistries.java b/src/main/java/org/spongepowered/common/registry/SpongeRegistries.java
@@ -39,9 +39,9 @@ public static void registerGlobalRegistries(final SpongeRegistryHolder holder) {
         holder.createRegistry(RegistryTypes.REGISTRY_KEYED_VALUE_PARAMETER, SpongeRegistryLoaders.valueParameter());
         holder.createRegistry(RegistryTypes.CLICK_TYPE, SpongeRegistryLoaders.clickType());
         holder.createRegistry(RegistryTypes.CAT_TYPE, SpongeRegistryLoaders.catType());
-        holder.createRegistry(RegistryTypes.CLIENT_COMPLETION_KEY, SpongeRegistryLoaders.clientCompletionKey());
+        holder.createRegistry(RegistryTypes.COMMAND_TREE_NODE_TYPE, SpongeRegistryLoaders.clientCompletionKey());
         holder.createRegistry(RegistryTypes.CLIENT_COMPLETION_TYPE, SpongeRegistryLoaders.clientCompletionType());
-        holder.createRegistry(RegistryTypes.CLIENT_SUGGESTION_PROVIDER, SpongeRegistryLoaders.clientSuggestionProvider());
+        holder.createRegistry(RegistryTypes.COMMAND_COMPLETION_PROVIDER, SpongeRegistryLoaders.clientSuggestionProvider());
         holder.createRegistry(RegistryTypes.COMMAND_REGISTRAR_TYPE, SpongeRegistryLoaders.commandRegistrarType(), true);
         holder.createRegistry(RegistryTypes.CURRENCY, (RegistryLoader<Currency>) null, true);
         holder.createRegistry(RegistryTypes.DAMAGE_TYPE, SpongeRegistryLoaders.damageType());