Fix range client completions

SpongePowered · Apr 19, 2021 · b26dfc6 · b26dfc6
1 parent 0e33d58
commit b26dfc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/SpongeAPI b/SpongeAPI
diff --git a/src/main/java/org/spongepowered/common/registry/SpongeRegistryLoaders.java b/src/main/java/org/spongepowered/common/registry/SpongeRegistryLoaders.java
@@ -47,6 +47,10 @@
 import net.minecraft.commands.arguments.coordinates.Vec3Argument;
 import net.minecraft.commands.arguments.item.ItemArgument;
 import net.minecraft.commands.arguments.selector.EntitySelectorParser;
+import net.minecraft.commands.synchronization.brigadier.DoubleArgumentSerializer;
+import net.minecraft.commands.synchronization.brigadier.FloatArgumentSerializer;
+import net.minecraft.commands.synchronization.brigadier.IntegerArgumentSerializer;
+import net.minecraft.commands.synchronization.brigadier.LongArgumentSerializer;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.RecordItem;
@@ -202,6 +206,7 @@
 import org.spongepowered.common.command.registrar.tree.key.SpongeAmountClientCompletionKey;
 import org.spongepowered.common.command.registrar.tree.key.SpongeBasicClientCompletionKey;
 import org.spongepowered.common.command.registrar.tree.key.SpongeEntityClientCompletionKey;
+import org.spongepowered.common.command.registrar.tree.key.SpongeRangeClientCompletionKey;
 import org.spongepowered.common.command.registrar.tree.key.SpongeStringClientCompletionKey;
 import org.spongepowered.common.command.selector.SpongeSelectorSortAlgorithm;
 import org.spongepowered.common.command.selector.SpongeSelectorType;
@@ -441,17 +446,17 @@ public static RegistryLoader<ClientCompletionKey<?>> clientCompletionKey() {
             l.add(ClientCompletionKeys.COLOR, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.COMPONENT, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.DIMENSION, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
-            l.add(ClientCompletionKeys.DOUBLE, k -> new SpongeBasicClientCompletionKey(k, DoubleArgumentType.doubleArg()));
+            l.add(ClientCompletionKeys.DOUBLE, k -> SpongeRangeClientCompletionKey.createFrom(k, new DoubleArgumentSerializer()));
             l.add(ClientCompletionKeys.ENTITY, SpongeEntityClientCompletionKey::new);
             l.add(ClientCompletionKeys.ENTITY_ANCHOR, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.ENTITY_SUMMON, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
-            l.add(ClientCompletionKeys.FLOAT, k -> new SpongeBasicClientCompletionKey(k, FloatArgumentType.floatArg()));
+            l.add(ClientCompletionKeys.FLOAT, k -> SpongeRangeClientCompletionKey.createFrom(k, new FloatArgumentSerializer()));
             l.add(ClientCompletionKeys.FUNCTION, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.GAME_PROFILE, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
-            l.add(ClientCompletionKeys.INTEGER, k -> new SpongeBasicClientCompletionKey(k, IntegerArgumentType.integer()));
+            l.add(ClientCompletionKeys.INTEGER, k -> SpongeRangeClientCompletionKey.createFrom(k, new IntegerArgumentSerializer()));
             l.add(ClientCompletionKeys.ITEM_ENCHANTMENT, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.ITEM_SLOT, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
-            l.add(ClientCompletionKeys.LONG, k -> new SpongeBasicClientCompletionKey(k, LongArgumentType.longArg()));
+            l.add(ClientCompletionKeys.LONG, k -> SpongeRangeClientCompletionKey.createFrom(k, new LongArgumentSerializer()));
             l.add(ClientCompletionKeys.MESSAGE, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.MOB_EFFECT, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));
             l.add(ClientCompletionKeys.NBT_COMPOUND_TAG, k -> new SpongeBasicClientCompletionKey(k, fn.apply(k)));