From 958023382d727ffc509c9e3e09149696f43105ec Mon Sep 17 00:00:00 2001 From: xfl03 Date: Sun, 28 Aug 2016 19:40:18 +0800 Subject: [PATCH] Default loader list --- .../customskinloader/renderer/SkinBuffer.java | 7 +++---- Common/customskinloader/loader/JsonAPILoader.java | 9 +++++++++ Common/customskinloader/loader/LegacyLoader.java | 4 ++++ .../customskinloader/loader/MojangAPILoader.java | 4 ++++ Common/customskinloader/loader/ProfileLoader.java | 14 ++++++++++---- .../loader/jsonapi/CustomSkinAPI.java | 6 +++++- .../customskinloader/loader/jsonapi/IJsonAPI.java | 8 -------- .../loader/jsonapi/UniSkinAPI.java | 6 +++++- Common/customskinloader/renderer/SkinBuffer.java | 7 +++---- build.properties | 2 +- 10 files changed, 44 insertions(+), 23 deletions(-) delete mode 100644 Common/customskinloader/loader/jsonapi/IJsonAPI.java diff --git a/1.7.10-mcp908/src/minecraft/customskinloader/renderer/SkinBuffer.java b/1.7.10-mcp908/src/minecraft/customskinloader/renderer/SkinBuffer.java index bb3a6ac..0cbec03 100644 --- a/1.7.10-mcp908/src/minecraft/customskinloader/renderer/SkinBuffer.java +++ b/1.7.10-mcp908/src/minecraft/customskinloader/renderer/SkinBuffer.java @@ -67,8 +67,7 @@ public class SkinBuffer implements net.minecraft.client.renderer.IImageBuffer { * 11111110 11111111 11111111 11111111 -> * 11111111 00000000 00000000 00000000 */ private static final int B=-16777216; - private void setAreaOpaque(int x0,int y0,int x1,int y1) - { + private void setAreaOpaque(int x0,int y0,int x1,int y1){ for (int x=x0;x LOADERS=initLoaders(); private static HashMap initLoaders() { HashMap loaders=new HashMap(); - loaders.put("mojangapi", new MojangAPILoader()); - loaders.put("customskinapi", new JsonAPILoader(JsonAPILoader.Type.CustomSkinAPI)); - loaders.put("legacy", new LegacyLoader()); - loaders.put("uniskinapi", new JsonAPILoader(JsonAPILoader.Type.UniSkinAPI)); + for(IProfileLoader loader:DEFAULT_LOADERS){ + loaders.put(loader.getName().toLowerCase(), loader); + } return loaders; } public interface IProfileLoader { public UserProfile loadProfile(SkinSiteProfile ssp,GameProfile gameProfile,boolean local) throws Exception; public boolean compare(SkinSiteProfile ssp0,SkinSiteProfile ssp1); + public String getName(); } } diff --git a/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java b/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java index 72ef343..6000790 100644 --- a/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java +++ b/Common/customskinloader/loader/jsonapi/CustomSkinAPI.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.Set; import customskinloader.CustomSkinLoader; +import customskinloader.loader.JsonAPILoader.IJsonAPI; import customskinloader.profile.ModelManager0; import customskinloader.profile.UserProfile; import customskinloader.utils.HttpTextureUtil; @@ -55,5 +56,8 @@ public class CustomSkinAPI implements IJsonAPI { public String skin; public String cape; } - + @Override + public String getName() { + return "CustomSkinAPI"; + } } diff --git a/Common/customskinloader/loader/jsonapi/IJsonAPI.java b/Common/customskinloader/loader/jsonapi/IJsonAPI.java deleted file mode 100644 index 7d36f4e..0000000 --- a/Common/customskinloader/loader/jsonapi/IJsonAPI.java +++ /dev/null @@ -1,8 +0,0 @@ -package customskinloader.loader.jsonapi; - -import customskinloader.profile.UserProfile; - -public interface IJsonAPI { - public String toJsonUrl(String root,String username); - public UserProfile toUserProfile(String root,String json,boolean local); -} diff --git a/Common/customskinloader/loader/jsonapi/UniSkinAPI.java b/Common/customskinloader/loader/jsonapi/UniSkinAPI.java index 507b8fc..9ab5e5d 100644 --- a/Common/customskinloader/loader/jsonapi/UniSkinAPI.java +++ b/Common/customskinloader/loader/jsonapi/UniSkinAPI.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import customskinloader.CustomSkinLoader; +import customskinloader.loader.JsonAPILoader.IJsonAPI; import customskinloader.profile.ModelManager0; import customskinloader.profile.UserProfile; import customskinloader.utils.HttpTextureUtil; @@ -75,5 +76,8 @@ public class UniSkinAPI implements IJsonAPI { public int errno; public String msg; } - + @Override + public String getName() { + return "UniSkinAPI"; + } } diff --git a/Common/customskinloader/renderer/SkinBuffer.java b/Common/customskinloader/renderer/SkinBuffer.java index 9234b18..26b6fdb 100644 --- a/Common/customskinloader/renderer/SkinBuffer.java +++ b/Common/customskinloader/renderer/SkinBuffer.java @@ -75,8 +75,7 @@ public class SkinBuffer implements net.minecraft.client.renderer.IImageBuffer { * 11111110 11111111 11111111 11111111 -> * 11111111 00000000 00000000 00000000 */ private static final int B=-16777216; - private void setAreaOpaque(int x0,int y0,int x1,int y1) - { + private void setAreaOpaque(int x0,int y0,int x1,int y1){ for (int x=x0;x