add SearchableElement::getSearchName and use that for SearchMenusMenu.Result's instead of every alias

supersaiyansubtlety · supersaiyansubtlety · commit c2b17f273eeb · 2025-11-15T17:39:52.000-08:00
implement a convention for translatable aliases
add several aliases to menus
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/SearchableElement.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/SearchableElement.java
@@ -1,10 +1,25 @@
 package org.quiltmc.enigma.gui.element;
 
+import org.quiltmc.enigma.util.I18n;
+
 import javax.swing.MenuElement;
+import java.util.Arrays;
 import java.util.stream.Stream;
 
 public interface SearchableElement extends MenuElement {
-	Stream<String> streamSearchAliases();
+	default Stream<String> streamSearchAliases() {
+		final String aliases = I18n
+				.translateOrNull(this.getAliasesTranslationKeyPrefix() + ".aliases");
+
+		return Stream.concat(
+			Stream.of(this.getSearchName()),
+			aliases == null ? Stream.empty() : Arrays.stream(aliases.split(";"))
+		);
+	}
+
+	String getSearchName();
+
+	String getAliasesTranslationKeyPrefix();
 
 	void onSearchClicked();
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/AbstractSearchableEnigmaMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/AbstractSearchableEnigmaMenu.java
@@ -3,16 +3,14 @@
 import org.quiltmc.enigma.gui.Gui;
 import org.quiltmc.enigma.gui.element.SearchableElement;
 
-import java.util.stream.Stream;
-
 public abstract class AbstractSearchableEnigmaMenu extends AbstractEnigmaMenu implements SearchableElement {
 	protected AbstractSearchableEnigmaMenu(Gui gui) {
 		super(gui);
 	}
 
 	@Override
-	public Stream<String> streamSearchAliases() {
-		return Stream.of(this.getText());
+	public String getSearchName() {
+		return this.getText();
 	}
 
 	@Override
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/CollabMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/CollabMenu.java
@@ -16,6 +16,8 @@
 import java.util.Arrays;
 
 public class CollabMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.collab";
+
 	private final JMenuItem connectItem = new JMenuItem();
 	private final JMenuItem startServerItem = new JMenuItem();
 
@@ -31,7 +33,7 @@ public CollabMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.collab"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.retranslate(this.gui.getConnectionState());
 	}
 
@@ -102,4 +104,9 @@ public void onStartServerClicked() {
 			this.gui.getController().disconnectIfConnected(null);
 		}
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/DecompilerMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/DecompilerMenu.java
@@ -11,6 +11,8 @@
 import javax.swing.JRadioButtonMenuItem;
 
 public class DecompilerMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.decompiler";
+
 	private final JMenuItem decompilerSettingsItem = new JMenuItem();
 
 	public DecompilerMenu(Gui gui) {
@@ -41,7 +43,12 @@ public DecompilerMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.decompiler"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.decompilerSettingsItem.setText(I18n.translate("menu.decompiler.settings"));
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/DevMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/DevMenu.java
@@ -27,6 +27,8 @@
 import java.nio.file.Files;
 
 public class DevMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "dev.menu";
+
 	private final JCheckBoxMenuItem showMappingSourcePluginItem = new JCheckBoxMenuItem();
 	private final JCheckBoxMenuItem debugTokenHighlightsItem = new JCheckBoxMenuItem();
 	private final JCheckBoxMenuItem logClientPacketsItem = new JCheckBoxMenuItem();
@@ -48,7 +50,7 @@ public DevMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText("Dev");
+		this.setText(I18n.translate(TRANSLATION_KEY));
 
 		this.showMappingSourcePluginItem.setText(I18n.translate("dev.menu.show_mapping_source_plugin"));
 		this.debugTokenHighlightsItem.setText(I18n.translate("dev.menu.debug_token_highlights"));
@@ -128,4 +130,9 @@ private void onPrintMappingTreeClicked() {
 
 		this.showSavableTextAreaDialog(I18n.translate("dev.mapping_tree"), text.toString(), "mapping_tree.txt");
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/HelpMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/HelpMenu.java
@@ -8,6 +8,8 @@
 import javax.swing.JMenuItem;
 
 public class HelpMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.help";
+
 	private final JMenuItem aboutItem = new JMenuItem();
 	private final JMenuItem githubItem = new JMenuItem();
 	private final SearchMenusMenu searchItem;
@@ -27,7 +29,7 @@ public HelpMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.help"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.aboutItem.setText(I18n.translate("menu.help.about"));
 		this.githubItem.setText(I18n.translate("menu.help.github"));
 		this.searchItem.retranslate();
@@ -36,4 +38,9 @@ public void retranslate() {
 	private void onGithubClicked() {
 		GuiUtil.openUrl("https://github.com/QuiltMC/Enigma");
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/SearchMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/SearchMenu.java
@@ -9,6 +9,8 @@
 import javax.swing.JMenuItem;
 
 public class SearchMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.search";
+
 	private final JMenuItem searchItem = new JMenuItem(GuiUtil.DEOBFUSCATED_ICON);
 	private final JMenuItem searchAllItem = new JMenuItem(GuiUtil.DEOBFUSCATED_ICON);
 	private final JMenuItem searchClassItem = new JMenuItem(GuiUtil.CLASS_ICON);
@@ -33,7 +35,7 @@ public SearchMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.search"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.searchItem.setText(I18n.translate("menu.search"));
 		this.searchAllItem.setText(I18n.translate("menu.search.all"));
 		this.searchClassItem.setText(I18n.translate("menu.search.class"));
@@ -55,4 +57,9 @@ private void onSearchClicked(boolean clear, SearchDialog.Type... types) {
 			this.gui.getSearchDialog().show(clear, types);
 		}
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/SearchMenusMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/SearchMenusMenu.java
@@ -148,18 +148,16 @@ public void retranslate() {
 
 	private static class Result {
 		final SearchableElement element;
-		final String alias;
 
 		@Nullable JMenuItem item;
 
-		Result(SearchableElement element, String alias) {
+		Result(SearchableElement element) {
 			this.element = element;
-			this.alias = alias;
 		}
 
 		JMenuItem getItem() {
 			if (this.item == null) {
-				this.item = new JMenuItem(this.alias);
+				this.item = new JMenuItem(this.element.getSearchName());
 			}
 
 			return this.item;
@@ -261,9 +259,10 @@ void clearCurrent() {
 							keep.accept(searchable);
 						}
 					})
-					.forEach(searchable -> searchable
-						.streamSearchAliases()
-						.forEach(alias -> elementsBuilder.put(alias, new Result(searchable, alias)))
+					.map(Result::new)
+					.forEach(result -> result
+						.element.streamSearchAliases()
+						.forEach(alias -> elementsBuilder.put(alias, result))
 					);
 
 			return elementsBuilder.getView();
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/CrashHistoryMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/CrashHistoryMenu.java
@@ -10,13 +10,15 @@
 import javax.swing.JMenuItem;
 
 public class CrashHistoryMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.file.crash_history";
+
 	protected CrashHistoryMenu(Gui gui) {
 		super(gui);
 	}
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.file.crash_history"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 	}
 
 	@Override
@@ -40,4 +42,9 @@ public void updateState(boolean jarOpen, ConnectionState state) {
 	private void onCrashClicked(Throwable throwable) {
 		CrashDialog.show(throwable, false);
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/FileMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/FileMenu.java
@@ -22,6 +22,8 @@
 import java.util.Optional;
 
 public class FileMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.file";
+
 	private final SaveMappingsAsMenu saveMappingsAs;
 	private final CrashHistoryMenu crashHistory;
 	private final OpenRecentMenu openRecent;
@@ -122,7 +124,7 @@ public void updateState(boolean jarOpen, ConnectionState state) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.file"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.jarOpenItem.setText(I18n.translate("menu.file.jar.open"));
 		this.jarCloseItem.setText(I18n.translate("menu.file.jar.close"));
 		this.openRecent.retranslate();
@@ -262,4 +264,9 @@ private void onExportJarClicked() {
 			Config.main().stats.lastSelectedDir.setValue(this.gui.exportJarFileChooser.getCurrentDirectory().getAbsolutePath(), true);
 		}
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/OpenRecentMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/OpenRecentMenu.java
@@ -13,13 +13,15 @@
 import java.util.List;
 
 public class OpenRecentMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.file.open_recent_project";
+
 	protected OpenRecentMenu(Gui gui) {
 		super(gui);
 	}
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.file.open_recent_project"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 	}
 
 	@Override
@@ -87,4 +89,9 @@ private static Path findCommonPath(Path a, Path b) {
 
 		return i != 0 ? a.getRoot().resolve(a.subpath(0, i)) : null;
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/SaveMappingsAsMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/SaveMappingsAsMenu.java
@@ -17,6 +17,8 @@
 import java.util.function.Consumer;
 
 public class SaveMappingsAsMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.file.mappings.save_as";
+
 	private final Map<ReadWriteService, JMenuItem> items = new HashMap<>();
 
 	protected SaveMappingsAsMenu(Gui gui) {
@@ -33,7 +35,7 @@ protected SaveMappingsAsMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.file.mappings.save_as"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 
 		this.forEachFormat(format -> this.items.get(format).setText(I18n.translate(format.getId())));
 	}
@@ -65,4 +67,9 @@ private void forEachFormat(Consumer<ReadWriteService> consumer) {
 			}
 		});
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipsMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipsMenu.java
@@ -10,6 +10,8 @@
 import static org.quiltmc.enigma.gui.util.GuiUtil.createSyncedMenuCheckBox;
 
 public class EntryTooltipsMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.view.entry_tooltips";
+
 	private final JCheckBoxMenuItem enable = createSyncedMenuCheckBox(Config.editor().entryTooltips.enable);
 	private final JCheckBoxMenuItem interactable = createSyncedMenuCheckBox(Config.editor().entryTooltips.interactable);
 
@@ -24,8 +26,13 @@ protected EntryTooltipsMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.view.entry_tooltips"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 		this.enable.setText(I18n.translate("menu.view.entry_tooltips.enable"));
 		this.interactable.setText(I18n.translate("menu.view.entry_tooltips.interactable"));
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/LanguagesMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/LanguagesMenu.java
@@ -13,6 +13,8 @@
 import java.util.Map;
 
 public class LanguagesMenu extends AbstractSearchableEnigmaMenu {
+	private static final String TRANSLATION_KEY = "menu.view.languages";
+
 	private final Map<String, JRadioButtonMenuItem> languages = new HashMap<>();
 
 	protected LanguagesMenu(Gui gui) {
@@ -31,7 +33,7 @@ protected LanguagesMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.view.languages"));
+		this.setText(I18n.translate(TRANSLATION_KEY));
 
 		for (String lang : I18n.getAvailableLanguages()) {
 			this.languages.get(lang).setText(I18n.getLanguageName(lang));
@@ -52,4 +54,9 @@ private void onLanguageButtonClicked(String lang) {
 		I18n.setLanguage(lang);
 		LanguageUtil.dispatchLanguageChange();
 	}
+
+	@Override
+	public String getAliasesTranslationKeyPrefix() {
+		return TRANSLATION_KEY;
+	}
 }
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/NotificationsMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/NotificationsMenu.java
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ScaleMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ScaleMenu.java
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/StatsMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/StatsMenu.java
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ThemesMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ThemesMenu.java
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ViewMenu.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ViewMenu.java
diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`import java.util.Arrays;`
`17`	`17`
`18`	`18`	`public class CollabMenu extends AbstractSearchableEnigmaMenu {`
	`19`	`+ private static final String TRANSLATION_KEY = "menu.collab";`
	`20`	`+`
`19`	`21`	`private final JMenuItem connectItem = new JMenuItem();`
`20`	`22`	`private final JMenuItem startServerItem = new JMenuItem();`
`21`	`23`
`@@ -31,7 +33,7 @@ public CollabMenu(Gui gui) {`
`31`	`33`
`32`	`34`	`@Override`
`33`	`35`	`public void retranslate() {`
`34`		`- this.setText(I18n.translate("menu.collab"));`
	`36`	`+ this.setText(I18n.translate(TRANSLATION_KEY));`
`35`	`37`	`this.retranslate(this.gui.getConnectionState());`
`36`	`38`	`}`
`37`	`39`
`@@ -102,4 +104,9 @@ public void onStartServerClicked() {`
`102`	`104`	`this.gui.getController().disconnectIfConnected(null);`
`103`	`105`	`}`
`104`	`106`	`}`
	`107`	`+`
	`108`	`+ @Override`
	`109`	`+ public String getAliasesTranslationKeyPrefix() {`
	`110`	`+ return TRANSLATION_KEY;`
	`111`	`+ }`
`105`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@`
`10`	`10`	`import javax.swing.JMenuItem;`
`11`	`11`
`12`	`12`	`public class CrashHistoryMenu extends AbstractSearchableEnigmaMenu {`
	`13`	`+ private static final String TRANSLATION_KEY = "menu.file.crash_history";`
	`14`	`+`
`13`	`15`	`protected CrashHistoryMenu(Gui gui) {`
`14`	`16`	`super(gui);`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`@Override`
`18`	`20`	`public void retranslate() {`
`19`		`- this.setText(I18n.translate("menu.file.crash_history"));`
	`21`	`+ this.setText(I18n.translate(TRANSLATION_KEY));`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`@Override`
`@@ -40,4 +42,9 @@ public void updateState(boolean jarOpen, ConnectionState state) {`
`40`	`42`	`private void onCrashClicked(Throwable throwable) {`
`41`	`43`	`CrashDialog.show(throwable, false);`
`42`	`44`	`}`
	`45`	`+`
	`46`	`+ @Override`
	`47`	`+ public String getAliasesTranslationKeyPrefix() {`
	`48`	`+ return TRANSLATION_KEY;`
	`49`	`+ }`
`43`	`50`	`}`