From f50640139a5660e8e669b17acc68b2b1fcb9a239 Mon Sep 17 00:00:00 2001 From: 33 Date: Thu, 28 Jul 2022 10:59:12 +0800 Subject: [PATCH] Add: MinecraftCapesAPI --- .../loader/MojangAPILoader.java | 95 +++++++++++---- .../loader/jsonapi/MinecraftCapesAPI.java | 105 ++++++++++++++++ .../utils/HttpTextureUtil.java | 112 +++++++++++------- 3 files changed, 242 insertions(+), 70 deletions(-) create mode 100644 Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java diff --git a/Common/source/customskinloader/loader/MojangAPILoader.java b/Common/source/customskinloader/loader/MojangAPILoader.java index 32cf34c..0451b25 100644 --- a/Common/source/customskinloader/loader/MojangAPILoader.java +++ b/Common/source/customskinloader/loader/MojangAPILoader.java @@ -1,5 +1,6 @@ package customskinloader.loader; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Map; @@ -48,25 +49,44 @@ public class MojangAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.I @Override public void updateSkinSiteProfile(SkinSiteProfile ssp) { - ssp.type = this.loader.getName(); - ssp.apiRoot = this.getAPIRoot(); + ssp.type = this.loader.getName(); + ssp.apiRoot = this.getAPIRoot(); ssp.sessionRoot = this.getSessionRoot(); } public abstract String getAPIRoot(); + public abstract String getSessionRoot(); } public static class Mojang extends MojangAPILoader.DefaultProfile { - public Mojang(MojangAPILoader loader) { super(loader); } - @Override public String getName() { return "Mojang"; } - @Override public int getPriority() { return 100; } - @Override public String getAPIRoot() { return getMojangApiRoot(); } - @Override public String getSessionRoot() { return getMojangSessionRoot(); } + public Mojang(MojangAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "Mojang"; + } + + @Override + public int getPriority() { + return 100; + } + + @Override + public String getAPIRoot() { + return getMojangApiRoot(); + } + + @Override + public String getSessionRoot() { + return getMojangSessionRoot(); + } } @Override - public UserProfile loadProfile(SkinSiteProfile ssp, GameProfile gameProfile) throws Exception { + public UserProfile loadProfile(SkinSiteProfile ssp, GameProfile gameProfile) { Map map = getTextures(gameProfile); if (!map.isEmpty()) { CustomSkinLoader.logger.info("Default profile will be used."); @@ -94,35 +114,53 @@ public class MojangAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.I Gson gson = new GsonBuilder().registerTypeAdapter(UUID.class, new UUIDTypeAdapter()).create(); HttpRequestUtil.HttpResponce responce = HttpRequestUtil.makeHttpRequest( - new HttpRequestUtil.HttpRequest(apiRoot + "profiles/minecraft") - .setCacheTime(600).setPayload(gson.toJson(Collections.singletonList(username))) + new HttpRequestUtil.HttpRequest(apiRoot + "profiles/minecraft") + .setCacheTime(600).setPayload(gson.toJson(Collections.singletonList(username))) ); - if (StringUtils.isEmpty(responce.content)) + if (StringUtils.isEmpty(responce.content)) { return null; - + } GameProfile[] profiles = gson.fromJson(responce.content, GameProfile[].class); - if (profiles.length == 0) return null; + if (profiles.length == 0) { + return null; + } GameProfile gameProfile = profiles[0]; - if (gameProfile.getId() == null) + if (gameProfile.getId() == null) { return null; + } return new GameProfile(gameProfile.getId(), gameProfile.getName()); } + /** + * Get Mojang UUID by username. + * + * @param username username to query + * @return UUID in Mojang API style string. Returns {@code null} if username not found in Mojang API. + */ + public static String getMojangUuidByUsername(String username) { + GameProfile profile = loadGameProfile(getMojangApiRoot(), username); + if (profile == null) { + return null; + } + return UUIDTypeAdapter.fromUUID(profile.getId()); + } + //UUID -> Profile public static GameProfile fillGameProfile(String sessionRoot, GameProfile profile) { //Doc (http://wiki.vg/Mojang_API#UUID_-.3E_Profile_.2B_Skin.2FCape) HttpRequestUtil.HttpResponce responce = HttpRequestUtil.makeHttpRequest( - new HttpRequestUtil.HttpRequest(sessionRoot + "session/minecraft/profile/" - + UUIDTypeAdapter.fromUUID(profile.getId())).setCacheTime(90)); - if (StringUtils.isEmpty(responce.content)) + new HttpRequestUtil.HttpRequest(sessionRoot + "session/minecraft/profile/" + + UUIDTypeAdapter.fromUUID(profile.getId())).setCacheTime(90)); + if (StringUtils.isEmpty(responce.content)) { return profile; + } Gson gson = new GsonBuilder() - .registerTypeAdapter(UUID.class, new UUIDTypeAdapter()) - .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()) - .create(); + .registerTypeAdapter(UUID.class, new UUIDTypeAdapter()) + .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()) + .create(); MinecraftProfilePropertiesResponse propertiesResponce = gson.fromJson(responce.content, MinecraftProfilePropertiesResponse.class); GameProfile newGameProfile = new GameProfile(propertiesResponce.getId(), propertiesResponce.getName()); newGameProfile.getProperties().putAll(propertiesResponce.getProperties()); @@ -131,25 +169,30 @@ public class MojangAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.I } public static Map getTextures(GameProfile gameProfile) { - if (gameProfile == null) + if (gameProfile == null) { return Maps.newHashMap(); + } Property textureProperty = Iterables.getFirst(gameProfile.getProperties().get("textures"), null); - if (textureProperty == null) + if (textureProperty == null) { return Maps.newHashMap(); + } String value = textureProperty.getValue(); - if (StringUtils.isBlank(value)) + if (StringUtils.isBlank(value)) { return Maps.newHashMap(); - @SuppressWarnings("deprecation") String json = new String(Base64.decodeBase64(value), Charsets.UTF_8); + } + String json = new String(Base64.decodeBase64(value), StandardCharsets.UTF_8); Gson gson = new GsonBuilder().registerTypeAdapter(UUID.class, new UUIDTypeAdapter()).create(); MinecraftTexturesPayload result = gson.fromJson(json, MinecraftTexturesPayload.class); - if (result == null || result.getTextures() == null) + if (result == null || result.getTextures() == null) { return Maps.newHashMap(); + } return result.getTextures(); } @Override public boolean compare(SkinSiteProfile ssp0, SkinSiteProfile ssp1) { - return (!StringUtils.isNoneEmpty(ssp0.apiRoot) || ssp0.apiRoot.equalsIgnoreCase(ssp1.apiRoot)) || (!StringUtils.isNoneEmpty(ssp0.sessionRoot) || ssp0.sessionRoot.equalsIgnoreCase(ssp1.sessionRoot)); + return (!StringUtils.isNoneEmpty(ssp0.apiRoot) || ssp0.apiRoot.equalsIgnoreCase(ssp1.apiRoot)) || + (!StringUtils.isNoneEmpty(ssp0.sessionRoot) || ssp0.sessionRoot.equalsIgnoreCase(ssp1.sessionRoot)); } @Override diff --git a/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java b/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java new file mode 100644 index 0000000..5775d12 --- /dev/null +++ b/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java @@ -0,0 +1,105 @@ +package customskinloader.loader.jsonapi; + +import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import customskinloader.CustomSkinLoader; +import customskinloader.Logger; +import customskinloader.config.SkinSiteProfile; +import customskinloader.loader.JsonAPILoader; +import customskinloader.loader.MojangAPILoader; +import customskinloader.plugin.ICustomSkinLoaderPlugin; +import customskinloader.profile.ModelManager0; +import customskinloader.profile.UserProfile; +import customskinloader.utils.HttpTextureUtil; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.util.List; +import java.util.Map; + +public class MinecraftCapesAPI implements JsonAPILoader.IJsonAPI { + + public static class MinecraftCapes extends JsonAPILoader.DefaultProfile { + public MinecraftCapes(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "MinecraftCapes"; + } + + @Override + public int getPriority() { + return 800; + } + + @Override + public String getRoot() { + return "https://minecraftcapes.net/profile/"; + } + } + + @Override + public List getDefaultProfiles(JsonAPILoader loader) { + return Lists.newArrayList(new MinecraftCapes(loader)); + } + + @Override + public String toJsonUrl(String root, String username) { + //API url is `${root}${uuid}` + return root + MojangAPILoader.getMojangUuidByUsername(username); + } + + @Override + public UserProfile toUserProfile(String root, String json, boolean local) { + MinecraftCapesApiResponse result = new Gson().fromJson(json, MinecraftCapesApiResponse.class); + if (result.textures == null || result.textures.cape == null) { + return null; + } + + String capeBase64 = result.textures.cape; + String hash = HttpTextureUtil.getHash(capeBase64); + File cacheFile = HttpTextureUtil.getCacheFile(hash); + String fakeUrl = HttpTextureUtil.getBase64FakeUrl(hash); + + //Save base64 image to cache file + try { + byte[] capeBytes = Base64.decodeBase64(capeBase64); + FileUtils.writeByteArrayToFile(cacheFile, capeBytes); + CustomSkinLoader.logger.info("Saved base64 image to " + cacheFile); + } catch (Exception e) { + CustomSkinLoader.logger.warning("Error parsing base64 image: " + capeBase64); + return null; + } + + UserProfile profile = new UserProfile(); + profile.capeUrl = fakeUrl; + + return profile; + } + + @Override + public String getPayload(SkinSiteProfile ssp) { + return null; + } + + @Override + public String getName() { + return "GlitchlessAPI"; + } + + public static class MinecraftCapesApiResponse { + public boolean animatedCape; + public boolean capeGlint; + public boolean upsideDown; + public MinecraftCapesApiTexture textures; + + public static class MinecraftCapesApiTexture { + public String cape; + public String ears; + } + } +} diff --git a/Common/source/customskinloader/utils/HttpTextureUtil.java b/Common/source/customskinloader/utils/HttpTextureUtil.java index 8d8ba6c..e3ee4e2 100644 --- a/Common/source/customskinloader/utils/HttpTextureUtil.java +++ b/Common/source/customskinloader/utils/HttpTextureUtil.java @@ -8,76 +8,100 @@ import org.apache.commons.io.FilenameUtils; import customskinloader.CustomSkinLoader; public class HttpTextureUtil { - public static class HttpTextureInfo{ - public String url=""; + public static class HttpTextureInfo { + public String url = ""; public File cacheFile; public String hash; } - private static final String - LEGACY_MARK="(LEGACY)", - LOCAL_MARK="(LOCAL)", - LOCAL_LEGACY_MARK="(LOCAL_LEGACY)"; + + private static final String + LEGACY_MARK = "(LEGACY)", + LOCAL_MARK = "(LOCAL)", + LOCAL_LEGACY_MARK = "(LOCAL_LEGACY)", + BASE64_MARK = "(BASE64)"; public static File defaultCacheDir; + @SuppressWarnings("ResultOfMethodCallIgnored") - public static void cleanCacheDir(){ - if(defaultCacheDir!=null){ + public static void cleanCacheDir() { + if (defaultCacheDir != null) { defaultCacheDir.delete(); defaultCacheDir.mkdirs(); } } - public static File getCacheDir(){ - return defaultCacheDir==null?new File(MinecraftUtil.getMinecraftDataDir(),"assets/skins"):defaultCacheDir; + + public static File getCacheDir() { + return defaultCacheDir == null ? new File(MinecraftUtil.getMinecraftDataDir(), "assets/skins") : defaultCacheDir; } - - public static HttpTextureInfo toHttpTextureInfo(String fakeUrl){ - HttpTextureInfo info=new HttpTextureInfo(); - if(fakeUrl.startsWith("http")){ - info.url=fakeUrl; - info.hash=FilenameUtils.getBaseName(fakeUrl); - info.cacheFile=getCacheFile(info.hash); + + public static HttpTextureInfo toHttpTextureInfo(String fakeUrl) { + HttpTextureInfo info = new HttpTextureInfo(); + if (fakeUrl.startsWith("http")) { + info.url = fakeUrl; + info.hash = FilenameUtils.getBaseName(fakeUrl); + info.cacheFile = getCacheFile(info.hash); return info; } - if(fakeUrl.startsWith(LOCAL_LEGACY_MARK)){ - fakeUrl=fakeUrl.replace(LOCAL_LEGACY_MARK, ""); - String[] t=fakeUrl.split(",",2); - if(t.length!=2) + if (fakeUrl.startsWith(LOCAL_LEGACY_MARK)) { + fakeUrl = fakeUrl.replace(LOCAL_LEGACY_MARK, ""); + String[] t = fakeUrl.split(",", 2); + if (t.length != 2) return info; - info.cacheFile=new File(CustomSkinLoader.DATA_DIR,t[1]); - info.hash=t[0]; + info.cacheFile = new File(CustomSkinLoader.DATA_DIR, t[1]); + info.hash = t[0]; return info; } - if(fakeUrl.startsWith(LOCAL_MARK)){ - fakeUrl=fakeUrl.replace(LOCAL_MARK, ""); - info.cacheFile=new File(CustomSkinLoader.DATA_DIR,fakeUrl); - info.hash=FilenameUtils.getBaseName(fakeUrl); + if (fakeUrl.startsWith(LOCAL_MARK)) { + fakeUrl = fakeUrl.replace(LOCAL_MARK, ""); + info.cacheFile = new File(CustomSkinLoader.DATA_DIR, fakeUrl); + info.hash = FilenameUtils.getBaseName(fakeUrl); return info; } - if(fakeUrl.startsWith(LEGACY_MARK)){ - fakeUrl=fakeUrl.replace(LEGACY_MARK, ""); - info.url=fakeUrl; - info.hash=DigestUtils.sha1Hex(info.url); + if (fakeUrl.startsWith(LEGACY_MARK)) { + fakeUrl = fakeUrl.replace(LEGACY_MARK, ""); + info.url = fakeUrl; + info.hash = DigestUtils.sha1Hex(info.url); + info.cacheFile = HttpRequestUtil.getCacheFile(info.hash); + return info; + } + //Base64 fake url format: `(BASE64)${hash}` + if (fakeUrl.startsWith(BASE64_MARK)) { + fakeUrl = fakeUrl.replace(BASE64_MARK, ""); + info.hash = fakeUrl; info.cacheFile = HttpRequestUtil.getCacheFile(info.hash); return info; } return info; } - public static String getLegacyFakeUrl(String url){ - return LEGACY_MARK+url; + public static String getLegacyFakeUrl(String url) { + return LEGACY_MARK + url; } - public static String getLocalFakeUrl(String path){ - return LOCAL_MARK+path; + + public static String getLocalFakeUrl(String path) { + return LOCAL_MARK + path; } - public static String getLocalLegacyFakeUrl(String path,String hash){ - return LOCAL_LEGACY_MARK+hash+","+path; + + public static String getLocalLegacyFakeUrl(String path, String hash) { + return LOCAL_LEGACY_MARK + hash + "," + path; } - public static String getHash(String url,long size,long lastModified){ - return DigestUtils.sha1Hex(size+url+lastModified); + + public static String getBase64FakeUrl(String hash) { + return BASE64_MARK + hash; } - public static File getCacheFile(String hash){ - return getCacheFile(defaultCacheDir,hash); + + public static String getHash(String url, long size, long lastModified) { + return DigestUtils.sha1Hex(size + url + lastModified); + } + + public static String getHash(String base64) { + return DigestUtils.sha1Hex(base64); + } + + public static File getCacheFile(String hash) { + return getCacheFile(defaultCacheDir, hash); + } + + public static File getCacheFile(File cacheDir, String hash) { + return new File(new File(cacheDir, hash.length() > 2 ? hash.substring(0, 2) : "xx"), hash); } - public static File getCacheFile(File cacheDir,String hash){ - return new File(new File(cacheDir,hash.length()>2?hash.substring(0,2):"xx"), hash); - } }