diff --git a/Common/customskinloader/CustomSkinLoader.java b/Common/customskinloader/CustomSkinLoader.java index 1691164..f55ae91 100644 --- a/Common/customskinloader/CustomSkinLoader.java +++ b/Common/customskinloader/CustomSkinLoader.java @@ -41,7 +41,7 @@ public class CustomSkinLoader { CONFIG_FILE=new File(DATA_DIR,"CustomSkinLoader.json"); public static final SkinSiteProfile[] DEFAULT_LOAD_LIST={ SkinSiteProfile.createMojangAPI("Mojang"), - SkinSiteProfile.createCustomSkinAPI("BlessingSkin","https://skin.prinzeugen.net/"), + SkinSiteProfile.createCustomSkinAPI("BlessingSkin","http://skin.prinzeugen.net/"), SkinSiteProfile.createCustomSkinAPI("OneSkin","http://fleey.org/skin/skin_user/skin_json.php/"), //Minecrack could not load skin correctly //SkinSiteProfile.creatLegacy("Minecrack","http://minecrack.fr.nf/mc/skinsminecrackd/{USERNAME}.png","http://minecrack.fr.nf/mc/cloaksminecrackd/{USERNAME}.png",null), diff --git a/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java b/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java index cb3872c..740aebc 100644 --- a/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java +++ b/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java @@ -25,6 +25,10 @@ public class CustomSkinAPI implements IJsonAPI { @Override public UserProfile toUserProfile(String root, String json, boolean local) { CustomSkinAPIProfile profile=CustomSkinLoader.GSON.fromJson(json, CustomSkinAPIProfile.class); + if(profile.errno!=0){ + CustomSkinLoader.logger.info("Error "+profile.errno+": "+profile.msg); + return null; + } UserProfile p=new UserProfile(); if(StringUtils.isNotBlank(profile.skin)){ @@ -70,6 +74,9 @@ public class CustomSkinAPI implements IJsonAPI { public String skin; public String cape; public String elytra; + + public int errno; + public String msg; } @Override public String getName() { diff --git a/Common/customskinloader/loader/jsonapi/UniSkinAPI.java b/Common/customskinloader/loader/jsonapi/UniSkinAPI.java index 21815ff..17edfe7 100644 --- a/Common/customskinloader/loader/jsonapi/UniSkinAPI.java +++ b/Common/customskinloader/loader/jsonapi/UniSkinAPI.java @@ -26,7 +26,7 @@ public class UniSkinAPI implements IJsonAPI { public UserProfile toUserProfile(String root, String json, boolean local) { UniSkinAPIProfile profile=CustomSkinLoader.GSON.fromJson(json, UniSkinAPIProfile.class); if(profile.errno!=0){ - CustomSkinLoader.logger.info("Error: "+profile.msg); + CustomSkinLoader.logger.info("Error "+profile.errno+": "+profile.msg); return null; } UserProfile p=new UserProfile(); @@ -58,13 +58,14 @@ public class UniSkinAPI implements IJsonAPI { */ private class UniSkinAPIProfile{ public String player_name; - public long last_update; - public List model_preference; - public Map skins; - public String cape; - - public int errno; - public String msg; + public long last_update; + public List model_preference; + public Map skins; + + public String cape; + + public int errno; + public String msg; } @Override public String getName() { diff --git a/Common/customskinloader/profile/DynamicSkullManager.java b/Common/customskinloader/profile/DynamicSkullManager.java index c68022d..426addf 100644 --- a/Common/customskinloader/profile/DynamicSkullManager.java +++ b/Common/customskinloader/profile/DynamicSkullManager.java @@ -62,7 +62,7 @@ public class DynamicSkullManager { if(!CustomSkinLoader.config.enableDynamicSkull||result.skins==null||result.skins.isEmpty()) return; - CustomSkinLoader.logger.info("Dynamic Skull: "+json); + CustomSkinLoader.logger.info("Try to load Dynamic Skull: "+json); for(int i=0;i