diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageBase.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageBase.java index 38911bbdd..b8c603fb8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageBase.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageBase.java @@ -23,10 +23,11 @@ import javafx.collections.ObservableList; import javafx.event.Event; import javafx.event.EventHandler; import javafx.scene.control.Control; +import org.jackhuang.hmcl.ui.animation.TransitionPane; import static org.jackhuang.hmcl.ui.construct.SpinnerPane.FAILED_ACTION; -public class ListPageBase extends Control { +public class ListPageBase extends Control implements TransitionPane.Cacheable { private final ListProperty items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList()); private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false); private final StringProperty failedReason = new SimpleStringProperty(this, "failed"); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java index 6897b1c28..2f487ff1d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerListPage.java @@ -29,7 +29,6 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.task.TaskListener; import org.jackhuang.hmcl.ui.*; -import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider; import org.jackhuang.hmcl.util.TaskCancellationAction; import org.jackhuang.hmcl.util.io.FileUtils; @@ -43,7 +42,7 @@ import java.util.concurrent.CompletableFuture; import static org.jackhuang.hmcl.ui.FXUtils.runInFX; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; -public class InstallerListPage extends ListPageBase implements VersionPage.VersionLoadable, TransitionPane.Cacheable { +public class InstallerListPage extends ListPageBase implements VersionPage.VersionLoadable { private Profile profile; private String versionId; private Version version; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java index 61706ddf1..b826216c9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java @@ -34,7 +34,6 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.ListPageBase; -import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.PageAware; import org.jackhuang.hmcl.util.TaskCancellationAction; @@ -50,7 +49,7 @@ import java.util.concurrent.locks.ReentrantLock; import static org.jackhuang.hmcl.util.logging.Logger.LOG; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; -public final class ModListPage extends ListPageBase implements VersionPage.VersionLoadable, PageAware, TransitionPane.Cacheable { +public final class ModListPage extends ListPageBase implements VersionPage.VersionLoadable, PageAware { private final BooleanProperty modded = new SimpleBooleanProperty(this, "modded", false); private final ReentrantLock lock = new ReentrantLock(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java index 3946f4a2b..8c529b80d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java @@ -37,7 +37,6 @@ import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.*; -import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.ui.construct.*; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.StringUtils; @@ -61,7 +60,7 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG; /** * @author Glavo */ -public final class SchematicsPage extends ListPageBase implements VersionPage.VersionLoadable, TransitionPane.Cacheable { +public final class SchematicsPage extends ListPageBase implements VersionPage.VersionLoadable { private static String translateAuthorName(String author) { if (I18n.isUseChinese() && "hsds".equals(author)) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java index f91d11ac3..e39162f31 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java @@ -27,7 +27,6 @@ import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.*; -import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.util.io.FileUtils; import java.io.IOException; @@ -42,7 +41,7 @@ import java.util.stream.Stream; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.logging.Logger.LOG; -public final class WorldListPage extends ListPageBase implements VersionPage.VersionLoadable, TransitionPane.Cacheable { +public final class WorldListPage extends ListPageBase implements VersionPage.VersionLoadable { private final BooleanProperty showAll = new SimpleBooleanProperty(this, "showAll", false); private Path savesDir;