implements fabric commands api

Author: wdog5

tenet-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -25,6 +_,8 @@
+ import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++
++import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.SharedConstants;
+ import net.minecraft.Util;
+@@ -329,6 +_,7 @@
+                     .redirect(flattenedAliasTarget));
+         }
+         // Paper end - Brigadier Command API
++        CommandRegistrationCallback.EVENT.invoker().register(this.dispatcher, context, selection);
+         this.dispatcher.setConsumer(ExecutionCommandSource.resultConsumer());
+     }
+ 

tenet-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelectorParser.java.patch

@@ -0,0 +1,57 @@
+--- a/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
++++ b/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
+@@ -9,7 +_,9 @@
+ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashSet;
+ import java.util.List;
++import java.util.Set;
+ import java.util.UUID;
+ import java.util.concurrent.CompletableFuture;
+ import java.util.function.BiConsumer;
+@@ -18,10 +_,13 @@
+ import java.util.function.Function;
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
++
++import net.fabricmc.fabric.api.command.v2.FabricEntitySelectorParser;
+ import net.minecraft.advancements.critereon.MinMaxBounds;
+ import net.minecraft.commands.PermissionSource;
+ import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
+ import net.minecraft.network.chat.Component;
++import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.util.Mth;
+ import net.minecraft.util.ToFloatFunction;
+@@ -30,7 +_,7 @@
+ import net.minecraft.world.phys.AABB;
+ import net.minecraft.world.phys.Vec3;
+ 
+-public class EntitySelectorParser {
++public class EntitySelectorParser implements FabricEntitySelectorParser {
+     public static final char SYNTAX_SELECTOR_START = '@';
+     private static final char SYNTAX_OPTIONS_START = '[';
+     private static final char SYNTAX_OPTIONS_END = ']';
+@@ -118,6 +_,21 @@
+     private boolean hasScores;
+     private boolean hasAdvancements;
+     private boolean usesSelectors;
++    private final Set<ResourceLocation> flags = new HashSet<>();
++
++    @Override
++    public void setCustomFlag(ResourceLocation key, boolean value) {
++        if (value) {
++            this.flags.add(key);
++        } else {
++            this.flags.remove(key);
++        }
++    }
++
++    @Override
++    public boolean getCustomFlag(ResourceLocation key) {
++        return this.flags.contains(key);
++    }
+ 
+     public EntitySelectorParser(StringReader reader, boolean allowSelectors) {
+         this.reader = reader;

tenet-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
++++ b/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
+@@ -83,6 +_,10 @@
+         OPTIONS.put(id, new EntitySelectorOptions.Option(handler, predicate, tooltip));
+     }
+ 
++    public static void callPutOption(String id, EntitySelectorOptions.Modifier modifier, Predicate<EntitySelectorParser> condition, Component description) {
++        register(id, modifier, condition, description);
++    }
++
+     public static void bootStrap() {
+         if (OPTIONS.isEmpty()) {
+             register("name", parser -> {

tenet-server/minecraft-patches/sources/net/minecraft/commands/synchronization/ArgumentTypeInfos.java.patch

@@ -0,0 +1,21 @@
+--- a/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
++++ b/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
+@@ -65,13 +_,17 @@
+ import net.minecraft.core.Registry;
+ 
+ public class ArgumentTypeInfos {
+-    private static final Map<Class<?>, ArgumentTypeInfo<?, ?>> BY_CLASS = Maps.newHashMap();
++    private static Map<Class<?>, ArgumentTypeInfo<?, ?>> BY_CLASS = Maps.newHashMap();
+ 
+     private static <A extends ArgumentType<?>, T extends ArgumentTypeInfo.Template<A>> ArgumentTypeInfo<A, T> register(
+         Registry<ArgumentTypeInfo<?, ?>> registry, String id, Class<? extends A> argumentClass, ArgumentTypeInfo<A, T> info
+     ) {
+         BY_CLASS.put(argumentClass, info);
+         return Registry.register(registry, id, info);
++    }
++
++    public static Map<Class<?>, ArgumentTypeInfo<?, ?>> fabric_getClassMap() {
++        return BY_CLASS;
+     }
+ 
+     public static ArgumentTypeInfo<?, ?> bootstrap(Registry<ArgumentTypeInfo<?, ?>> registry) {

tenet-server/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.api.command.v2;
+
+import com.mojang.brigadier.arguments.ArgumentType;
+
+import net.minecraft.commands.synchronization.ArgumentTypeInfo;
+import net.minecraft.commands.synchronization.ArgumentTypeInfos;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+
+import net.minecraft.resources.ResourceLocation;
+
+public final class ArgumentTypeRegistry {
+	/**
+	 * Register a new argument type.
+	 *
+	 * @param id the identifier of the argument type
+	 * @param clazz the class of the argument type
+	 * @param serializer the serializer for the argument type
+	 * @param <A> the argument type
+	 * @param <T> the argument type properties
+	 */
+	public static <A extends ArgumentType<?>, T extends ArgumentTypeInfo.Template<A>> void registerArgumentType(
+			ResourceLocation id, Class<? extends A> clazz, ArgumentTypeInfo<A, T> serializer) {
+		ArgumentTypeInfos.fabric_getClassMap().put(clazz, serializer);
+		Registry.register(BuiltInRegistries.COMMAND_ARGUMENT_TYPE, id, serializer);
+	}
+
+	private ArgumentTypeRegistry() {
+	}
+}

tenet-server/src/main/java/net/fabricmc/fabric/api/command/v2/CommandRegistrationCallback.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.api.command.v2;
+
+import com.mojang.brigadier.CommandDispatcher;
+
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+/**
+ * Callback for when a server registers all commands.
+ *
+ * <p>To register some commands, you would register an event listener and implement the callback.
+ *
+ * <pre>{@code
+ * CommandRegistrationCallback.EVENT.register((dispatcher, buildContext, selection) -> {
+ *     // For example, this command is only registered on an integrated server like the vanilla publish command
+ *     if (selection.includeIntegrated) dispatcher.register(Commands.literal("integrated_command").executes(context -> {...}));
+ * })};
+ * }</pre>
+ */
+public interface CommandRegistrationCallback {
+	Event<CommandRegistrationCallback> EVENT = EventFactory.createArrayBacked(CommandRegistrationCallback.class, (callbacks) -> (dispatcher, buildContext, selection) -> {
+		for (CommandRegistrationCallback callback : callbacks) {
+			callback.register(dispatcher, buildContext, selection);
+		}
+	});
+
+	/**
+	 * Called when the server is registering commands.
+	 *
+	 * @param dispatcher the command dispatcher to register commands to
+	 * @param buildContext    object exposing access to the game's holders
+	 * @param selection  environment selection the registrations should be done for, used for commands that are dedicated or integrated server only
+	 */
+	void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext buildContext, Commands.CommandSelection selection);
+}

tenet-server/src/main/java/net/fabricmc/fabric/api/command/v2/EntitySelectorOptionRegistry.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.api.command.v2;
+
+import java.util.function.Predicate;
+
+import net.minecraft.commands.arguments.selector.EntitySelectorParser;
+import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
+import net.minecraft.network.chat.Component;
+
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Contains a function to register an entity selector option.
+ */
+public final class EntitySelectorOptionRegistry {
+	private EntitySelectorOptionRegistry() {
+	}
+
+	/**
+	 * Registers an entity selector option. The added option is available under the underscore
+	 * separated ID.
+	 *
+	 * <p>Here's an example of a custom entity selector option. The option is registered under
+	 * {@code example_min_health} and can be used like {@code @e[example_min_health=5]}.
+	 * <pre>{@code
+	 * EntitySelectorOptionRegistry.register(
+	 * 	Identifier.fromNamespaceAndPath("modid", "min_health"),
+	 * 	Component.literal("Minimum entity health"),
+	 * 	(parser) -> {
+	 * 	    final float minHealth = parser.getReader().readFloat();
+	 *
+	 * 	    if (minHealth > 0) {
+	 * 	        parser.addPredicate((entity) -> entity instanceof LivingEntity livingEntity && livingEntity.getHealth() >= minHealth);
+	 * 	    }
+	 * 	},
+	 * 	(parser) -> true
+	 * );
+	 * }</pre>
+	 *
+	 * <p>By default, a selector option can be used multiple times. To make a non-repeatable
+	 * option, either use {@link FabricEntitySelectorParser} to flag the existence of an option
+	 * and check it inside {@code canUse}, or use {@link #registerNonRepeatable} instead of this
+	 * method.
+	 *
+	 * @param id the ID of the option
+	 * @param description the description of the option
+	 * @param modifier the modifier for the entity option that reads and sets the predicate
+	 * @param canUse the predicate that checks whether the option is syntactically valid
+	 */
+	public static void register(ResourceLocation id, Component description, EntitySelectorOptions.Modifier modifier, Predicate<EntitySelectorParser> canUse) {
+		EntitySelectorOptions.callPutOption(id.toDebugFileName(), modifier, canUse, description);
+	}
+
+	/**
+	 * Registers an entity selector option. The added option is available under the underscore
+	 * separated ID. The added option cannot be used multiple times within a single selector.
+	 *
+	 * @param id the ID of the option
+	 * @param description the description of the option
+	 * @param modifier the modifier for the entity option that reads and sets the predicate
+	 */
+	public static void registerNonRepeatable(ResourceLocation id, Component description, EntitySelectorOptions.Modifier modifier) {
+		register(id, description, (parser) -> {
+			modifier.handle(parser);
+			parser.setCustomFlag(id, true);
+		}, (parser) -> !parser.getCustomFlag(id)); // has a flag = used before
+	}
+}

tenet-server/src/main/java/net/fabricmc/fabric/api/command/v2/FabricEntitySelectorParser.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.api.command.v2;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Fabric extension to {@link net.minecraft.commands.arguments.selector.EntitySelectorParser}, implemented
+ * using interface injection. This allows custom entity selectors to
+ * set a custom flag to a parser. This can be used to implement mutually-exclusive
+ * or non-repeatable entity selector option.
+ */
+public interface FabricEntitySelectorParser {
+	/**
+	 * Sets a flag.
+	 * @param key the key of the flag
+	 * @param value the value of the flag
+	 */
+	default void setCustomFlag(ResourceLocation key, boolean value) {
+		throw new UnsupportedOperationException("Implemented via mixin");
+	}
+
+	/**
+	 * Gets the value of the flag.
+	 * @param key the key of the flag
+	 * @return the value, or {@code false} if the flag is not set
+	 */
+	default boolean getCustomFlag(ResourceLocation key) {
+		throw new UnsupportedOperationException("Implemented via mixin");
+	}
+}