Switch to using mixin for modification, no longer requiring players to re-enter the /kjs hand command

Author: xiaoliziawa

src/main/java/dev/latvian/mods/kubejs/command/InformationCommands.java

@@ -1,6 +1,5 @@
 package dev.latvian.mods.kubejs.command;
 
-import dev.latvian.mods.kubejs.CommonProperties;
 import dev.latvian.mods.kubejs.ingredient.NamespaceIngredient;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.HolderSet;
@@ -28,15 +27,9 @@ private static Component copy(String s, ChatFormatting col, Component info) {
 	}
 
 	private static Component copy(Component c, Component info) {
-		String textToCopy = c.getString();
-		
-		if (textToCopy.startsWith("'") && textToCopy.endsWith("'") && CommonProperties.get().useDoubleQuotes) {
-			textToCopy = "\"" + textToCopy.substring(1, textToCopy.length() - 1) + "\"";
-		}
-		
 		return Component.literal("- ")
 			.withStyle(ChatFormatting.GRAY)
-			.withStyle(Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, textToCopy)))
+			.withStyle(Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, c.getString())))
 			.withStyle(Style.EMPTY.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, info.copy().append(" (Click to copy)"))))
 			.append(c);
 	}

src/main/java/dev/latvian/mods/kubejs/command/KubeJSCommands.java

@@ -561,15 +561,13 @@ private static int toggleQuoteStyle(CommandSourceStack source) {
 		CommonProperties.get().setUseDoubleQuotes(!current);
 		String newStyle = CommonProperties.get().useDoubleQuotes ? "double" : "single";
 		source.sendSuccess(() -> Component.literal("Quote style switched to: " + newStyle + " quotes"), true);
-		source.sendSuccess(() -> Component.literal("Please use /kubejs hand again to apply the new quote style to chat messages.").withStyle(ChatFormatting.YELLOW), false);
 		return 1;
 	}
 
 	private static int setQuoteStyle(CommandSourceStack source, boolean useDoubleQuotes) {
 		CommonProperties.get().setUseDoubleQuotes(useDoubleQuotes);
 		String style = useDoubleQuotes ? "double" : "single";
 		source.sendSuccess(() -> Component.literal("Quote style set to: " + style + " quotes"), true);
-		source.sendSuccess(() -> Component.literal("Please use /kubejs hand again to apply the new quote style to chat messages.").withStyle(ChatFormatting.YELLOW), false);
 		return 1;
 	}
 

src/main/java/dev/latvian/mods/kubejs/core/mixin/ClickEventMixin.java

@@ -1,16 +1,29 @@
 package dev.latvian.mods.kubejs.core.mixin;
 
 import com.mojang.serialization.Codec;
+import dev.latvian.mods.kubejs.CommonProperties;
 import dev.latvian.mods.kubejs.util.WithCodec;
 import dev.latvian.mods.rhino.Context;
 import net.minecraft.network.chat.ClickEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClickEvent.class)
 public abstract class ClickEventMixin implements WithCodec {
 	@Shadow
 	public abstract String getValue();
+	
+	@Inject(method = "getValue", at = @At("RETURN"), cancellable = true)
+	private void kubejs$getValueWithQuoteStyle(CallbackInfoReturnable<String> cir) {
+		String value = cir.getReturnValue();
+		
+		if (CommonProperties.get().useDoubleQuotes && value != null && value.startsWith("'") && value.endsWith("'")) {
+			cir.setReturnValue("\"" + value.substring(1, value.length() - 1) + "\"");
+		}
+	}
 
 	@Override
 	public Codec<?> getCodec(Context cx) {