lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用UUID而不是角色名来标识皮肤

Browse Source
This commit is contained in:
yushijinhun
2018-06-02 18:15:41 +08:00
parent ebc0b4b2b0
commit 3866377a28
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java
View File

@@ -38,6 +38,7 @@ import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.UUID;
public final class AccountHelper { public final class AccountHelper {
@@ -73,8 +74,8 @@ public final class AccountHelper {
return new SkinLoadTask(account, proxy, true); return new SkinLoadTask(account, proxy, true);
} }
private static File getSkinFile(String name) { private static File getSkinFile(UUID uuid) {
return new File(SKIN_DIR, name + ".png"); return new File(SKIN_DIR, uuid + ".png");
} }
public static Image getSkin(YggdrasilAccount account) { public static Image getSkin(YggdrasilAccount account) {
@@ -84,7 +85,7 @@ public final class AccountHelper {
public static Image getSkin(YggdrasilAccount account, double scaleRatio) { public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
if (account.getCharacter() == null) if (account.getCharacter() == null)
return getDefaultSkin(account, scaleRatio); return getDefaultSkin(account, scaleRatio);
File file = getSkinFile(account.getCharacter()); File file = getSkinFile(account.getUUID());
if (file.exists()) { if (file.exists()) {
Image original = new Image("file:" + file.getAbsolutePath()); Image original = new Image("file:" + file.getAbsolutePath());
return new Image("file:" + file.getAbsolutePath(), return new Image("file:" + file.getAbsolutePath(),
@@ -96,8 +97,7 @@ public final class AccountHelper {
} }
public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio, Proxy proxy) throws Exception { public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio, Proxy proxy) throws Exception {
String name = profile.getName(); File file = getSkinFile(profile.getId());
File file = getSkinFile(name);
downloadSkin(account, profile, true, proxy); downloadSkin(account, profile, true, proxy);
if (!file.exists()) if (!file.exists())
return getDefaultSkin(account, scaleRatio); return getDefaultSkin(account, scaleRatio);
@@ -152,7 +152,7 @@ public final class AccountHelper {
Optional<Texture> texture = account.getSkin(profile); Optional<Texture> texture = account.getSkin(profile);
if (!texture.isPresent()) return; if (!texture.isPresent()) return;
String url = texture.get().getUrl(); String url = texture.get().getUrl();
File file = getSkinFile(profile.getName()); File file = getSkinFile(profile.getId());
if (!refresh && file.exists()) if (!refresh && file.exists())
return; return;
new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run(); new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
@@ -165,7 +165,7 @@ public final class AccountHelper {
Optional<Texture> texture = account.getSkin(); Optional<Texture> texture = account.getSkin();
if (!texture.isPresent()) return; if (!texture.isPresent()) return;
String url = texture.get().getUrl(); String url = texture.get().getUrl();
File file = getSkinFile(account.getCharacter()); File file = getSkinFile(account.getUUID());
if (!refresh && file.exists()) if (!refresh && file.exists())
return; return;
new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run(); new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();