1.0.0 for 1.15.2

Author: Juuxel

README.md

@@ -6,7 +6,7 @@
 
 [>> Downloads <<](https://github.com/CottonMC/ClientCommands/releases)
 
-A Minecraft library for 1.14 that adds support for client-side commands.
+A Minecraft library for 1.15 that adds support for client-side commands.
 
 **This mod is open source and under a permissive license.** As such, it can be included in any modpack on any platform without prior permission. We appreciate hearing about people using our mods, but you do not need to ask to use them. See the [LICENSE file](LICENSE) for more details.
 
@@ -64,10 +64,13 @@ public class MyCommands implements ClientCommandPlugin {
 }
 ```
 
-And register the plugin entrypoint in your `fabric.mod.json`:
+And finally, add the dependency and register the plugin entrypoint in your `fabric.mod.json`:
 
 ```json
 {
+ "depends": {
+ "cotton-client-commands": "^1.0.0"
+ },
  "entrypoints": {
  "cotton-client-commands": ["path.to.MyCommands"]
  }

build.gradle

@@ -8,7 +8,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 archivesBaseName = 'cotton-client-commands'
-version = project.mod_version + (project.snapshot ? '-SNAPSHOT' : '')
+version = "$project.mod_version+$project.minecraft_version" + (project.snapshot ? '-SNAPSHOT' : '')
 group = project.maven_group
 
 minecraft {

gradle.properties

@@ -1,7 +1,7 @@
 maven_group = io.github.cottonmc
-mod_version = 1.0.0+1.14.4
+mod_version = 1.0.0
 snapshot = false
 
-minecraft_version = 1.14.4
-yarn_mappings = 1.14.4+build.15
-loader_version = 0.7.2+build.174
+minecraft_version = 1.15.2
+yarn_mappings = 1.15.2+build.14
+loader_version = 0.7.8+build.189

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

@@ -2,6 +2,14 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 
+/**
+ * An initializer that registers client-sided commands.
+ */
 public interface ClientCommandPlugin {
+/**
+ * Implementations can use the {@code dispatcher} to register their commands.
+ *
+ * @param dispatcher a client-side command dispatcher
+ */
 void registerCommands(CommandDispatcher<CottonClientCommandSource> dispatcher);
 }

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

@@ -4,12 +4,33 @@
 import net.minecraft.server.command.CommandSource;
 
 /**
- * Alternative to {@code ServerCommandSource}.
  * Contains methods for sending messages to the player.
+ * Alternative to {@code ServerCommandSource}.
  *
- * (since 0.4.1) This interface is implemented on {@code ClientCommandSource} instances.
+ * <p>(since 0.4.1) This interface is implemented on {@code ClientCommandSource} instances.
  */
 public interface CottonClientCommandSource extends CommandSource {
- void sendFeedback(Text text);
+ /**
+ * Sends a message to the player (mirrors {@link net.minecraft.server.command.ServerCommandSource#sendFeedback}).
+ * Equivalent of calling {@code sendFeedback(message, false)}.
+ *
+ * @param message the message
+ */
+ void sendFeedback(Text message);
+
+ /**
+ * Sends a message to the player (mirrors {@link net.minecraft.server.command.ServerCommandSource#sendFeedback}).
+ *
+ * @param message the message
+ * @param actionBar true, if the message is displayed on the action bar.
+ * @since 1.0.0
+ */
+ void sendFeedback(Text message, boolean actionBar);
+
+ /**
+ * Sends an error message to the player (mirrors {@link net.minecraft.server.command.ServerCommandSource#sendError}).
+ *
+ * @param text the message
+ */
  void sendError(Text text);
 }

…tonmc/clientcommands/ClientCommands.java …/clientcommands/impl/ClientCommands.javasrc/main/java/io/github/cottonmc/clientcommands/ClientCommands.java renamed to src/main/java/io/github/cottonmc/clientcommands/impl/ClientCommands.java src/main/java/io/github/cottonmc/clientcommands/ClientCommands.java renamed to src/main/java/io/github/cottonmc/clientcommands/impl/ClientCommands.java

@@ -1,6 +1,7 @@
-package io.github.cottonmc.clientcommands;
+package io.github.cottonmc.clientcommands.impl;
 
 import com.google.common.collect.ImmutableList;
+import io.github.cottonmc.clientcommands.ClientCommandPlugin;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Lazy;
 

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

@@ -2,7 +2,6 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import io.github.cottonmc.clientcommands.ClientCommands;
 import io.github.cottonmc.clientcommands.CottonClientCommandSource;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

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

@@ -16,8 +16,13 @@ public abstract class ClientCommandSourceMixin implements CottonClientCommandSou
  private MinecraftClient client;
 
  @Override
- public void sendFeedback(Text text) {
- client.player.addChatMessage(text, false);
+ public void sendFeedback(Text message) {
+ client.player.addChatMessage(message, false);
+ }
+
+ @Override
+ public void sendFeedback(Text message, boolean actionBar) {
+ client.player.addChatMessage(message, actionBar);
  }
 
  @Override

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

@@ -2,13 +2,13 @@
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
-import io.github.cottonmc.clientcommands.ClientCommands;
+import io.github.cottonmc.clientcommands.impl.ClientCommands;
 import io.github.cottonmc.clientcommands.impl.CommandCache;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.packet.CommandTreeS2CPacket;
 import net.minecraft.network.ClientConnection;
+import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
 import net.minecraft.server.command.CommandSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

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

@@ -44,7 +44,7 @@ private void onChatMessage(String msg, CallbackInfo info) {
  // Prevent sending the message
  cancel = true;
  } catch (CommandException e) {
- addChatMessage(e.getMessageText().formatted(Formatting.RED), false);
+ addChatMessage(e.getTextMessage().formatted(Formatting.RED), false);
  cancel = true;
  } catch (CommandSyntaxException e) {
  addChatMessage(new LiteralText(e.getMessage()).formatted(Formatting.RED), false);