Rewrite FormattedComponentArgument to use markdown (#673)

* Rewrite FormattedComponentArgument to use markdown * Fix markdown links * Address review comments * Add tests and fix a couple of bugs
Earthcomputer · Nov 26, 2024 · 131fb20 · 131fb20
1 parent 6d16d09
commit 131fb20
Show file tree

Hide file tree

Showing 7 changed files with 618 additions and 251 deletions.
diff --git a/build.gradle b/build.gradle
@@ -76,6 +76,7 @@ dependencies {
 
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 	testImplementation "org.junit.jupiter:junit-jupiter:${project.junit_version}"
+	testImplementation "com.code-intelligence:jazzer-junit:${project.jazzer_junit_version}"
 }
 
 test {

diff --git a/gradle.properties b/gradle.properties
@@ -28,4 +28,5 @@ org.gradle.jvmargs=-Xmx2G
 	seedfinding_seed_version=1.171.2
 	latticg_version=1.07
 
+	jazzer_junit_version=0.22.1
 	junit_version=5.11.3
diff --git a/src/main/java/net/earthcomputer/clientcommands/command/NoteCommand.java b/src/main/java/net/earthcomputer/clientcommands/command/NoteCommand.java
@@ -5,15 +5,15 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.network.chat.MutableComponent;
 
-import static net.earthcomputer.clientcommands.command.arguments.FormattedComponentArgument.*;
+import static net.earthcomputer.clientcommands.command.arguments.ExtendedMarkdownArgument.*;
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
 
 public class NoteCommand {
 
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
         dispatcher.register(literal("cnote")
-            .then(argument("message", formattedComponent())
-                .executes(ctx -> note(ctx.getSource(), getFormattedComponent(ctx, "message")))));
+            .then(argument("message", extendedMarkdown())
+                .executes(ctx -> note(ctx.getSource(), getExtendedMarkdown(ctx, "message")))));
     }
 
     private static int note(FabricClientCommandSource source, MutableComponent message) {

diff --git a/...ain/java/net/earthcomputer/clientcommands/command/arguments/ExtendedMarkdownArgument.java b/...ain/java/net/earthcomputer/clientcommands/command/arguments/ExtendedMarkdownArgument.java
diff --git a/...n/java/net/earthcomputer/clientcommands/command/arguments/FormattedComponentArgument.java b/...n/java/net/earthcomputer/clientcommands/command/arguments/FormattedComponentArgument.java
diff --git a/src/main/resources/assets/clientcommands/lang/en_us.json b/src/main/resources/assets/clientcommands/lang/en_us.json
@@ -252,6 +252,7 @@
 
   "commands.client.blockpos": "(%s, %s, %s)",
   "commands.client.cancel": "Cancel",
+  "commands.client.componentTooDeeplyNested": "Chat component too deeply nested",
   "commands.client.crack": "Crack",
   "commands.client.enable": "Enable",
   "commands.client.expectedRegex": "Invalid regex %s",
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ dependencies { @@
     	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
     	testImplementation "org.junit.jupiter:junit-jupiter:${project.junit_version}"
+    	testImplementation "com.code-intelligence:jazzer-junit:${project.jazzer_junit_version}"
     }
     test {
@@ Expand Down @@