From edf6e241e4f9a994613b56a821533d276aa9ce0e Mon Sep 17 00:00:00 2001 From: LionZXY Date: Fri, 10 May 2019 11:20:39 +0300 Subject: [PATCH] Add GlitchlessAPI (#51) * Add GlitchlessAPI * Fix build and move GlitchlessSkin to down --- .../customskinloader/CustomSkinLoader.java | 3 +- .../config/SkinSiteProfile.java | 19 ++++++--- .../loader/JsonAPILoader.java | 3 +- .../loader/ProfileLoader.java | 1 + .../loader/jsonapi/GlitchlessAPI.java | 40 +++++++++++++++++++ 5 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java diff --git a/Common/source/customskinloader/CustomSkinLoader.java b/Common/source/customskinloader/CustomSkinLoader.java index 95d849a..b8fd6b0 100644 --- a/Common/source/customskinloader/CustomSkinLoader.java +++ b/Common/source/customskinloader/CustomSkinLoader.java @@ -41,7 +41,8 @@ public class CustomSkinLoader { //SkinSiteProfile.creatLegacy("Minecrack","http://minecrack.fr.nf/mc/skinsminecrackd/{USERNAME}.png","http://minecrack.fr.nf/mc/cloaksminecrackd/{USERNAME}.png",null), SkinSiteProfile.createElyByAPI("ElyBy"), SkinSiteProfile.createUniSkinAPI("SkinMe","http://www.skinme.cc/uniskin/"), - SkinSiteProfile.createLegacy("LocalSkin","LocalSkin/skins/{USERNAME}.png","LocalSkin/capes/{USERNAME}.png","LocalSkin/elytras/{USERNAME}.png")}; + SkinSiteProfile.createLegacy("LocalSkin","LocalSkin/skins/{USERNAME}.png","LocalSkin/capes/{USERNAME}.png","LocalSkin/elytras/{USERNAME}.png"), + SkinSiteProfile.createGlitchlessAPI("GlitchlessGames","https://games.glitchless.ru/api/minecraft/users/profiles/textures/?nickname=")}; public static final Gson GSON=new GsonBuilder().setPrettyPrinting().create(); public static final Logger logger=initLogger(); diff --git a/Common/source/customskinloader/config/SkinSiteProfile.java b/Common/source/customskinloader/config/SkinSiteProfile.java index c8a2bd7..1fd0790 100644 --- a/Common/source/customskinloader/config/SkinSiteProfile.java +++ b/Common/source/customskinloader/config/SkinSiteProfile.java @@ -33,11 +33,20 @@ public class SkinSiteProfile { ssp.root=root; return ssp; } - public static SkinSiteProfile createUniSkinAPI(String name,String root){ - SkinSiteProfile ssp=new SkinSiteProfile(); - ssp.name=name; - ssp.type="UniSkinAPI"; - ssp.root=root; + + public static SkinSiteProfile createGlitchlessAPI(String name, String root) { + SkinSiteProfile ssp = new SkinSiteProfile(); + ssp.name = name; + ssp.type = "GlitchlessAPI"; + ssp.root = root; + return ssp; + } + + public static SkinSiteProfile createUniSkinAPI(String name, String root) { + SkinSiteProfile ssp = new SkinSiteProfile(); + ssp.name = name; + ssp.type = "UniSkinAPI"; + ssp.root = root; return ssp; } public static SkinSiteProfile createLegacy(String name,String skin,String cape,String elytra){ diff --git a/Common/source/customskinloader/loader/JsonAPILoader.java b/Common/source/customskinloader/loader/JsonAPILoader.java index 46b9b65..0fb8434 100644 --- a/Common/source/customskinloader/loader/JsonAPILoader.java +++ b/Common/source/customskinloader/loader/JsonAPILoader.java @@ -33,7 +33,8 @@ public class JsonAPILoader implements ProfileLoader.IProfileLoader { CustomSkinAPI(new CustomSkinAPI()), CustomSkinAPIPlus(new CustomSkinAPIPlus()), UniSkinAPI(new UniSkinAPI()), - ElyByAPI(new ElyByAPI()); + ElyByAPI(new ElyByAPI()), + GlitchlessAPI(new GlitchlessAPI()); public IJsonAPI jsonAPI; Type(IJsonAPI jsonAPI){ this.jsonAPI=jsonAPI; diff --git a/Common/source/customskinloader/loader/ProfileLoader.java b/Common/source/customskinloader/loader/ProfileLoader.java index b0f87ac..44268cc 100644 --- a/Common/source/customskinloader/loader/ProfileLoader.java +++ b/Common/source/customskinloader/loader/ProfileLoader.java @@ -15,6 +15,7 @@ public class ProfileLoader { new JsonAPILoader(JsonAPILoader.Type.CustomSkinAPIPlus), new JsonAPILoader(JsonAPILoader.Type.UniSkinAPI), new JsonAPILoader(JsonAPILoader.Type.ElyByAPI), + new JsonAPILoader(JsonAPILoader.Type.GlitchlessAPI), new LegacyLoader()}; public static final HashMap LOADERS=initLoaders(); diff --git a/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java b/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java new file mode 100644 index 0000000..c2b747d --- /dev/null +++ b/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java @@ -0,0 +1,40 @@ +package customskinloader.loader.jsonapi; + +import com.google.gson.Gson; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import customskinloader.config.SkinSiteProfile; +import customskinloader.loader.JsonAPILoader; +import customskinloader.profile.ModelManager0; +import customskinloader.profile.UserProfile; + +import java.util.Map; + +public class GlitchlessAPI implements JsonAPILoader.IJsonAPI { + @Override + public String toJsonUrl(String root, String username) { + return root + username; + } + + @Override + public UserProfile toUserProfile(String root, String json, boolean local) { + GlitchlessApiResponse result = new Gson().fromJson(json, GlitchlessApiResponse.class); + if (!result.textures.containsKey(MinecraftProfileTexture.Type.SKIN)) + return null; + + return ModelManager0.toUserProfile(result.textures); + } + + @Override + public String getPayload(SkinSiteProfile ssp) { + return null; + } + + @Override + public String getName() { + return "GlitchlessAPI"; + } + + public static class GlitchlessApiResponse { + protected Map textures; + } +}