Skip to content

微软账户上传皮肤功能新增粗细手臂选择 #5022

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
CiiLu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

微软账户上传皮肤功能新增粗细手臂选择 #5022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bee9b1
update
CiiLu Dec 20, 2025
9ba3ebe
Merge branch 'HMCL-dev:main' into msls
CiiLu Jan 2, 2026
76d70c3
update
CiiLu Jan 2, 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
95 changes: 63 additions & 32 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 @@ -34,12 +34,15 @@
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
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.FXUtils;
import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.skin.InvalidSkinException;
Expand All @@ -49,14 +52,16 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;

import static java.util.Collections.emptySet;
import static javafx.beans.binding.Bindings.createBooleanBinding;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;

public class AccountListItem extends RadioButton {

Expand All @@ -73,9 +78,7 @@ public AccountListItem(Account account) {
String portableSuffix = account.isPortable() ? ", " + i18n("account.portable") : "";
if (account instanceof AuthlibInjectorAccount) {
AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
subtitle.bind(Bindings.concat(
loginTypeName, ", ", i18n("account.injector.server"), ": ",
Bindings.createStringBinding(server::getName, server), portableSuffix));
subtitle.bind(Bindings.concat(loginTypeName, ", ", i18n("account.injector.server"), ": ", Bindings.createStringBinding(server::getName, server), portableSuffix));
} else {
subtitle.set(loginTypeName + portableSuffix);
}
Expand All @@ -84,9 +87,7 @@ public AccountListItem(Account account) {
if (account instanceof OfflineAccount) {
title.bind(characterName);
} else {
title.bind(
account.getUsername().isEmpty() ? characterName :
Bindings.concat(account.getUsername(), " - ", characterName));
title.bind(account.getUsername().isEmpty() ? characterName : Bindings.concat(account.getUsername(), " - ", characterName));
}
}

Expand Down Expand Up @@ -120,9 +121,7 @@ public ObservableBooleanValue canUploadSkin() {
if (account instanceof AuthlibInjectorAccount aiAccount) {
ObjectBinding<Optional<CompleteGameProfile>> profile = aiAccount.getYggdrasilService().getProfileRepository().binding(aiAccount.getUUID());
return createBooleanBinding(() -> {
Set<TextureType> uploadableTextures = profile.get()
.map(AuthlibInjectorAccount::getUploadableTextures)
.orElse(emptySet());
Set<TextureType> uploadableTextures = profile.get().map(AuthlibInjectorAccount::getUploadableTextures).orElse(emptySet());
return uploadableTextures.contains(TextureType.SKIN);
}, profile);
} else if (account instanceof OfflineAccount || account.canUploadSkin()) {
Expand Down Expand Up @@ -153,28 +152,60 @@ public Task<?> uploadSkin() {
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);
}
});
return refreshAsync().thenSupplyAsync(() -> {
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());
}

return new NormalizedSkin(skinImg);
}).thenApplyAsync(Schedulers.javafx(), (normalizedSkin) -> {
boolean isSlim = normalizedSkin.isSlim();

CompletableFuture<TextureModel> modelFuture = new CompletableFuture<>();

FXUtils.runInFX(() -> {
MessageDialogPane.Builder builder = new MessageDialogPane.Builder(
i18n("account.skin.model.select"),
i18n("account.skin.upload"),
MessageDialogPane.MessageType.QUESTION
);

if (isSlim) {
builder.addAction(i18n("account.skin.model.slim") + " " + i18n("account.skin.model.auto"),
() -> modelFuture.complete(TextureModel.SLIM));
builder.addAction(i18n("account.skin.model.default"),
() -> modelFuture.complete(TextureModel.WIDE));
} else {
builder.addAction(i18n("account.skin.model.default") + " " + i18n("account.skin.model.auto"),
() -> modelFuture.complete(TextureModel.WIDE));
builder.addAction(i18n("account.skin.model.slim"),
() -> modelFuture.complete(TextureModel.SLIM));
}

builder.addCancel(() -> modelFuture.complete(null));
Controllers.dialog(builder.build());
});

return modelFuture;
}).thenApplyAsync((future) -> {
if (future == null) {
return null;
}
TextureModel model = future.get();
LOG.info("Uploading skin [" + selectedFile + "], model [" + model.modelName + "]");
account.uploadSkin(Objects.equals(TextureModel.SLIM, model), selectedFile);
return null;
}).thenComposeAsync(refreshAsync()).whenComplete(Schedulers.javafx(), e -> {
if (e != null) {
Controllers.dialog(Accounts.localizeErrorMessage(e), i18n("account.skin.upload.failed"), MessageType.ERROR);
}
});
}

public void remove() {
Expand Down
2 changes: 2 additions & 0 deletions HMCL/src/main/resources/assets/lang/I18N.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ account.skin.file=Skin File
account.skin.model=Model
account.skin.model.default=Classic
account.skin.model.slim=Slim
account.skin.model.auto=(Auto)
account.skin.model.select=The model of the skin you chose is?
account.skin.type.alex=Alex
account.skin.type.csl_api=Blessing Skin
account.skin.type.csl_api.location=Address
Expand Down
2 changes: 2 additions & 0 deletions HMCL/src/main/resources/assets/lang/I18N_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ account.skin.file=外觀圖片檔案
account.skin.model=模型
account.skin.model.default=寬型
account.skin.model.slim=纖細
account.skin.model.auto=(自動識別)
account.skin.model.select=你選取的外觀模型是？
account.skin.type.alex=Alex
account.skin.type.csl_api=Blessing Skin 伺服器
account.skin.type.csl_api.location=伺服器位址
Expand Down
2 changes: 2 additions & 0 deletions HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ account.skin.file=皮肤图片文件
account.skin.model=模型
account.skin.model.default=宽型
account.skin.model.slim=纤细
account.skin.model.auto=(自动识别)
account.skin.model.select=你选择的皮肤模型是？
account.skin.type.alex=Alex
account.skin.type.csl_api=Blessing Skin 服务器
account.skin.type.csl_api.location=服务器地址
Expand Down