Skip to content

Commit b03cf64

Browse files
move FeaturesSection.enableClassTreeStatIcons to StatsSection
move FeaturesSection.autoSaveMappings to EditorConfig eliminate FeaturesSection
1 parent bd5d3a6 commit b03cf64

File tree

10 files changed

+15
-27
lines changed

10 files changed

+15
-27
lines changed

enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void openMappings(EntryTree<EntryMapping> mappings) {
197197
}
198198

199199
public void regenerateAndUpdateStatIcons() {
200-
if (Config.main().features.enableClassTreeStatIcons.value()) {
200+
if (Config.stats().enableClassTreeStatIcons.value()) {
201201
ProgressListener progressListener = ProgressListener.createEmpty();
202202
this.gui.getMainWindow().getStatusBar().syncWith(progressListener);
203203

@@ -570,7 +570,7 @@ public void applyChange(ValidationContext vc, EntryChange<?> change, boolean upd
570570
return;
571571
}
572572

573-
if (autosave && Config.main().features.autoSaveMappings.value() && this.gui.mappingsFileChooser.getSelectedFile() != null) {
573+
if (autosave && Config.editor().autoSaveMappings.value() && this.gui.mappingsFileChooser.getSelectedFile() != null) {
574574
this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile().toPath(), true);
575575
}
576576

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ public final class Config extends ReflectiveConfig {
8181
@Comment("The settings for the statistics window.")
8282
public final StatsSection stats = new StatsSection();
8383

84-
@Comment("Contains all features that can be toggled on or off.")
85-
public final FeaturesSection features = new FeaturesSection();
86-
8784
@Comment("You shouldn't enable options in this section unless you know what you're doing!")
8885
public final DevSection development = new DevSection();
8986

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EditorConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
@SerializedNameConvention(NamingSchemes.SNAKE_CASE)
1010
public class EditorConfig extends ReflectiveConfig {
11+
@Comment("Enables auto save functionality, which will automatically save mappings when a change is made.")
12+
public final TrackedValue<Boolean> autoSaveMappings = this.value(false);
13+
1114
@Comment("Whether editors' quick find toolbars should remain visible when they lose focus.")
1215
public final TrackedValue<Boolean> persistentQuickFind = this.value(true);
1316

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/FeaturesSection.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/StatsSection.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public class StatsSection extends ReflectiveConfig.Section {
2222
public final TrackedValue<Boolean> shouldIncludeSyntheticParameters = this.value(false);
2323
public final TrackedValue<Boolean> shouldCountFallbackNames = this.value(false);
2424

25+
@Comment("Enables statistic icons in the class tree. This has a major performance impact on JAR files with lots of classes.")
26+
public final TrackedValue<Boolean> enableClassTreeStatIcons = this.value(true);
27+
2528
public Set<StatType> getIncludedTypesForIcons(Set<StatType> editableTypes) {
2629
var types = new HashSet<>(editableTypes);
2730
types.removeIf(type -> !this.includedStatTypes.value().contains(type));

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/ClassTreeCellRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ String getDisplayName() {
9090
JLabel nodeLabel = new JLabel(icon);
9191
panel.add(nodeLabel);
9292

93-
if (Config.main().features.enableClassTreeStatIcons.value()) {
93+
if (Config.stats().enableClassTreeStatIcons.value()) {
9494
if (this.controller.getStatsGenerator() != null) {
9595
ProjectStatsResult stats = this.controller.getStatsGenerator().getResultNullable(Config.stats().createIconGenParameters(this.controller.getGui().getEditableStatTypes()));
9696
if (stats == null) {

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/file/FileMenu.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public FileMenu(Gui gui) {
8080
this.jarCloseItem.addActionListener(e -> this.gui.getController().closeJar());
8181
this.maxRecentFilesItem.addActionListener(e -> this.onMaxRecentFilesClicked());
8282
this.saveMappingsItem.addActionListener(e -> this.onSaveMappingsClicked());
83-
this.autoSaveMappingsItem.addActionListener(e -> Config.main().features.autoSaveMappings.setValue(this.autoSaveMappingsItem.getState()));
83+
this.autoSaveMappingsItem.addActionListener(e -> Config.editor().autoSaveMappings.setValue(this.autoSaveMappingsItem.getState()));
8484
this.closeMappingsItem.addActionListener(e -> this.onCloseMappingsClicked());
8585
this.dropMappingsItem.addActionListener(e -> this.gui.getController().dropMappings());
8686
this.reloadMappingsItem.addActionListener(e -> this.onReloadMappingsClicked());
@@ -109,7 +109,7 @@ public void updateState(boolean jarOpen, ConnectionState state) {
109109
this.saveMappingsItem.setEnabled(jarOpen && this.gui.mappingsFileChooser.getSelectedFile() != null && this.gui.getConnectionState() != ConnectionState.CONNECTED);
110110
this.saveMappingsAs.updateState();
111111
this.autoSaveMappingsItem.setEnabled(jarOpen);
112-
this.autoSaveMappingsItem.setState(Config.main().features.autoSaveMappings.value());
112+
this.autoSaveMappingsItem.setState(Config.editor().autoSaveMappings.value());
113113
this.closeMappingsItem.setEnabled(jarOpen);
114114
this.reloadMappingsItem.setEnabled(jarOpen);
115115
this.reloadAllItem.setEnabled(jarOpen);

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/StatsMenu.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void retranslate() {
5858

5959
@Override
6060
public void updateState(boolean jarOpen, ConnectionState state) {
61-
this.enableIcons.setSelected(Config.main().features.enableClassTreeStatIcons.value());
61+
this.enableIcons.setSelected(Config.stats().enableClassTreeStatIcons.value());
6262
this.includeSynthetic.setSelected(Config.main().stats.shouldIncludeSyntheticParameters.value());
6363
this.countFallback.setSelected(Config.main().stats.shouldCountFallbackNames.value());
6464

@@ -69,7 +69,7 @@ public void updateState(boolean jarOpen, ConnectionState state) {
6969
}
7070

7171
private void onEnableIconsClicked() {
72-
Config.main().features.enableClassTreeStatIcons.setValue(this.enableIcons.isSelected());
72+
Config.stats().enableClassTreeStatIcons.setValue(this.enableIcons.isSelected());
7373
this.updateIconsLater();
7474
}
7575

enigma-swing/src/main/java/org/quiltmc/enigma/gui/node/ClassSelectorClassNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void done() {
113113
}
114114
};
115115

116-
if (Config.main().features.enableClassTreeStatIcons.value()) {
116+
if (Config.stats().enableClassTreeStatIcons.value()) {
117117
SwingUtilities.invokeLater(iconUpdateWorker::execute);
118118
}
119119

enigma-swing/src/main/java/org/quiltmc/enigma/gui/util/PackageRenamer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public CompletableFuture<Void> renamePackage(String path, String input) {
194194
classSelector.restoreExpansionState(entry.getValue());
195195
}
196196

197-
if (Config.main().features.autoSaveMappings.value() && this.gui.mappingsFileChooser.getSelectedFile() != null) {
197+
if (Config.editor().autoSaveMappings.value() && this.gui.mappingsFileChooser.getSelectedFile() != null) {
198198
this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile().toPath(), true);
199199
}
200200
});

0 commit comments

Comments
 (0)