Remove the game version field from settings

Author: Villagers654

launcher/src/main/java/net/modtale/launcher/ui/settings/LauncherSettingsController.java

@@ -265,13 +265,12 @@ private Node libraryDefaultsSection() {
         VBox defaults = settingsSection("settings.library.section", "settings.library.description",
                 LauncherIcons.Glyph.BOX);
         GridPane grid = settingsGrid();
-        addField(grid, 0, I18N.binding("settings.library.gameVersion"), form.gameVersionField());
         VBox toggles = new VBox(10,
                 toggleCard(form.includeDependenciesCheck()),
                 toggleCard(form.includeOptionalCheck()),
                 toggleCard(form.autoUpdatesCheck()));
         toggles.getStyleClass().add("settings-toggle-row");
-        addField(grid, 1, I18N.binding("settings.library.projectDefaults"), toggles);
+        addField(grid, 0, I18N.binding("settings.library.projectDefaults"), toggles);
         defaults.getChildren().add(grid);
         return defaults;
     }

launcher/src/main/java/net/modtale/launcher/ui/settings/LauncherSettingsForm.java

@@ -24,7 +24,6 @@
 public final class LauncherSettingsForm {
 
     private final TextField modsPathField = new TextField();
-    private final TextField gameVersionField = new TextField();
     private final TextField hytaleGamePathField = new TextField();
     private final TextField hytaleUserDataPathField = new TextField();
     private final TextField hytaleJavaPathField = new TextField();
@@ -60,7 +59,7 @@ public String fromString(String value) {
             }
         });
         hytaleBranchCombo.setOnAction(event -> hytaleVersionCombo.getItems().clear());
-        styleInput(modsPathField, gameVersionField, hytaleGamePathField, hytaleUserDataPathField, hytaleJavaPathField,
+        styleInput(modsPathField, hytaleGamePathField, hytaleUserDataPathField, hytaleJavaPathField,
                 playHytaleGamePathField, playHytaleUserDataPathField, playHytaleJavaPathField);
         launcherChannelCombo.setItems(FXCollections.observableArrayList("stable", "develop"));
         styleCombo(localeCombo, hytaleBranchCombo, hytaleVersionCombo, launcherChannelCombo);
@@ -74,10 +73,6 @@ public TextField modsPathField() {
         return modsPathField;
     }
 
-    public TextField gameVersionField() {
-        return gameVersionField;
-    }
-
     public TextField hytaleGamePathField() {
         return hytaleGamePathField;
     }
@@ -143,7 +138,6 @@ public CheckBox launcherAutoUpdatesCheck() {
 
     public void applyTo(LauncherSettings settings, LauncherView currentView, ModtaleApiClient apiClient) {
         settings.setHytaleModsPath(modsPathField.getText());
-        settings.setGameVersion(gameVersionField.getText());
         boolean playView = currentView == LauncherView.PLAY;
         settings.setHytaleGamePath(playView ? playHytaleGamePathField.getText() : hytaleGamePathField.getText());
         settings.setHytaleUserDataPath(playView ? playHytaleUserDataPathField.getText() : hytaleUserDataPathField.getText());
@@ -168,7 +162,6 @@ public void applyTo(LauncherSettings settings, LauncherView currentView, Modtale
 
     public void reloadFrom(LauncherSettings settings) {
         modsPathField.setText(settings.getHytaleModsPath());
-        gameVersionField.setText(settings.getGameVersion());
         hytaleGamePathField.setText(settings.getHytaleGamePath());
         hytaleUserDataPathField.setText(settings.getHytaleUserDataPath());
         hytaleJavaPathField.setText(settings.getHytaleJavaPath());

launcher/src/test/java/net/modtale/launcher/ui/settings/LauncherSettingsControllerPersistenceTest.java

@@ -40,12 +40,12 @@ void categoryNavigationRetainsUnsavedEditsAndAlwaysKeepsOneSelection() throws Ex
             var buttons = view.lookupAll(".settings-category").stream()
                     .map(node -> (javafx.scene.control.ToggleButton) node).toList();
             assertEquals(4, buttons.size());
-            controller.form().gameVersionField().setText("0.6.0");
+            controller.form().includeOptionalCheck().setSelected(true);
             buttons.forEach(button -> { button.fire(); button.fire(); });
             assertEquals(1, buttons.stream().filter(javafx.scene.control.ToggleButton::isSelected).count());
-            assertEquals("0.6.0", controller.form().gameVersionField().getText());
+            assertEquals(true, controller.form().includeOptionalCheck().isSelected());
             controller.saveFromFields(false);
-            assertEquals("0.6.0", controller.settings().getGameVersion());
+            assertEquals(true, controller.settings().isIncludeOptionalDependencies());
         });
     }
 
@@ -56,13 +56,15 @@ void earlySavePreservesExplicitPathsBeforeViewsReloadControls() throws Exception
             LauncherSettings settings = new LauncherSettings();
             String userData = root.resolve("custom/UserData").toString();
             String mods = root.resolve("separate/Mods").toString();
+            settings.setGameVersion("0.6.0");
             settings.setHytaleUserDataPath(userData);
             settings.setHytaleModsPath(mods);
             store.save(settings);
             for (LauncherView view : List.of(LauncherView.PLAY, LauncherView.SETTINGS)) {
                 var controller = new LauncherSettingsController(store,
                         new ModtaleApiClient("http://localhost"), () -> null, () -> view);
                 controller.saveFromFields(false);
+                assertEquals("0.6.0", store.load().getGameVersion());
                 assertEquals(userData, store.load().getHytaleUserDataPath());
                 assertEquals(mods, store.load().getHytaleModsPath());
             }