Add support for registering custom command argument type serializers.

Author: Darkhax

Common/src/main/java/net/darkhax/bookshelf/api/registry/RegistryHelper.java

@@ -3,7 +3,9 @@
 import net.darkhax.bookshelf.api.item.ICreativeTabBuilder;
 import net.darkhax.bookshelf.impl.registry.RegistryEntries;
 import net.darkhax.bookshelf.mixin.item.AccessorItem;
+import net.minecraft.commands.synchronization.ArgumentSerializer;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.decoration.Motive;
@@ -29,6 +31,7 @@ public abstract class RegistryHelper {
     public final IRegistryEntries<PreparableReloadListener> clientReloadListeners;
 
     public final IRegistryEntries<ICommandBuilder> commands;
+    public final IRegistryEntries<Tuple<Class, ArgumentSerializer>> commandArguments;
     public final VillagerTradeEntries trades;
 
     protected RegistryHelper(String ownerId) {
@@ -47,6 +50,7 @@ protected RegistryHelper(String ownerId) {
         this.clientReloadListeners = new RegistryEntries<>(ownerId);
 
         this.commands = new RegistryEntries<>(ownerId);
+        this.commandArguments = new RegistryEntries<>(ownerId);
         this.trades = new VillagerTradeEntries();
     }
 

Fabric/src/main/java/net/darkhax/bookshelf/impl/registry/RegistryHelperFabric.java

@@ -13,9 +13,12 @@
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.synchronization.ArgumentSerializer;
+import net.minecraft.commands.synchronization.ArgumentTypes;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.npc.VillagerTrades;
 
@@ -58,6 +61,15 @@ public void init() {
         CommandRegistrationCallback.EVENT.register(this::buildCommands);
         this.registerTradeData();
         this.registerWanderingTrades();
+        this.registerCommandArguments();
+    }
+
+    private void registerCommandArguments () {
+
+        for (Map.Entry<ResourceLocation, Tuple<Class, ArgumentSerializer>> entry : this.commandArguments.getEntries().entrySet()) {
+
+            ArgumentTypes.register(entry.getKey().toString(), entry.getValue().getA(), entry.getValue().getB());
+        }
     }
 
     private void registerTradeData() {

Forge/src/main/java/net/darkhax/bookshelf/impl/registry/RegistryHelperForge.java

@@ -3,13 +3,17 @@
 import com.google.common.collect.Multimap;
 import com.mojang.brigadier.CommandDispatcher;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.darkhax.bookshelf.Constants;
 import net.darkhax.bookshelf.api.item.ICreativeTabBuilder;
 import net.darkhax.bookshelf.api.registry.IRegistryEntries;
 import net.darkhax.bookshelf.api.registry.RegistryHelper;
 import net.darkhax.bookshelf.impl.item.CreativeTabBuilderForge;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+import net.minecraft.commands.synchronization.ArgumentSerializer;
+import net.minecraft.commands.synchronization.ArgumentTypes;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.decoration.Motive;
@@ -27,6 +31,7 @@
 import net.minecraftforge.event.village.WandererTradesEvent;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 
@@ -65,6 +70,16 @@ public void init() {
         MinecraftForge.EVENT_BUS.addListener(this::buildCommands);
         MinecraftForge.EVENT_BUS.addListener(this::registerVillagerTrades);
         MinecraftForge.EVENT_BUS.addListener(this::registerWanderingTrades);
+
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerCommandArguments);
+    }
+
+    private void registerCommandArguments (FMLCommonSetupEvent event) {
+
+        for (Map.Entry<ResourceLocation, Tuple<Class, ArgumentSerializer>> entry : this.commandArguments.getEntries().entrySet()) {
+
+            ArgumentTypes.register(entry.getKey().toString(), entry.getValue().getA(), entry.getValue().getB());
+        }
     }
 
     private void registerVillagerTrades(VillagerTradesEvent event) {