Initial update to 1.14, rework API

Author: Juuxel

README.md

@@ -1,6 +1,8 @@
 <img src="icon.png" align="right" width="180px"/>
 
-# Client Commands
+# Cotton Client Commands
+
+[![Maven metadata URL](https://img.shields.io/maven-metadata/v/http/server.bbkr.space:8081/artifactory/libs-snapshot/io/github/cottonmc/client-commands/maven-metadata.xml.svg)](http://server.bbkr.space:8081/artifactory/libs-snapshot/io/github/cottonmc/client-commands)
 
 [>> Downloads <<](https://github.com/CottonMC/ClientCommands/releases)
 
@@ -21,27 +23,39 @@ repositories {
 }
 
 dependencies {
- modCompile "io.github.cottonmc:client-commands:0.2.1+1.14-pre5-SNAPSHOT"
+ modCompile "io.github.cottonmc:client-commands:0.3.0+1.14-SNAPSHOT"
 }
 ```
 
-Register the commands in a `ClientModInitializer`:
+Register the commands in a `CommandProvider`:
 
 ```java
-public class ExampleMod implements ClientModInitializer {
- @Override
- public void onInitializeClient() {
- ClientCommands.registerCommand(dispatcher -> {
- dispatcher.register(ArgumentBuilders.literal("client-commands").executes(
- source -> {
- Feedback.sendFeedback(new StringTextComponent("Hello, world!"));
- return 1;
- }
- ));
- });
+import com.mojang.brigadier.CommandDispatcher;
+import io.github.cottonmc.clientcommands.CommandProvider;
+import net.minecraft.server.command.CommandSource;
+
+public class MyCommands implements CommandProvider {
+@Override
+public void registerCommands(CommandDispatcher<CommandSource> dispatcher) {
+ dispatcher.register(ArgumentBuilders.literal("client-commands").executes(
+ source -> {
+ Feedback.sendFeedback(new StringTextComponent("Hello, world!"));
+ return 1;
+ }
+ ));
  }
 }
 ```
 
+And register the `CommandProvider` in your `fabric.mod.json`:
+
+```json
+{
+ "entrypoints": {
+ "cotton-client-commands": ["path.to.MyCommands"]
+ }
+}
+```
+
 The classes `ArgumentBuilders` and `Feedback` are provided as
 alternatives to `CommandManager` and the feedback methods in `ServerCommandSource`. 

project.gradle

@@ -1,12 +1,12 @@
 ext {
- projectName = "client-commands"
+ projectName = "cotton-client-commands"
  group = "io.github.cottonmc"
- version = "0.2.1+1.14-pre5"
+ version = "0.3.0+1.14"
  snapshot = true
 
- minecraft = "1.14 Pre-Release 5"
- mappings = "1.14 Pre-Release 5+build.4"
- loader = "0.4.2+build.130"
+ minecraft = "1.14"
+ mappings = "1.14+build.3"
+ loader = "0.4.4+build.139"
  fabricMod = null
  silkMod = null
  jankson = null

src/main/java/io/github/cottonmc/clientcommands/ClientCommands.java

@@ -1,29 +1,13 @@
 package io.github.cottonmc.clientcommands;
 
-import com.mojang.brigadier.CommandDispatcher;
-import net.minecraft.server.command.CommandSource;
+import net.fabricmc.loader.api.FabricLoader;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Consumer;
+import java.util.List;
 
 public final class ClientCommands {
- private static final Set<Consumer<CommandDispatcher<CommandSource>>> commands = new HashSet<>();
+ public static final String ENTRYPOINT_TYPE = "cotton-client-commands";
 
- public static Collection<Consumer<CommandDispatcher<CommandSource>>> getCommands() {
- return Collections.unmodifiableSet(commands);
- }
-
- /**
- * Registers a function that adds client-side commands.
- * The provided {@link CommandDispatcher} will exist only on the client.
- *
- * @param command the function
- */
- public static void registerCommand(Consumer<CommandDispatcher<CommandSource>> command) {
- // TODO: (Maybe) error if a common/dedicated command with the same base is already registered
- commands.add(command);
+ public static List<CommandProvider> getCommandProviders() {
+ return FabricLoader.getInstance().getEntrypoints(ENTRYPOINT_TYPE, CommandProvider.class);
  }
 }

src/main/java/io/github/cottonmc/clientcommands/CommandProvider.java

@@ -0,0 +1,8 @@
+package io.github.cottonmc.clientcommands;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.server.command.CommandSource;
+
+public interface CommandProvider {
+void registerCommands(CommandDispatcher<CommandSource> dispatcher);
+}

src/main/java/io/github/cottonmc/clientcommands/impl/CommandCache.java

@@ -0,0 +1,24 @@
+package io.github.cottonmc.clientcommands.impl;
+
+import com.mojang.brigadier.CommandDispatcher;
+import io.github.cottonmc.clientcommands.ClientCommands;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.server.command.CommandSource;
+
+import java.util.Collections;
+
+@Environment(EnvType.CLIENT)
+public final class CommandCache {
+private CommandCache() {}
+
+private static final CommandDispatcher<CommandSource> DISPATCHER = new CommandDispatcher<>();
+
+public static void build() {
+ClientCommands.getCommandProviders().forEach(provider -> provider.registerCommands(DISPATCHER));
+}
+
+public static boolean hasCommand(String name) {
+return DISPATCHER.findNode(Collections.singleton(name)) != null;
+}
+}

src/main/java/io/github/cottonmc/clientcommands/mixin/NetworkHandlerMixin.java

@@ -3,6 +3,7 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
 import io.github.cottonmc.clientcommands.ClientCommands;
+import io.github.cottonmc.clientcommands.impl.CommandCache;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
@@ -28,10 +29,11 @@ private void onCommandTree(CommandTreeS2CPacket packet, CallbackInfo info) {
  @Inject(method = "<init>", at = @At("RETURN"))
  private void onConstruct(MinecraftClient mc, Screen screen, ClientConnection cc, GameProfile gp, CallbackInfo info) {
  addCommands();
+ CommandCache.build();
  }
 
  @Unique
  private void addCommands() {
- ClientCommands.getCommands().forEach(c -> c.accept(commandDispatcher));
+ ClientCommands.getCommandProviders().forEach(c -> c.registerCommands(commandDispatcher));
  }
 }

src/main/java/io/github/cottonmc/clientcommands/mixin/PlayerMixin.java

@@ -1,6 +1,7 @@
 package io.github.cottonmc.clientcommands.mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import io.github.cottonmc.clientcommands.impl.CommandCache;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommandSource;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -25,6 +26,8 @@ public abstract class PlayerMixin {
  @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
  private void onChatMessage(String msg, CallbackInfo info) {
  if (msg.length() < 2 || !msg.startsWith("/")) return;
+ if (!CommandCache.hasCommand(msg.substring(1).split(" ")[0])) return;
+ // TODO: Test
  boolean cancel = false;
  try {
  // The game freezes when using heavy commands. Run your heavy code somewhere else pls

src/main/resources/fabric.mod.json

@@ -1,8 +1,8 @@
 {
  "schemaVersion": 1,
- "id": "clientcommands",
- "name": "Client Commands",
- "description": "Allows purely client-side commands.",
+ "id": "cotton-client-commands",
+ "name": "Cotton Client Commands",
+ "description": "An API for purely client-side commands.",
  "version": "$version",
  "environment": "client",
  "license": "MIT",
@@ -15,7 +15,7 @@
  "fabricloader": ">=0.4.0"
  },
  "mixins": [
- "mixins.client-commands.json"
+ "mixins.cotton-client-commands.json"
  ],
  "icon": "icon.png",
  "custom": {