sync VP-1.2.7-1.16.5

TexBlock · TexBlock · commit 589fe077c48d · 2023-02-26T18:02:11.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.0.0-1.16.5
+	mod_version = 1.0.1-1.16.5
 	maven_group = org.localmc.tools.hardcodepatcher
 	archives_base_name = HardcodeTextPatcher-Fabric
 
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/HardcodePatcher.java b/src/main/java/org/localmc/tools/hardcodepatcher/HardcodePatcher.java
@@ -1,8 +1,8 @@
 package org.localmc.tools.hardcodepatcher;
 
 import org.localmc.tools.hardcodepatcher.command.CommandEventHandler;
-import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherConfig;
-import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherPatch;
+import org.localmc.tools.hardcodepatcher.config.HardcodePatcherConfig;
+import org.localmc.tools.hardcodepatcher.config.HardcodePatcherPatch;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.loader.api.FabricLoader;
@@ -19,18 +19,17 @@ public class HardcodePatcher implements ModInitializer {
     public static final String patchFileName = "hardcodepatcher.json";
     public static final Path configPath = FabricLoader.getInstance().getConfigDir().resolve("HardcodePatcher");
     public static final Logger LOGGER = LogManager.getLogger();
-    public static ArrayList<String> exportList = new ArrayList<>();
-    public static List<HardcodeTextPatcherPatch> vpps = new ArrayList<>();
+    public static List<HardcodePatcherPatch> vpps = new ArrayList<>();
 
     @Override
     public void onInitialize() {
         CommandRegistrationCallback.EVENT.register(CommandEventHandler::registerClientCommands);
 
         try {
-            HardcodeTextPatcherConfig.readConfig();
-            List<String> mods = HardcodeTextPatcherConfig.getMods();
+            HardcodePatcherConfig.readConfig();
+            List<String> mods = HardcodePatcherConfig.getMods();
             for (String mod : mods) {
-                HardcodeTextPatcherPatch vpp = new HardcodeTextPatcherPatch(mod + ".json");
+                HardcodePatcherPatch vpp = new HardcodePatcherPatch(mod + ".json");
                 try {
                     vpp.readConfig();
                     vpps.add(vpp);
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/HardcodePatcherUtils.java b/src/main/java/org/localmc/tools/hardcodepatcher/HardcodePatcherUtils.java
@@ -0,0 +1,19 @@
+package org.localmc.tools.hardcodepatcher;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HardcodePatcherUtils {
+    public static ArrayList<String> exportList = new ArrayList<>();
+    public static Map<String, Boolean> exported = new HashMap<>();
+    public static void addToExportList(String text) {
+        if (!exported.getOrDefault(text, false) || !isInExportList(text)) {
+            exported.put(text, true);
+            exportList.add(text);
+        }
+    }
+    public static boolean isInExportList(String text) {
+        return exportList.lastIndexOf(text) != -1;
+    }
+}
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/ThePatcher.java b/src/main/java/org/localmc/tools/hardcodepatcher/ThePatcher.java
@@ -1,8 +1,8 @@
 package org.localmc.tools.hardcodepatcher;
 
 import org.localmc.tools.hardcodepatcher.config.DebugMode;
-import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherConfig;
-import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherPatch;
+import org.localmc.tools.hardcodepatcher.config.HardcodePatcherConfig;
+import org.localmc.tools.hardcodepatcher.config.HardcodePatcherPatch;
 
 import java.util.Arrays;
 
@@ -14,21 +14,30 @@ public static String patch(String s) {
         if (s == null || s.trim().equals("")) {
             return s;
         }
-        HardcodePatcher.exportList.add(s);
+        HardcodePatcherUtils.addToExportList(s);
         // VaultPatcher.LOGGER.info(Arrays.toString(Thread.currentThread().getStackTrace()));
         String ret;
-        for (HardcodeTextPatcherPatch vpp : HardcodePatcher.vpps) {
+        for (HardcodePatcherPatch vpp : HardcodePatcher.vpps) {
             StackTraceElement[] stacks = Thread.currentThread().getStackTrace();
             ret = vpp.patch(s, stacks);
-            DebugMode debug = HardcodeTextPatcherConfig.getDebugMode();
+            DebugMode debug = HardcodePatcherConfig.getDebugMode();
+            String format = debug.getOutputFormat();
             if (ret != null && !ret.equals(s)) {
-                if (debug.isEnable() && debug.getOutputMode() == 0) {
-                    HardcodePatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
+                if (debug.isEnable() && (debug.getOutputMode() == 1 || debug.getOutputMode() == 0)) {
+                    HardcodePatcher.LOGGER.info(
+                            format.replace("<source>", s)
+                                    .replace("<target>", ret)
+                                    .replace("<stack>", Arrays.toString(stacks))
+                    );
                 }
                 return ret;
             } else {
                 if (debug.isEnable() && debug.getOutputMode() == 1) {
-                    HardcodePatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
+                    HardcodePatcher.LOGGER.info(
+                            format.replace("<source>", s)
+                                    .replace("<target>", s)
+                                    .replace("<stack>", Arrays.toString(stacks))
+                    );
                 }
                 return s;
             }
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/command/CommandEventHandler.java b/src/main/java/org/localmc/tools/hardcodepatcher/command/CommandEventHandler.java
@@ -1,13 +1,14 @@
 package org.localmc.tools.hardcodepatcher.command;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.tree.LiteralCommandNode;
 import org.localmc.tools.hardcodepatcher.HardcodePatcher;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 
 public class CommandEventHandler {
     public static void registerClientCommands(CommandDispatcher<ServerCommandSource> dispatcher, Boolean dedicated) {
-        dispatcher.register(
+        LiteralCommandNode<ServerCommandSource> cmd = dispatcher.register(
                 CommandManager.literal(HardcodePatcher.MODID
                 ).then(
                         CommandManager.literal("export")
@@ -18,7 +19,7 @@ public static void registerClientCommands(CommandDispatcher<ServerCommandSource>
                 ).then(
                         CommandManager.literal("reload")
                                 .executes(ReloadCommand.instance)
-                )
-        );
+                ));
+        dispatcher.register(CommandManager.literal("hp").redirect(cmd));
     }
 }
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/command/ExportCommand.java b/src/main/java/org/localmc/tools/hardcodepatcher/command/ExportCommand.java
@@ -8,23 +8,23 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.TranslatableText;
+import org.localmc.tools.hardcodepatcher.HardcodePatcherUtils;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 
-
 public class ExportCommand implements Command<ServerCommandSource> {
     public static ExportCommand instance = new ExportCommand();
 
     @Override
     public int run(CommandContext<ServerCommandSource> context) {
         context.getSource().sendFeedback(new TranslatableText("commands.hardcodepatcher.export.warning.wip"), true);
         Gson gson = new Gson();
-        String json = gson.toJson(HardcodePatcher.exportList, new TypeToken<ArrayList<String>>() {
+        String json = gson.toJson(HardcodePatcherUtils.exportList, new TypeToken<ArrayList<String>>() {
         }.getType());
-        //Export langs
+        //Export
         try {
             BufferedWriter bw = new BufferedWriter(new FileWriter(FabricLoader.getInstance().getGameDir().resolve(HardcodePatcher.patchFileName).toFile()));
             bw.write(json);
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/command/ListCommand.java b/src/main/java/org/localmc/tools/hardcodepatcher/command/ListCommand.java
@@ -2,7 +2,7 @@
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
-import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherConfig;
+import org.localmc.tools.hardcodepatcher.config.HardcodePatcherConfig;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
@@ -16,7 +16,7 @@ public class ListCommand implements Command<ServerCommandSource> {
     public int run(CommandContext<ServerCommandSource> context) {
         context.getSource().sendFeedback(new TranslatableText("commands.hardcodepatcher.list.warning.wip"), false);
         context.getSource().sendFeedback(new TranslatableText("commands.hardcodepatcher.list.tips.modslist"), false);
-        List<String> mods = HardcodeTextPatcherConfig.getMods();
+        List<String> mods = HardcodePatcherConfig.getMods();
         StringBuilder str = new StringBuilder();
         for (String mod : mods) {
             str.append("§a").append(mod).append(",");
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/config/DebugMode.java b/src/main/java/org/localmc/tools/hardcodepatcher/config/DebugMode.java
@@ -12,7 +12,7 @@ public class DebugMode {
 
     private int outputMode = 0;
 
-    private String outputFormat = "%s -> %s";
+    private String outputFormat = "<source> -> <target>";
 
     public boolean isEnable() {
         return isEnable;
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodePatcherConfig.java b/src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodePatcherConfig.java
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class HardcodeTextPatcherConfig {
+public class HardcodePatcherConfig {
     private static final Gson GSON = new Gson();
     private static final Path configFile = HardcodePatcher.configPath.resolve("config.json");
     private static List<String> mods = new ArrayList<>();
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodePatcherPatch.java b/src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodePatcherPatch.java
@@ -13,7 +13,7 @@
 import java.nio.file.Path;
 import java.util.*;
 
-public class HardcodeTextPatcherPatch {
+public class HardcodePatcherPatch {
     private static final Gson GSON = new Gson();
     private static boolean isSemimatch = false;
     private final Path patchFile;
@@ -22,7 +22,7 @@ public class HardcodeTextPatcherPatch {
 
     private PatchInfo info = new PatchInfo();
 
-    public HardcodeTextPatcherPatch(String patchFile) {
+    public HardcodePatcherPatch(String patchFile) {
         HardcodePatcher.LOGGER.info("Load Module " + patchFile);
         Path p = HardcodePatcher.configPath.resolve(patchFile);
         try {
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/mixin/BaseTextMixin.java b/src/main/java/org/localmc/tools/hardcodepatcher/mixin/BaseTextMixin.java
@@ -39,19 +39,22 @@ private void proxy_getSiblings(CallbackInfoReturnable<List<Component>> cir) {
     @Shadow
     public abstract MutableText copy();
 
+    @Shadow
+    public abstract Style getStyle();
+
     @ModifyArg(method = "asOrderedText", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Language;reorder(Lnet/minecraft/text/StringVisitable;)Lnet/minecraft/text/OrderedText;"))
     private StringVisitable proxy_asOrderedText(StringVisitable text) {
         if (text instanceof BaseText) {
             String c = ThePatcher.patch(text.getString());
-            return new LiteralText(c);
+            return new LiteralText(c).setStyle(this.getStyle());
         }
         return text;
     }
 
     @Inject(method = "append", at = @At("HEAD"), cancellable = true)
     private void proxy_append(Text text, CallbackInfoReturnable<MutableText> cir) {
         String c = ThePatcher.patch(text.getString());
-        this.siblings.add(new LiteralText(c));
+        this.siblings.add(new LiteralText(c).setStyle(this.getStyle()));
         cir.setReturnValue(this.copy());
     }
 }
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/mixin/LiteralTextMixin.java b/src/main/java/org/localmc/tools/hardcodepatcher/mixin/LiteralTextMixin.java
@@ -8,20 +8,20 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(value = LiteralText.class, priority = -Integer.MAX_VALUE)
+@Mixin(value = LiteralText.class)
 public abstract class LiteralTextMixin {
     @Accessor("string")
-    abstract String getString1();
+    abstract String getString_();
 
     @Inject(method = "asString", at = @At("HEAD"), cancellable = true)
     private void proxy_asString(CallbackInfoReturnable<String> cir) {
-        String c = ThePatcher.patch(this.getString1());
+        String c = ThePatcher.patch(this.getString_());
         if (c != null) cir.setReturnValue(c);
     }
 
     @Inject(method = "getRawString", at = @At("HEAD"), cancellable = true)
     private void proxy_getRawString(CallbackInfoReturnable<String> cir) {
-        String c = ThePatcher.patch(this.getString1());
+        String c = ThePatcher.patch(this.getString_());
         if (c != null) cir.setReturnValue(c);
     }
 }
diff --git a/src/main/java/org/localmc/tools/hardcodepatcher/mixin/TextRendererMixin.java b/src/main/java/org/localmc/tools/hardcodepatcher/mixin/TextRendererMixin.java
@@ -2,13 +2,11 @@
 
 import org.localmc.tools.hardcodepatcher.ThePatcher;
 import net.minecraft.client.font.TextRenderer;
-import org.localmc.tools.hardcodepatcher.HardcodePatcher;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
-import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
-@Mixin(value = TextRenderer.class, priority = -Integer.MAX_VALUE)
+@Mixin(value = TextRenderer.class)
 public class TextRendererMixin {
     //GUI Transcription
     @ModifyArgs(
@@ -21,13 +19,9 @@ public class TextRendererMixin {
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/font/TextRenderer;draw(Ljava/lang/String;FFILnet/minecraft/util/math/Matrix4f;ZZ)I"
             ))
-    private void proxy_draw(Args args) {
-        HardcodePatcher.exportList.add(args.get(0));
-        //Modify String
-        String modifyString = ThePatcher.patch(args.get(0));
-        modifyString = modifyString == null ? args.get(0) : modifyString;
-        //Modify Pos
-        //Coming Soon
-        args.set(0, modifyString);
+    private String proxy_draw(String text) {
+        String c = ThePatcher.patch(text);
+        c = c == null ? text : c;
+        return c;
     }
 }
