mirror of
https://github.com/xfl03/MCCustomSkinLoader.git
synced 2026-11-22 16:39:46 +00:00
Added Custom Error Message for JsonAPI
This commit is contained in:
1 parent
e63858d561
commit
953748f2ae
4 files changed
+22
-11
No files matched your search
@@ -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),
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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<String> model_preference;
|
||||
public Map<String,String> skins;
|
||||
public String cape;
|
||||
|
||||
public int errno;
|
||||
public String msg;
|
||||
public long last_update;
|
||||
public List<String> model_preference;
|
||||
public Map<String,String> skins;
|
||||
|
||||
public String cape;
|
||||
|
||||
public int errno;
|
||||
public String msg;
|
||||
}
|
||||
@Override
|
||||
public String getName() {
|
||||
|
||||
@@ -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<result.skins.size();i++){//check and cache skins
|
||||
String skin=result.skins.get(i);
|
||||
@@ -88,12 +88,15 @@ public class DynamicSkullManager {
|
||||
}
|
||||
}
|
||||
|
||||
if(result.skins.isEmpty())//Nothing loaded
|
||||
if(result.skins.isEmpty()){//Nothing loaded
|
||||
CustomSkinLoader.logger.info("Failed: Nothing loaded.");
|
||||
return;
|
||||
}
|
||||
result.interval=Math.max(result.interval, 50);
|
||||
if(result.fromZero)
|
||||
result.startTime=System.currentTimeMillis();
|
||||
result.period=result.interval*result.skins.size();
|
||||
CustomSkinLoader.logger.info("Successfully loaded Dynamic Skull: "+new Gson().toJson(result));
|
||||
dynamicTextures.put(profile, result);
|
||||
staticTextures.remove(profile);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user