feat: Allow remapping strings inside specified packages (@M41G)

Opt-in feature to allow specified packages to have string constants be remapped.

Author: PhoenixVX

gui/src/main/java/org/mcphackers/mcp/gui/MenuBar.java

@@ -186,7 +186,14 @@ public void reloadSide() {
 
 	public void reloadOptions() {
 		for (Map.Entry<TaskParameter, JMenuItem> entry : optionItems.entrySet()) {
-			entry.getValue().setSelected(mcp.options.getBooleanParameter(entry.getKey()));
+			TaskParameter param = entry.getKey();
+			JMenuItem item = entry.getValue();
+			if (param.type == String[].class) {
+				String[] arr = mcp.options.getStringArrayParameter(param);
+				item.setSelected(arr != null && arr.length > 0);
+			} else if (param.type == Boolean.class) {
+				item.setSelected(mcp.options.getBooleanParameter(param));
+			}
 		}
 	}
 
@@ -222,6 +229,23 @@ private void initOptions() {
 						mcp.options.setParameter(param, b.isSelected());
 						mcp.options.save();
 					});
+				} else if (param.type == String[].class) {
+					b = new JRadioButtonMenuItem();
+					translatableComponents.put(b, "task.param." + param.name);
+					optionItems.put(param, b);
+					final JRadioButtonMenuItem checkbox = (JRadioButtonMenuItem) b;
+					b.addActionListener(e -> {
+						if (checkbox.isSelected()) {
+							mcp.inputOptionsValue(param);
+							String[] result = mcp.options.getStringArrayParameter(param);
+							if (result == null || result.length == 0) {
+								checkbox.setSelected(false);
+							}
+						} else {
+							mcp.options.setParameter(param, new String[0]);
+							mcp.options.save();
+						}
+					});
 				} else {
 					b = new JMenuItem(param.getDesc());
 					b.addActionListener(u -> mcp.inputOptionsValue(param));

gui/src/main/java/org/mcphackers/mcp/main/MainGUI.java

@@ -46,7 +46,7 @@ public class MainGUI extends MCP {
 	public static final String[] TABS = {"task.decompile", "task.recompile", "task.reobfuscate", "task.build", "options.running"};
 	public static final TaskParameter[][] TAB_PARAMETERS = {
 			{TaskParameter.PATCHES, TaskParameter.FERNFLOWER_OPTIONS, TaskParameter.IGNORED_PACKAGES, TaskParameter.OUTPUT_SRC, TaskParameter.DECOMPILE_RESOURCES, TaskParameter.GUESS_GENERICS, TaskParameter.STRIP_GENERICS},
-			{TaskParameter.SOURCE_VERSION, TaskParameter.TARGET_VERSION, TaskParameter.JAVA_HOME, TaskParameter.JAVAC_ARGS}, {TaskParameter.OBFUSCATION, TaskParameter.SRG_OBFUSCATION, TaskParameter.EXCLUDED_CLASSES, TaskParameter.STRIP_SOURCE_FILE},
+			{TaskParameter.SOURCE_VERSION, TaskParameter.TARGET_VERSION, TaskParameter.JAVA_HOME, TaskParameter.JAVAC_ARGS}, {TaskParameter.OBFUSCATION, TaskParameter.SRG_OBFUSCATION, TaskParameter.EXCLUDED_CLASSES, TaskParameter.STRIP_SOURCE_FILE, TaskParameter.STRING_REMAP_PACKAGES},
 			{TaskParameter.FULL_BUILD}, {TaskParameter.RUN_BUILD, TaskParameter.RUN_ARGS, TaskParameter.GAME_ARGS}
 	};
 	public Theme theme = Theme.THEMES_MAP.get(UIManager.getCrossPlatformLookAndFeelClassName());
@@ -293,10 +293,22 @@ public void changeWorkingDirectory() {
 
 	public void inputOptionsValue(TaskParameter param) {
 		String s = MCP.TRANSLATOR.translateKey("options.enterValue");
+		Object initialValue;
 		if (param.type == String[].class) {
 			s = MCP.TRANSLATOR.translateKey("options.enterValues") + "\n" + MCP.TRANSLATOR.translateKey("options.enterValues.info");
+			String[] current = options.getStringArrayParameter(param);
+			StringBuilder b = new StringBuilder();
+			if (current != null) {
+				for (int i = 0; i < current.length; i++) {
+					if (i > 0) b.append(",");
+					b.append(Util.convertToEscapedString(current[i]));
+				}
+			}
+			initialValue = b.toString();
+		} else {
+			initialValue = Util.convertToEscapedString(String.valueOf(options.getParameter(param)));
 		}
-		String value = (String) JOptionPane.showInputDialog(frame, s, param.getDesc(), JOptionPane.PLAIN_MESSAGE, null, null, Util.convertToEscapedString(String.valueOf(options.getParameter(param))));
+		String value = (String) JOptionPane.showInputDialog(frame, s, param.getDesc(), JOptionPane.PLAIN_MESSAGE, null, null, initialValue);
 		safeSetParameter(param, value);
 		options.save();
 	}

src/main/java/org/mcphackers/mcp/tasks/TaskReobfuscate.java

@@ -18,6 +18,7 @@
 import org.mcphackers.mcp.tasks.mode.TaskParameter;
 import org.mcphackers.mcp.tools.FileUtil;
 import org.mcphackers.mcp.tools.injector.SourceFileTransformer;
+import org.mcphackers.mcp.tools.injector.StringLiteralRemapper;
 import org.mcphackers.mcp.tools.mappings.MappingUtil;
 import org.mcphackers.rdi.injector.data.ClassStorage;
 import org.mcphackers.rdi.injector.data.Mappings;
@@ -80,6 +81,10 @@ private void reobfuscate() throws IOException {
 			RDInjector injector = new RDInjector(reobfBin);
 			Mappings mappings = getMappings(injector.getStorage(), localSide);
 			if (mappings != null) {
+				String[] stringRemapPackages = mcp.getOptions().getStringArrayParameter(TaskParameter.STRING_REMAP_PACKAGES);
+				if (stringRemapPackages != null && stringRemapPackages.length > 0) {
+					new StringLiteralRemapper(mappings, stringRemapPackages).transform(injector.getStorage());
+				}
 				injector.applyMappings(mappings);
 			}
 			if (stripSourceFile) {

src/main/java/org/mcphackers/mcp/tasks/mode/TaskParameter.java

@@ -8,7 +8,6 @@
 import org.mcphackers.mcp.Options;
 import org.mcphackers.mcp.tasks.Task.Side;
 
-
 /**
  * Any optional parameters which can be accessed from tasks
  *
@@ -36,7 +35,8 @@ public enum TaskParameter {
 	GUESS_GENERICS("generics", Boolean.class, false),
 	STRIP_GENERICS("stripgenerics", Boolean.class, false),
 	OUTPUT_SRC("outputsrc", Boolean.class, true),
-	STRIP_SOURCE_FILE("stripsourcefile", Boolean.class, true);
+	STRIP_SOURCE_FILE("stripsourcefile", Boolean.class, true),
+	STRING_REMAP_PACKAGES("stringremap", String[].class, new String[0]);
 
 	public static final TaskParameter[] VALUES = TaskParameter.values();