Update TexturesLoader.java

This commit is contained in:
ShirosakiMio 2024-08-12 19:59:45 +08:00
parent 8e86c6d590
commit fb730050ae
1 changed files with 17 additions and 13 deletions

View File

@ -115,17 +115,19 @@ public final class TexturesLoader {
if (texture.getUrl().equals("offline") && accounts.length == 1) { if (texture.getUrl().equals("offline") && accounts.length == 1) {
OfflineAccount account = accounts[0]; OfflineAccount account = accounts[0];
Skin.LoadedSkin loadedSkin = account.getSkin().load(account.getUsername()).run(); Skin skin = account.getSkin();
if (skin != null) {
Skin.LoadedSkin loadedSkin = skin.load(account.getUsername()).run();
if (loadedSkin != null) { if (loadedSkin != null) {
Bitmap img = loadedSkin.getSkin() == null ? null : loadedSkin.getSkin().getImage(); Bitmap img = loadedSkin.getSkin() == null ? null : loadedSkin.getSkin().getImage();
if (img == null) { if (img == null) {
img = getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage(); img = getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage();
} }
return new LoadedTexture(img, metadata); return new LoadedTexture(img, metadata);
} else {
return getDefaultSkin(TextureModel.detectUUID(account.getUUID()));
} }
} }
return getDefaultSkin(TextureModel.detectUUID(account.getUUID()));
}
Path file = getTexturePath(texture); Path file = getTexturePath(texture);
if (!Files.isRegularFile(file)) { if (!Files.isRegularFile(file)) {
@ -160,13 +162,15 @@ public final class TexturesLoader {
if (texture.getUrl().equals("offline") && accounts.length == 1) { if (texture.getUrl().equals("offline") && accounts.length == 1) {
OfflineAccount account = accounts[0]; OfflineAccount account = accounts[0];
Skin.LoadedSkin loadedSkin = account.getSkin().load(account.getUsername()).run(); Skin skin = account.getSkin();
if (skin != null) {
Skin.LoadedSkin loadedSkin = skin.load(account.getUsername()).run();
if (loadedSkin != null) { if (loadedSkin != null) {
return loadedSkin.getSkin() == null ? null : loadedSkin.getCape().getImage(); return loadedSkin.getSkin() == null ? null : loadedSkin.getCape().getImage();
} else {
return getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage();
} }
} }
return getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage();
}
Path file = getTexturePath(texture); Path file = getTexturePath(texture);
if (!Files.isRegularFile(file)) { if (!Files.isRegularFile(file)) {