Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.property.*;
import javafx.event.Event;
import javafx.event.EventType;
import javafx.scene.Node;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
Expand Down Expand Up @@ -61,6 +63,13 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage

private String preferredVersionName = null;

public static class WorkingDirChangedEvent extends Event {
public static final EventType<WorkingDirChangedEvent> EVENT_TYPE = new EventType<>(Event.ANY, "WORKING_DIR_CHANGED");
public WorkingDirChangedEvent() {
super(EVENT_TYPE);
}
}

public VersionPage() {
versionSettingsTab.setNodeSupplier(loadVersionFor(() -> new VersionSettingsPage(false)));
installerListTab.setNodeSupplier(loadVersionFor(InstallerListPage::new));
Expand All @@ -74,6 +83,21 @@ public VersionPage() {

addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onNavigated);

addEventHandler(WorkingDirChangedEvent.EVENT_TYPE, event -> {
if (this.version.get() != null) {
if (installerListTab.isInitialized())
installerListTab.getNode().loadVersion(getProfile(), getVersion());
if (modListTab.isInitialized())
modListTab.getNode().loadVersion(getProfile(), getVersion());
if (resourcePackTab.isInitialized())
resourcePackTab.getNode().loadVersion(getProfile(), getVersion());
if (worldListTab.isInitialized())
worldListTab.getNode().loadVersion(getProfile(), getVersion());
if (schematicsTab.isInitialized())
schematicsTab.getNode().loadVersion(getProfile(), getVersion());
}
});

listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
import javafx.scene.text.Text;
import javafx.stage.FileChooser;
import javafx.stage.Screen;
import org.jackhuang.hmcl.game.*;
import org.jackhuang.hmcl.game.GameDirectoryType;
import org.jackhuang.hmcl.game.HMCLGameRepository;
import org.jackhuang.hmcl.game.ProcessPriority;
import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.java.JavaManager;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.setting.*;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
Expand All @@ -48,7 +52,6 @@
import org.jackhuang.hmcl.util.javafx.PropertyUtils;
import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
import org.jackhuang.hmcl.util.platform.Architecture;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
import org.jackhuang.hmcl.util.platform.SystemInfo;
import org.jackhuang.hmcl.util.platform.hardware.PhysicalMemoryStatus;
Expand Down Expand Up @@ -99,6 +102,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
private final InvalidationListener usesGlobalListener;
private final ChangeListener<Boolean> specificSettingsListener;
private final InvalidationListener javaListener = any -> initJavaSubtitle();

private final ChangeListener<GameDirectoryType> gameDirTypeListener = (ob, o, n) -> fireWorkingDirChanged();
private final ChangeListener<String> gameDirListener = (ob, o, n) -> fireWorkingDirChanged();

private boolean updatingJavaSetting = false;
private boolean updatingSelectedJava = false;

Expand Down Expand Up @@ -455,13 +462,20 @@ public VersionSettingsPage(boolean globalSetting) {
else
profile.getRepository().globalizeVersionSetting(versionId);

Platform.runLater(() -> loadVersion(profile, versionId));
FXUtils.runInFX(() -> {
loadVersion(profile, versionId);
fireWorkingDirChanged();
});
};

addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating);

componentList.disableProperty().bind(enableSpecificSettings.not());
}

private void fireWorkingDirChanged() {
FXUtils.runInFX(() -> fireEvent(new VersionPage.WorkingDirChangedEvent()));
}

@Override
public void loadVersion(Profile profile, String versionId) {
Expand Down Expand Up @@ -513,6 +527,9 @@ public void loadVersion(Profile profile, String versionId) {
lastVersionSetting.defaultJavaPathPropertyProperty().removeListener(javaListener);
lastVersionSetting.javaVersionProperty().removeListener(javaListener);

lastVersionSetting.gameDirTypeProperty().removeListener(gameDirTypeListener);
lastVersionSetting.gameDirProperty().removeListener(gameDirListener);

gameDirItem.selectedDataProperty().unbindBidirectional(lastVersionSetting.gameDirTypeProperty());
gameDirSublist.subtitleProperty().unbind();

Expand Down Expand Up @@ -589,6 +606,9 @@ public void loadVersion(Profile profile, String versionId) {
gameDirSublist.subtitleProperty().bind(Bindings.createStringBinding(() -> profile.getRepository().getRunDirectory(versionId).toAbsolutePath().normalize().toString(),
versionSetting.gameDirProperty(), versionSetting.gameDirTypeProperty()));

versionSetting.gameDirTypeProperty().addListener(gameDirTypeListener);
versionSetting.gameDirProperty().addListener(gameDirListener);

lastVersionSetting = versionSetting;

initJavaSubtitle();
Expand Down