Skip to content

feat:将原来的弹出式“皮肤管理”迁移到一个单独的页面 #5820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NoClassFoundError wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat:将原来的弹出式“皮肤管理”迁移到一个单独的页面 #5820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16ae8c5
将原来的弹出式“皮肤管理”迁移到一个单独的页面
NoClassFoundError Mar 21, 2026
706360e
支持解析更多的皮肤上传错误，移除多余import
NoClassFoundError Mar 21, 2026
e597d32
修正i18n内的中文括号
NoClassFoundError Mar 21, 2026
df062d5
Merge branch 'HMCL-dev:main' into 5809skin
NoClassFoundError Mar 21, 2026
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
8 changes: 8 additions & 0 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.task.TaskExecutor;
import org.jackhuang.hmcl.ui.account.AccountListPage;
import org.jackhuang.hmcl.ui.account.SkinManagePage;
import org.jackhuang.hmcl.ui.animation.AnimationUtils;
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
import org.jackhuang.hmcl.ui.animation.Motion;
Expand Down Expand Up @@ -123,6 +124,7 @@ public final class Controllers {
});
private static LauncherSettingsPage settingsPage;
private static Lazy<TerracottaPage> terracottaPage = new Lazy<>(TerracottaPage::new);
private static Lazy<SkinManagePage> skinManagePage = new Lazy<>(SkinManagePage::new);

private Controllers() {
}
Expand Down Expand Up @@ -203,6 +205,11 @@ public static Node getTerracottaPage() {
return terracottaPage.get();
}

// FXThread
public static SkinManagePage getSkinManagePage() {
return skinManagePage.get();
}

// FXThread
public static DecoratorController getDecorator() {
return decorator;
Expand Down Expand Up @@ -630,6 +637,7 @@ public static void shutdown() {
accountListPage = null;
settingsPage = null;
terracottaPage = null;
skinManagePage = null;
decorator = null;
stage = null;
scene = null;
Expand Down
59 changes: 4 additions & 55 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import javafx.beans.value.ObservableBooleanValue;
import javafx.scene.control.RadioButton;
import javafx.scene.control.Skin;
import javafx.scene.image.Image;
import javafx.stage.FileChooser;
import org.jackhuang.hmcl.auth.Account;
import org.jackhuang.hmcl.auth.AuthenticationException;
import org.jackhuang.hmcl.auth.CredentialExpiredException;
Expand All @@ -36,19 +34,10 @@
import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
import org.jackhuang.hmcl.setting.Accounts;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.DialogController;
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.skin.InvalidSkinException;
import org.jackhuang.hmcl.util.skin.NormalizedSkin;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CancellationException;
Expand Down Expand Up @@ -132,49 +121,9 @@ public ObservableBooleanValue canUploadSkin() {
}
}

/**
* @return the skin upload task, null if no file is selected
*/
@Nullable
public Task<?> uploadSkin() {
if (account instanceof OfflineAccount) {
Controllers.dialog(new OfflineAccountSkinPane((OfflineAccount) account));
return null;
}
if (!account.canUploadSkin()) {
return null;
}

FileChooser chooser = new FileChooser();
chooser.setTitle(i18n("account.skin.upload"));
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("account.skin.file"), "*.png"));
Path selectedFile = FileUtils.toPath(chooser.showOpenDialog(Controllers.getStage()));
if (selectedFile == null) {
return null;
}

return refreshAsync()
.thenRunAsync(() -> {
Image skinImg;
try (var input = Files.newInputStream(selectedFile)) {
skinImg = new Image(input);
} catch (IOException e) {
throw new InvalidSkinException("Failed to read skin image", e);
}
if (skinImg.isError()) {
throw new InvalidSkinException("Failed to read skin image", skinImg.getException());
}
NormalizedSkin skin = new NormalizedSkin(skinImg);
String model = skin.isSlim() ? "slim" : "";
LOG.info("Uploading skin [" + selectedFile + "], model [" + model + "]");
account.uploadSkin(skin.isSlim(), selectedFile);
})
.thenComposeAsync(refreshAsync())
.whenComplete(Schedulers.javafx(), e -> {
if (e != null) {
Controllers.dialog(Accounts.localizeErrorMessage(e), i18n("account.skin.upload.failed"), MessageType.ERROR);
}
});
public void navigateToSkinPage() {
Controllers.getSkinManagePage().loadAccount(account);
Controllers.navigate(Controllers.getSkinManagePage());
}

public void remove() {
Expand Down
16 changes: 2 additions & 14 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.jackhuang.hmcl.game.TexturesLoader;
import org.jackhuang.hmcl.setting.Accounts;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.SVG;
Expand Down Expand Up @@ -149,21 +148,10 @@ public AccountListItemSkin(AccountListItem skinnable) {
right.getChildren().add(spinnerRefresh);

JFXButton btnUpload = FXUtils.newToggleButton4(SVG.CHECKROOM);
SpinnerPane spinnerUpload = new SpinnerPane();
btnUpload.setOnAction(e -> {
Task<?> uploadTask = skinnable.uploadSkin();
if (uploadTask != null) {
spinnerUpload.showSpinner();
uploadTask
.whenComplete(Schedulers.javafx(), ex -> spinnerUpload.hideSpinner())
.start();
}
});
btnUpload.setOnAction(e -> skinnable.navigateToSkinPage());
FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload"));
btnUpload.disableProperty().bind(Bindings.not(skinnable.canUploadSkin()));
spinnerUpload.setContent(btnUpload);
spinnerUpload.getStyleClass().add("small-spinner-pane");
right.getChildren().add(spinnerUpload);
right.getChildren().add(btnUpload);

JFXButton btnCopyUUID = FXUtils.newToggleButton4(SVG.CONTENT_COPY);
SpinnerPane spinnerCopyUUID = new SpinnerPane();
Expand Down
17 changes: 16 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,24 @@ public AccountListPageSkin(AccountListPage skinnable) {
VBox.setMargin(addAuthServerItem, new Insets(0, 0, 12, 0));
}

AdvancedListItem skinManageItem = new AdvancedListItem();
{
skinManageItem.getStyleClass().add("navigation-drawer-item");
skinManageItem.setTitle(i18n("account.skin.manage"));
skinManageItem.setLeftIcon(SVG.CHECKROOM);
skinManageItem.setOnAction(e -> {
Account selected = skinnable.selectedAccount.get();
if (selected != null) {
Controllers.getSkinManagePage().loadAccount(selected);
Controllers.navigate(Controllers.getSkinManagePage());
}
});
skinManageItem.disableProperty().bind(Bindings.isNull(skinnable.selectedAccount));
}

ScrollPane scrollPane = new ScrollPane(boxMethods);
VBox.setVgrow(scrollPane, Priority.ALWAYS);
setLeft(scrollPane, addAuthServerItem);
setLeft(scrollPane, skinManageItem, addAuthServerItem);
}

ScrollPane scrollPane = new ScrollPane();
Expand Down
Loading