Add brigadier mapping

PrimordialMoros · Feb 23, 2024 · 824b0c0 · 824b0c0
1 parent 9d5d711
commit 824b0c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/common/src/main/resources/bending/lang/messages_en.properties b/common/src/main/resources/bending/lang/messages_en.properties
@@ -95,9 +95,6 @@ bending.gui.elements.display=Right click to list all abilities
 bending.gui.elements.add=Shift-left click to add
 bending.gui.elements.remove=Shift-right click to remove
 # Activation methods
-bending.activation.tap=Tap {0}
-bending.activation.hold=Hold {0}
-bending.activation.release=Release {0}
 bending.activation.attack=Attack
 bending.activation.interact=Right Click Air
 bending.activation.interact-entity=Right Click Entity

diff --git a/fabric/src/main/java/me/moros/bending/fabric/FabricBending.java b/fabric/src/main/java/me/moros/bending/fabric/FabricBending.java
@@ -33,6 +33,7 @@
 import me.moros.bending.api.util.functional.Suppliers;
 import me.moros.bending.common.AbstractBending;
 import me.moros.bending.common.command.Commander;
+import me.moros.bending.common.command.parser.AbilityParser;
 import me.moros.bending.common.hook.MiniPlaceholdersHook;
 import me.moros.bending.common.logging.Slf4jLogger;
 import me.moros.bending.common.util.Initializer;
@@ -56,8 +57,8 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.fabricmc.loader.api.metadata.Person;
+import net.minecraft.commands.arguments.ResourceLocationArgument;
 import net.minecraft.server.MinecraftServer;
-import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.fabric.FabricServerCommandManager;
@@ -83,10 +84,14 @@ final class FabricBending extends AbstractBending<ModContainer> {
     );
     registerLifecycleListeners();
 
-    CommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+    FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
       ExecutionCoordinator.simpleCoordinator(),
       SenderMapper.create(CommandSender::from, CommandSender::stack)
     );
+    manager.brigadierManager().registerMapping(
+      new io.leangen.geantyref.TypeToken<AbilityParser<CommandSender>>() {},
+      builder -> builder.toConstant(ResourceLocationArgument.id()).cloudSuggestions()
+    );
     Commander.create(manager, PlayerCommandSender.class, this).init();
   }