From bebbbb0050e6207250b309f1b365aa0d92974d62 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Sun, 13 Mar 2016 00:17:11 +0800 Subject: [PATCH] Fix 1.8-1.8.9 texture binding mistake Support new UniSkinApi --- .../{ModelManager.java => ModelManager0.java} | 2 +- Common/customskinloader/CustomSkinLoader.java | 4 ++-- .../{ModelManager.java => ModelManager0.java} | 2 +- .../customskinloader/loader/CustomSkinAPILoader.java | 8 +++++--- Common/customskinloader/loader/MojangAPILoader.java | 4 ++-- Common/customskinloader/loader/UniSkinAPILoader.java | 10 +++++++--- 6 files changed, 18 insertions(+), 12 deletions(-) rename 1.7.10-mcp908/src/minecraft/customskinloader/{ModelManager.java => ModelManager0.java} (98%) rename Common/customskinloader/{ModelManager.java => ModelManager0.java} (98%) diff --git a/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java b/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager0.java similarity index 98% rename from 1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java rename to 1.7.10-mcp908/src/minecraft/customskinloader/ModelManager0.java index a1e0b40..2d16905 100644 --- a/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java +++ b/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager0.java @@ -15,7 +15,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; * It is the only class in package 'customskinloader' which has differences in different Minecraft version. * @since 13.1 */ -public class ModelManager { +public class ModelManager0 { private static ArrayList models=null; /** diff --git a/Common/customskinloader/CustomSkinLoader.java b/Common/customskinloader/CustomSkinLoader.java index 06f596f..542e0c7 100644 --- a/Common/customskinloader/CustomSkinLoader.java +++ b/Common/customskinloader/CustomSkinLoader.java @@ -49,7 +49,7 @@ public class CustomSkinLoader { logger.info((i+1)+"/"+config.loadlist.length+" Try to load profile from '"+ssp.name+"'."); if(ssp.type.equalsIgnoreCase("MojangAPI") && !defaultProfile.isEmpty()){ logger.info("Default profile will be used."); - logger.info(ModelManager.toUserProfile(defaultProfile).toString()); + logger.info(ModelManager0.toUserProfile(defaultProfile).toString()); return defaultProfile; } IProfileLoader loader=LOADERS.get(ssp.type.toLowerCase()); @@ -67,7 +67,7 @@ public class CustomSkinLoader { continue; logger.info(username+"'s profile loaded."); logger.info(profile.toString()); - return ModelManager.fromUserProfile(profile); + return ModelManager0.fromUserProfile(profile); } return defaultProfile; } diff --git a/Common/customskinloader/ModelManager.java b/Common/customskinloader/ModelManager0.java similarity index 98% rename from Common/customskinloader/ModelManager.java rename to Common/customskinloader/ModelManager0.java index 91ecb40..22841bf 100644 --- a/Common/customskinloader/ModelManager.java +++ b/Common/customskinloader/ModelManager0.java @@ -13,7 +13,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; * It is the only class in package 'customskinloader' which has differences in different Minecraft version. * @since 13.1 */ -public class ModelManager { +public class ModelManager0 { private static ArrayList models=null; /** diff --git a/Common/customskinloader/loader/CustomSkinAPILoader.java b/Common/customskinloader/loader/CustomSkinAPILoader.java index eb582cb..f1a07c2 100644 --- a/Common/customskinloader/loader/CustomSkinAPILoader.java +++ b/Common/customskinloader/loader/CustomSkinAPILoader.java @@ -6,7 +6,7 @@ import java.util.Set; import com.google.gson.Gson; import customskinloader.CustomSkinLoader; -import customskinloader.ModelManager; +import customskinloader.ModelManager0; import customskinloader.UserProfile; import customskinloader.config.SkinSiteProfile; import customskinloader.utils.HttpUtil0; @@ -29,8 +29,10 @@ public class CustomSkinAPILoader implements IProfileLoader { if(profile.skins!=null && !profile.skins.isEmpty()){ Set keys=profile.skins.keySet(); for(String s:keys){ - System.out.println(s+" "+ModelManager.checkModel(s)); - if(ModelManager.checkModel(s)){ + //System.out.println(s+" "+ModelManager0.checkModel(s)); + if(ModelManager0.checkModel(s)){ + if(profile.skins.get(s)==null||profile.skins.get(s).equals("")) + continue; p.skinUrl=ssp.root+TEXTURES+profile.skins.get(s); p.model=s; break; diff --git a/Common/customskinloader/loader/MojangAPILoader.java b/Common/customskinloader/loader/MojangAPILoader.java index 9bf1bdd..f10fcb7 100644 --- a/Common/customskinloader/loader/MojangAPILoader.java +++ b/Common/customskinloader/loader/MojangAPILoader.java @@ -11,7 +11,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.properties.Property; import customskinloader.CustomSkinLoader; -import customskinloader.ModelManager; +import customskinloader.ModelManager0; import customskinloader.UserProfile; import customskinloader.config.SkinSiteProfile; import customskinloader.utils.HttpUtil0; @@ -59,7 +59,7 @@ public class MojangAPILoader implements IProfileLoader { return null; } //Get Texture End - return ModelManager.toUserProfile(texture1.textures); + return ModelManager0.toUserProfile(texture1.textures); } private class UUIDProfile{ diff --git a/Common/customskinloader/loader/UniSkinAPILoader.java b/Common/customskinloader/loader/UniSkinAPILoader.java index 984d08f..448a793 100644 --- a/Common/customskinloader/loader/UniSkinAPILoader.java +++ b/Common/customskinloader/loader/UniSkinAPILoader.java @@ -6,7 +6,7 @@ import java.util.Map; import com.google.gson.Gson; import customskinloader.CustomSkinLoader; -import customskinloader.ModelManager; +import customskinloader.ModelManager0; import customskinloader.UserProfile; import customskinloader.config.SkinSiteProfile; import customskinloader.utils.HttpUtil0; @@ -29,7 +29,9 @@ public class UniSkinAPILoader implements IProfileLoader { if(profile.skins!=null && !profile.skins.isEmpty()){ if(profile.model_preference!=null && !profile.model_preference.isEmpty()){ for(String s:profile.model_preference){ - if(ModelManager.checkModel(s)){ + if(ModelManager0.checkModel(s)){ + if(profile.skins.get(s)==null||profile.skins.get(s).equals("")) + continue; p.skinUrl=ssp.root+TEXTURES+profile.skins.get(s); p.model=s; break; @@ -44,7 +46,9 @@ public class UniSkinAPILoader implements IProfileLoader { } } } - if(profile.cape!=null && !profile.cape.equals("")){ + if(profile.skins.get("cape")!=null && !profile.skins.get("cape").equals("")){ + p.capeUrl=ssp.root+TEXTURES+profile.skins.get("cape"); + }else if(profile.cape!=null && !profile.cape.equals("")){ p.capeUrl=ssp.root+TEXTURES+profile.cape; } if(p.isEmpty()){