diff --git a/Common/source/customskinloader/fake/FakeCapeBuffer.java b/Common/source/customskinloader/fake/FakeCapeBuffer.java index e91b61c..3bf3196 100644 --- a/Common/source/customskinloader/fake/FakeCapeBuffer.java +++ b/Common/source/customskinloader/fake/FakeCapeBuffer.java @@ -247,7 +247,23 @@ public class FakeCapeBuffer extends FakeSkinBuffer { private static FakeImage convertOptiFineCape(FakeImage image) { int ratio = image.getWidth() / 46; FakeImage newImage = image.createImage(64 * ratio, 32 * ratio); - newImage.copyImageData(image); + copyImageData(image, newImage); return newImage; } + + /** + * Copy image data to another image + * + * @param from from image + * @param to to image + */ + private static void copyImageData(FakeImage from, FakeImage to) { + int width = Math.min(from.getWidth(), to.getWidth()); + int height = Math.min(from.getHeight(), to.getHeight()); + for (int x = 0; x < width; ++x) { + for (int y = 0; y < height; ++y) { + to.setRGBA(x, y, from.getRGBA(x, y)); + } + } + } } diff --git a/Common/source/customskinloader/loader/JsonAPILoader.java b/Common/source/customskinloader/loader/JsonAPILoader.java index 968dbd0..6c191e9 100644 --- a/Common/source/customskinloader/loader/JsonAPILoader.java +++ b/Common/source/customskinloader/loader/JsonAPILoader.java @@ -22,7 +22,21 @@ public class JsonAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPr String toJsonUrl(String root, String username); - String getPayload(SkinSiteProfile ssp); + default String getPayload(SkinSiteProfile ssp) { + return null; + } + + /** + * get JSON API payload, which will make a POST request + * + * @param ssp skin site profile + * @param username username + * @return JSON payload + * @since 14.16 + */ + default String getPayload(SkinSiteProfile ssp, String username) { + return getPayload(ssp); + } UserProfile toUserProfile(String root, String json, boolean local); @@ -93,8 +107,15 @@ public class JsonAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPr } json = IOUtils.toString(Files.newInputStream(jsonFile.toPath()), StandardCharsets.UTF_8); } else { - HttpRequestUtil.HttpResponce responce = HttpRequestUtil.makeHttpRequest(new HttpRequestUtil.HttpRequest(jsonUrl).setCacheTime(90).setUserAgent(ssp.userAgent).setPayload(this.jsonAPI.getPayload(ssp))); - json = responce.content; + try { + HttpRequestUtil.HttpResponce responce = HttpRequestUtil + .makeHttpRequest(new HttpRequestUtil.HttpRequest(jsonUrl).setCacheTime(90) + .setUserAgent(ssp.userAgent).setPayload(this.jsonAPI.getPayload(ssp, username))); + json = responce.content; + } catch (ProfileNotFoundException ignored) { + CustomSkinLoader.logger.info("Profile not found."); + return null; + } } if (json == null || json.equals("")) { CustomSkinLoader.logger.info("Profile not found."); @@ -135,4 +156,11 @@ public class JsonAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPr f.mkdirs(); } } + + /** + * When getting payload, this exception can end skin loading + * @since 14.16 + */ + public static class ProfileNotFoundException extends RuntimeException { + } } diff --git a/Common/source/customskinloader/loader/LegacyLoader.java b/Common/source/customskinloader/loader/LegacyLoader.java index ad7e154..96469d3 100644 --- a/Common/source/customskinloader/loader/LegacyLoader.java +++ b/Common/source/customskinloader/loader/LegacyLoader.java @@ -1,7 +1,6 @@ package customskinloader.loader; import java.io.File; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -15,7 +14,6 @@ import customskinloader.profile.UserProfile; import customskinloader.utils.HttpRequestUtil; import customskinloader.utils.HttpTextureUtil; import customskinloader.utils.HttpUtil0; -import scala.actors.threadpool.Arrays; public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IProfileLoader { @@ -77,7 +75,7 @@ public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPro @Override public int getPriority() { - return 600; + return 710; } @Override @@ -96,6 +94,13 @@ public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPro } } + /** + * OptiFine cape + * Test player: Notch and OptiFineCape + * + * @since 14.16 + */ + public static class OptiFineCape extends LegacyLoader.DefaultProfile { public OptiFineCape(LegacyLoader loader) { super(loader); @@ -103,12 +108,12 @@ public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPro @Override public String getName() { - return "OptiFineCape"; + return "OptiFine"; } @Override public int getPriority() { - return 750; + return 810; } @Override @@ -129,6 +134,7 @@ public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPro public static final String USERNAME_PLACEHOLDER = "{USERNAME}"; public static final String UUID_PLACEHOLDER = "{UUID}"; + public static final String UUID_STANDARD_PLACEHOLDER = "{UUID_STANDARD}"; @Override public UserProfile loadProfile(SkinSiteProfile ssp, GameProfile gameProfile) { @@ -210,14 +216,15 @@ public class LegacyLoader implements ICustomSkinLoaderPlugin, ProfileLoader.IPro private String expandURL(String url, String username) { String t = url.replace(USERNAME_PLACEHOLDER, username); - if (!t.contains(UUID_PLACEHOLDER)) { + if (!t.contains(UUID_PLACEHOLDER) && !t.contains(UUID_STANDARD_PLACEHOLDER)) { return t; } - String uuid = MojangAPILoader.getMojangUuidByUsername(username); + String uuid = MojangAPILoader.getMojangUuidByUsername(username, true); //If Mojang uuid not found, won't load the texture if (uuid == null) { return null; } - return t.replace(UUID_PLACEHOLDER, uuid); + String styledUuid = uuid.replace("-", ""); + return t.replace(UUID_PLACEHOLDER, styledUuid).replace(UUID_STANDARD_PLACEHOLDER, uuid); } } diff --git a/Common/source/customskinloader/loader/MojangAPILoader.java b/Common/source/customskinloader/loader/MojangAPILoader.java index 0451b25..5d3379e 100644 --- a/Common/source/customskinloader/loader/MojangAPILoader.java +++ b/Common/source/customskinloader/loader/MojangAPILoader.java @@ -24,7 +24,6 @@ import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.profile.ModelManager0; import customskinloader.profile.UserProfile; import customskinloader.utils.HttpRequestUtil; -import org.apache.commons.codec.Charsets; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -137,14 +136,16 @@ public class MojangAPILoader implements ICustomSkinLoaderPlugin, ProfileLoader.I * Get Mojang UUID by username. * * @param username username to query + * @param standard if - in UUID * @return UUID in Mojang API style string. Returns {@code null} if username not found in Mojang API. */ - public static String getMojangUuidByUsername(String username) { + public static String getMojangUuidByUsername(String username, boolean standard) { GameProfile profile = loadGameProfile(getMojangApiRoot(), username); if (profile == null) { return null; } - return UUIDTypeAdapter.fromUUID(profile.getId()); + UUID id = profile.getId(); + return standard ? id.toString() : UUIDTypeAdapter.fromUUID(id); } //UUID -> Profile diff --git a/Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java b/Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java index 5b80412..5888d52 100644 --- a/Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java +++ b/Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java @@ -6,7 +6,6 @@ import java.util.Map; import com.google.common.collect.Lists; import customskinloader.CustomSkinLoader; -import customskinloader.config.SkinSiteProfile; import customskinloader.loader.JsonAPILoader; import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.profile.ModelManager0; @@ -17,17 +16,45 @@ import org.apache.commons.lang3.StringUtils; public class CustomSkinAPI implements JsonAPILoader.IJsonAPI { public static class LittleSkin extends JsonAPILoader.DefaultProfile { - public LittleSkin(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "LittleSkin"; } - @Override public int getPriority() { return 200; } - @Override public String getRoot() { return "https://littleskin.cn/csl/"; } + public LittleSkin(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "LittleSkin"; + } + + @Override + public int getPriority() { + return 200; + } + + @Override + public String getRoot() { + return "https://littleskin.cn/csl/"; + } } public static class BlessingSkin extends JsonAPILoader.DefaultProfile { - public BlessingSkin(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "BlessingSkin"; } - @Override public int getPriority() { return 300; } - @Override public String getRoot() { return "https://skin.prinzeugen.net/"; } + public BlessingSkin(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "BlessingSkin"; + } + + @Override + public int getPriority() { + return 300; + } + + @Override + public String getRoot() { + return "https://skin.prinzeugen.net/"; + } } // // OneSkin has been removed temporarily @@ -38,8 +65,8 @@ public class CustomSkinAPI implements JsonAPILoader.IJsonAPI { // @Override public String getRoot() { return "http://fleey.cn/skin/skin_user/skin_json.php/"; } // } - private static final String TEXTURES="textures/"; - private static final String SUFFIX=".json"; + private static final String TEXTURES = "textures/"; + private static final String SUFFIX = ".json"; @Override public List getDefaultProfiles(JsonAPILoader loader) { @@ -53,65 +80,63 @@ public class CustomSkinAPI implements JsonAPILoader.IJsonAPI { @Override public UserProfile toUserProfile(String root, String json, boolean local) { - CustomSkinAPIProfile profile=CustomSkinLoader.GSON.fromJson(json, CustomSkinAPIProfile.class); - UserProfile p=new UserProfile(); - - if(StringUtils.isNotBlank(profile.skin)){ - p.skinUrl=root+TEXTURES+profile.skin; - if(local) - p.skinUrl=HttpTextureUtil.getLocalFakeUrl(p.skinUrl); + CustomSkinAPIProfile profile = CustomSkinLoader.GSON.fromJson(json, CustomSkinAPIProfile.class); + UserProfile p = new UserProfile(); + + if (StringUtils.isNotBlank(profile.skin)) { + p.skinUrl = root + TEXTURES + profile.skin; + if (local) + p.skinUrl = HttpTextureUtil.getLocalFakeUrl(p.skinUrl); } - if(StringUtils.isNotBlank(profile.cape)){ - p.capeUrl=root+TEXTURES+profile.cape; - if(local) - p.capeUrl=HttpTextureUtil.getLocalFakeUrl(p.capeUrl); + if (StringUtils.isNotBlank(profile.cape)) { + p.capeUrl = root + TEXTURES + profile.cape; + if (local) + p.capeUrl = HttpTextureUtil.getLocalFakeUrl(p.capeUrl); } - if(StringUtils.isNotBlank(profile.elytra)){ - p.elytraUrl=root+TEXTURES+profile.elytra; - if(local) - p.elytraUrl=HttpTextureUtil.getLocalFakeUrl(p.elytraUrl); + if (StringUtils.isNotBlank(profile.elytra)) { + p.elytraUrl = root + TEXTURES + profile.elytra; + if (local) + p.elytraUrl = HttpTextureUtil.getLocalFakeUrl(p.elytraUrl); } - - Map textures=new LinkedHashMap<>(); - if(profile.skins!=null) + + Map textures = new LinkedHashMap<>(); + if (profile.skins != null) textures.putAll(profile.skins); - if(profile.textures!=null) + if (profile.textures != null) textures.putAll(profile.textures); - if(textures.isEmpty()) + if (textures.isEmpty()) return p; - - boolean hasSkin=false; - for(String model:textures.keySet()){ - ModelManager0.Model enumModel=ModelManager0.getEnumModel(model); - if(enumModel==null||StringUtils.isEmpty(textures.get(model))) + + boolean hasSkin = false; + for (String model : textures.keySet()) { + ModelManager0.Model enumModel = ModelManager0.getEnumModel(model); + if (enumModel == null || StringUtils.isEmpty(textures.get(model))) continue; - if(ModelManager0.isSkin(enumModel)) - if(hasSkin) + if (ModelManager0.isSkin(enumModel)) + if (hasSkin) continue; else - hasSkin=true; - String url=root+TEXTURES+textures.get(model); - if(local) - url=HttpTextureUtil.getLocalFakeUrl(url); + hasSkin = true; + String url = root + TEXTURES + textures.get(model); + if (local) + url = HttpTextureUtil.getLocalFakeUrl(url); p.put(enumModel, url); } - + return p; } - private static class CustomSkinAPIProfile{ + + private static class CustomSkinAPIProfile { public String username; - public LinkedHashMap textures; - - public LinkedHashMap skins; - + public LinkedHashMap textures; + + public LinkedHashMap skins; + public String skin; public String cape; public String elytra; } - @Override - public String getPayload(SkinSiteProfile ssp) { - return null; - } + @Override public String getName() { return "CustomSkinAPI"; diff --git a/Common/source/customskinloader/loader/jsonapi/ElyByAPI.java b/Common/source/customskinloader/loader/jsonapi/ElyByAPI.java index b0d13c4..4945de1 100644 --- a/Common/source/customskinloader/loader/jsonapi/ElyByAPI.java +++ b/Common/source/customskinloader/loader/jsonapi/ElyByAPI.java @@ -7,7 +7,6 @@ import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import customskinloader.config.SkinSiteProfile; import customskinloader.loader.JsonAPILoader; import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.profile.ModelManager0; @@ -16,17 +15,45 @@ import customskinloader.profile.UserProfile; public class ElyByAPI implements JsonAPILoader.IJsonAPI { public static class ElyBy extends JsonAPILoader.DefaultProfile { - public ElyBy(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "ElyBy"; } - @Override public int getPriority() { return 400; } - @Override public String getRoot() { return "http://skinsystem.ely.by/textures/"; } + public ElyBy(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "ElyBy"; + } + + @Override + public int getPriority() { + return 400; + } + + @Override + public String getRoot() { + return "http://skinsystem.ely.by/textures/"; + } } public static class TLauncher extends JsonAPILoader.DefaultProfile { - public TLauncher(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "TLauncher"; } - @Override public int getPriority() { return 550; } - @Override public String getRoot() { return "https://auth.tlauncher.org/skin/profile/texture/login/"; } + public TLauncher(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "TLauncher"; + } + + @Override + public int getPriority() { + return 550; + } + + @Override + public String getRoot() { + return "https://auth.tlauncher.org/skin/profile/texture/login/"; + } } @Override @@ -41,15 +68,11 @@ public class ElyByAPI implements JsonAPILoader.IJsonAPI { @Override public UserProfile toUserProfile(String root, String json, boolean local) { - Map result = new Gson().fromJson(json, new TypeToken>() { }.getType()); + Map result = new Gson().fromJson(json, new TypeToken>() { + }.getType()); return ModelManager0.toUserProfile(result); } - @Override - public String getPayload(SkinSiteProfile ssp) { - return null; - } - @Override public String getName() { return "ElyByAPI"; diff --git a/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java b/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java index c5d0e0f..3a2c78f 100644 --- a/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java +++ b/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java @@ -6,7 +6,6 @@ import java.util.Map; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import customskinloader.config.SkinSiteProfile; import customskinloader.loader.JsonAPILoader; import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.profile.ModelManager0; @@ -15,10 +14,24 @@ import customskinloader.profile.UserProfile; public class GlitchlessAPI implements JsonAPILoader.IJsonAPI { public static class GlitchlessGames extends JsonAPILoader.DefaultProfile { - public GlitchlessGames(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "GlitchlessGames"; } - @Override public int getPriority() { return 700; } - @Override public String getRoot() { return "https://games.glitchless.ru/api/minecraft/users/profiles/textures/?nickname="; } + public GlitchlessGames(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "GlitchlessGames"; + } + + @Override + public int getPriority() { + return 700; + } + + @Override + public String getRoot() { + return "https://games.glitchless.ru/api/minecraft/users/profiles/textures/?nickname="; + } } @Override @@ -40,11 +53,6 @@ public class GlitchlessAPI implements JsonAPILoader.IJsonAPI { return ModelManager0.toUserProfile(result.textures); } - @Override - public String getPayload(SkinSiteProfile ssp) { - return null; - } - @Override public String getName() { return "GlitchlessAPI"; diff --git a/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java b/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java index aa94c6a..e47e96c 100644 --- a/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java +++ b/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java @@ -2,22 +2,15 @@ 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 customskinloader.utils.TextureUtil; -import java.io.File; import java.util.List; -import java.util.Map; public class MinecraftCapesAPI implements JsonAPILoader.IJsonAPI { @@ -49,7 +42,7 @@ public class MinecraftCapesAPI implements JsonAPILoader.IJsonAPI { @Override public String toJsonUrl(String root, String username) { - String uuid = MojangAPILoader.getMojangUuidByUsername(username); + String uuid = MojangAPILoader.getMojangUuidByUsername(username, false); //If uuid cannot be found, we won't load profile in this API. if (uuid == null) { return null; @@ -65,23 +58,8 @@ public class MinecraftCapesAPI implements JsonAPILoader.IJsonAPI { return null; } - String capeBase64 = result.textures.cape; - byte[] capeBytes = Base64.decodeBase64(capeBase64); - String hash = HttpTextureUtil.getHash(capeBytes); - File cacheFile = HttpTextureUtil.getCacheFile(hash); - String fakeUrl = HttpTextureUtil.getBase64FakeUrl(hash); - - //Save base64 image to cache file - try { - 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; + profile.capeUrl = TextureUtil.parseBase64Texture(result.textures.cape); return profile; } diff --git a/Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java b/Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java index 39dca42..576d3a1 100644 --- a/Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java +++ b/Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java @@ -5,7 +5,6 @@ import java.util.Map; import com.google.common.collect.Lists; import customskinloader.CustomSkinLoader; -import customskinloader.config.SkinSiteProfile; import customskinloader.loader.JsonAPILoader; import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.profile.ModelManager0; @@ -16,14 +15,28 @@ import org.apache.commons.lang3.StringUtils; public class UniSkinAPI implements JsonAPILoader.IJsonAPI { public static class SkinMe extends JsonAPILoader.DefaultProfile { - public SkinMe(JsonAPILoader loader) { super(loader); } - @Override public String getName() { return "SkinMe"; } - @Override public int getPriority() { return 500; } - @Override public String getRoot() { return "http://www.skinme.cc/uniskin/"; } + public SkinMe(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "SkinMe"; + } + + @Override + public int getPriority() { + return 500; + } + + @Override + public String getRoot() { + return "http://www.skinme.cc/uniskin/"; + } } - private static final String TEXTURES="textures/"; - private static final String SUFFIX=".json"; + private static final String TEXTURES = "textures/"; + private static final String SUFFIX = ".json"; @Override public List getDefaultProfiles(JsonAPILoader loader) { @@ -37,55 +50,54 @@ public class UniSkinAPI implements JsonAPILoader.IJsonAPI { @Override public UserProfile toUserProfile(String root, String json, boolean local) { - UniSkinAPIProfile profile=CustomSkinLoader.GSON.fromJson(json, UniSkinAPIProfile.class); - UserProfile p=new UserProfile(); - - if(StringUtils.isNotBlank(profile.cape)){ - p.capeUrl=root+TEXTURES+profile.cape; - if(local) - p.capeUrl=HttpTextureUtil.getLocalFakeUrl(p.capeUrl); + UniSkinAPIProfile profile = CustomSkinLoader.GSON.fromJson(json, UniSkinAPIProfile.class); + UserProfile p = new UserProfile(); + + if (StringUtils.isNotBlank(profile.cape)) { + p.capeUrl = root + TEXTURES + profile.cape; + if (local) + p.capeUrl = HttpTextureUtil.getLocalFakeUrl(p.capeUrl); } - - if(profile.skins==null||profile.skins.isEmpty()) + + if (profile.skins == null || profile.skins.isEmpty()) return p; - if(profile.model_preference==null||profile.model_preference.isEmpty()) + if (profile.model_preference == null || profile.model_preference.isEmpty()) return p; - - boolean hasSkin=false; - for(String model:profile.model_preference){ - ModelManager0.Model enumModel=ModelManager0.getEnumModel(model); - if(enumModel==null||StringUtils.isEmpty(profile.skins.get(model))) + + boolean hasSkin = false; + for (String model : profile.model_preference) { + ModelManager0.Model enumModel = ModelManager0.getEnumModel(model); + if (enumModel == null || StringUtils.isEmpty(profile.skins.get(model))) continue; - if(ModelManager0.isSkin(enumModel)) - if(hasSkin) + if (ModelManager0.isSkin(enumModel)) + if (hasSkin) continue; else - hasSkin=true; - String url=root+TEXTURES+profile.skins.get(model); - if(local) - url=HttpTextureUtil.getLocalFakeUrl(url); + hasSkin = true; + String url = root + TEXTURES + profile.skins.get(model); + if (local) + url = HttpTextureUtil.getLocalFakeUrl(url); p.put(enumModel, url); } - + return p; } + /** * Json profile for UniSkinAPI - * Source Code: https://github.com/RecursiveG/UniSkinMod/blob/master/src/main/java/org/devinprogress/uniskinmod/UniSkinApiProfile.java#L18-L22 + * Source Code + * * @author RecursiveG */ - private class UniSkinAPIProfile{ + private static class UniSkinAPIProfile { public String player_name; public long last_update; public List model_preference; - public Map skins; - + public Map skins; + public String cape; } - @Override - public String getPayload(SkinSiteProfile ssp) { - return null; - } + @Override public String getName() { return "UniSkinAPI"; diff --git a/Common/source/customskinloader/loader/jsonapi/WynntilsAPI.java b/Common/source/customskinloader/loader/jsonapi/WynntilsAPI.java new file mode 100644 index 0000000..9585555 --- /dev/null +++ b/Common/source/customskinloader/loader/jsonapi/WynntilsAPI.java @@ -0,0 +1,110 @@ +package customskinloader.loader.jsonapi; + +import com.google.common.collect.Lists; +import com.google.gson.Gson; +import customskinloader.CustomSkinLoader; +import customskinloader.config.SkinSiteProfile; +import customskinloader.loader.JsonAPILoader; +import customskinloader.loader.MojangAPILoader; +import customskinloader.plugin.ICustomSkinLoaderPlugin; +import customskinloader.profile.UserProfile; +import customskinloader.utils.TextureUtil; + +import java.util.List; + +/** + * Wynntils cape API + * Home + * Test player: Cael + * + * @since 14.16 + */ +public class WynntilsAPI implements JsonAPILoader.IJsonAPI { + + public static class Wynntils extends JsonAPILoader.DefaultProfile { + public Wynntils(JsonAPILoader loader) { + super(loader); + } + + @Override + public String getName() { + return "Wynntils"; + } + + @Override + public int getPriority() { + return 820; + } + + @Override + public String getRoot() { + return "https://athena.wynntils.com/user/getInfo"; + } + } + + @Override + public List getDefaultProfiles(JsonAPILoader loader) { + return Lists.newArrayList(new Wynntils(loader)); + } + + @Override + public String toJsonUrl(String root, String username) { + return root; + } + + @Override + public UserProfile toUserProfile(String root, String json, boolean local) { + WynntilsApiResponse result = new Gson().fromJson(json, WynntilsApiResponse.class); + if (result.user == null || result.user.cosmetics == null || result.user.cosmetics.texture == null) { + return null; + } + + UserProfile profile = new UserProfile(); + String fakeUrl = TextureUtil.parseBase64Texture(result.user.cosmetics.texture); + if (result.user.cosmetics.hasCape) { + profile.capeUrl = fakeUrl; + } else if (result.user.cosmetics.hasElytra) { + profile.elytraUrl = fakeUrl; + } else { + CustomSkinLoader.logger.warning("Illegal response found in Wynntils"); + return null; + } + + return profile; + } + + @Override + public String getPayload(SkinSiteProfile ssp, String username) { + WynntilsApiRequest req = new WynntilsApiRequest(); + req.uuid = MojangAPILoader.getMojangUuidByUsername(username, true); + if (req.uuid == null) { + throw new JsonAPILoader.ProfileNotFoundException(); + } + return new Gson().toJson(req); + } + + @Override + public String getName() { + return "WynntilsAPI"; + } + + public static class WynntilsApiRequest { + public String uuid; + } + + public static class WynntilsApiResponse { + public User user; + + public static class User { + public String accountType; + public Cosmetics cosmetics; + + public static class Cosmetics { + public boolean hasCape; + public boolean hasElytra; + public boolean hasEars; + public String texture; + } + } + } +} diff --git a/Common/source/customskinloader/plugin/PluginLoader.java b/Common/source/customskinloader/plugin/PluginLoader.java index c440264..6e7635a 100644 --- a/Common/source/customskinloader/plugin/PluginLoader.java +++ b/Common/source/customskinloader/plugin/PluginLoader.java @@ -24,7 +24,8 @@ public class PluginLoader { new JsonAPILoader(new UniSkinAPI()), new JsonAPILoader(new ElyByAPI()), new JsonAPILoader(new GlitchlessAPI()), - new JsonAPILoader(new MinecraftCapesAPI()) + new JsonAPILoader(new MinecraftCapesAPI()), + new JsonAPILoader(new WynntilsAPI()), }; public static final ArrayList PLUGINS = loadPlugins(); diff --git a/Common/source/customskinloader/utils/HttpRequestUtil.java b/Common/source/customskinloader/utils/HttpRequestUtil.java index 0e615fb..0c305b4 100644 --- a/Common/source/customskinloader/utils/HttpRequestUtil.java +++ b/Common/source/customskinloader/utils/HttpRequestUtil.java @@ -161,6 +161,7 @@ public class HttpRequestUtil { } if (StringUtils.isNotEmpty(request.payload)) { CustomSkinLoader.logger.info("Payload: " + request.payload); + c.setRequestMethod("POST"); c.setRequestProperty("Content-Type", "application/json"); c.setDoOutput(true); OutputStream os = c.getOutputStream(); diff --git a/Common/source/customskinloader/utils/TextureUtil.java b/Common/source/customskinloader/utils/TextureUtil.java new file mode 100644 index 0000000..c2a3904 --- /dev/null +++ b/Common/source/customskinloader/utils/TextureUtil.java @@ -0,0 +1,33 @@ +package customskinloader.utils; + +import customskinloader.CustomSkinLoader; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; + +import java.io.File; + +public class TextureUtil { + /** + * Save and get fake url of base64 texture + * + * @param base64 texture in base64 string + * @return base64 fake url + * @since 14.16 + */ + public static String parseBase64Texture(String base64) { + byte[] capeBytes = Base64.decodeBase64(base64); + String hash = HttpTextureUtil.getHash(capeBytes); + File cacheFile = HttpTextureUtil.getCacheFile(hash); + String fakeUrl = HttpTextureUtil.getBase64FakeUrl(hash); + + //Save base64 image to cache file + try { + FileUtils.writeByteArrayToFile(cacheFile, capeBytes); + CustomSkinLoader.logger.info("Saved base64 image to " + cacheFile); + return fakeUrl; + } catch (Exception e) { + CustomSkinLoader.logger.warning("Error parsing base64 image: " + base64); + return null; + } + } +} diff --git a/README.md b/README.md index b677afe..b4555f2 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Supported special skin sites: - **ANY SITE** implements skin loading API above - [Glitchless](https://games.glitchless.ru/games/minecraft/) - [MinecraftCapes](https://minecraftcapes.net/) +- [Wynntils](https://wynntils.com/) You can use this feature to customize your skin load list so as to load your skins from any skin server you want. If you are the owner of skin server, you can use CustomSkinLoader to load skins from your server if one of the APIs has been actualized by your server. @@ -80,10 +81,11 @@ By using this mod, you can see correct avatar of players in Spectator Menu rathe - [ElyBy](http://docs.ely.by/) (ElyByAPI) - SkinMe (UniSkinAPI) - [TLauncher](https://tlauncher.org/) (ElyByAPI) -- LocalSkin (Legacy) - [Glitchless](https://games.glitchless.ru/games/minecraft/) -- [OptiFineCape](https://optifine.net/home) +- LocalSkin (Legacy) - [MinecraftCapes](https://minecraftcapes.net/) +- [OptiFineCape](https://optifine.net/home) +- [Wynntils](https://wynntils.com/) If you want to apply to add other skin server to default list, please go to [issue](https://github.com/JLChnToZ/MCCustomSkinLoader/issues).