From 5a29416ee9cfb843de2880d07d9e9fdfed182425 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Sun, 3 Apr 2016 13:55:33 +0800 Subject: [PATCH] Added Skull Support --- .../client/renderer/ImageBufferDownload.java | 8 +++++--- .../client/resources/SkinManager.java | 9 +++++++-- .../client/renderer/ImageBufferDownload.java | 20 ++++++++++--------- .../client/resources/SkinManager.java | 9 +++++++-- .../client/renderer/ImageBufferDownload.java | 20 ++++++++++--------- .../client/resources/SkinManager.java | 9 +++++++-- README.md | 12 ++++++++--- 7 files changed, 57 insertions(+), 30 deletions(-) diff --git a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java index fdf1117..b589eca 100644 --- a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ b/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java @@ -33,9 +33,11 @@ public class ImageBufferDownload implements IImageBuffer } var3.dispose(); this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - this.setAreaOpaque(0, 0, 32*radio, 16*radio); - this.setAreaTransparent(32*radio, 0, 64*radio, 32*radio); - this.setAreaOpaque(0, 16*radio, 64*radio, 32*radio); + if(!customskinloader.CustomSkinLoader.config.enableTransparentSkin){ + this.setAreaOpaque(0, 0, 32*radio, 16*radio); + this.setAreaTransparent(32*radio, 0, 64*radio, 32*radio); + this.setAreaOpaque(0, 16*radio, 64*radio, 32*radio); + } return var2; } } diff --git a/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java index 64a1ba9..5a2f62e 100644 --- a/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -135,7 +135,7 @@ public class SkinManager var1.putAll(SkinManager.this.field_152797_e.getTextures(SkinManager.this.field_152797_e.fillProfileProperties(p_152790_1_, false), false)); }*/ - //CustomSkinLoader Begin + //CustomSkinLoader Begin (User Skin/Cape Part) if(customskinloader.CustomSkinLoader.config.enable){ Map newMap=customskinloader.CustomSkinLoader.loadProfile(p_152790_1_.getName(), var1); if(!newMap.isEmpty()){ @@ -167,7 +167,12 @@ public class SkinManager public Map func_152788_a(GameProfile p_152788_1_) { - return (Map)this.field_152798_f.getUnchecked(p_152788_1_); + //CustomSkinLoader Begin (Skull Part) + //return (Map)this.skinCacheLoader.getUnchecked(p_152788_1_); + return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? + customskinloader.CustomSkinLoader.loadProfileFromCache(p_152788_1_.getName()): + this.skinCacheLoader.getUnchecked(p_152788_1_); + //CustomSkinLoader End } public interface SkinAvailableCallback diff --git a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java index 05bf060..9fd1413 100644 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ b/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java @@ -45,15 +45,17 @@ public class ImageBufferDownload implements IImageBuffer var3.dispose(); this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); - this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); - this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); - this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); - this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); - this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); - this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); - this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); - this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); + if(!customskinloader.CustomSkinLoader.config.enableTransparentSkin){ + this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); + this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); + this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); + this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); + this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); + this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); + this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); + this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); + this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); + } return var2; } } diff --git a/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java index 0ecfcab..a5b664f 100644 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -136,7 +136,7 @@ public class SkinManager var1.putAll(SkinManager.this.sessionService.getTextures(SkinManager.this.sessionService.fillProfileProperties(p_152790_1_, false), false)); }*/ - //CustomSkinLoader Begin + //CustomSkinLoader Begin (User Skin/Cape Part) if(customskinloader.CustomSkinLoader.config.enable){ Map newMap=customskinloader.CustomSkinLoader.loadProfile(p_152790_1_.getName(), var1); if(!newMap.isEmpty()){ @@ -168,7 +168,12 @@ public class SkinManager public Map loadSkinFromCache(GameProfile p_152788_1_) { - return (Map)this.skinCacheLoader.getUnchecked(p_152788_1_); + //CustomSkinLoader Begin (Skull Part) + //return (Map)this.skinCacheLoader.getUnchecked(p_152788_1_); + return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? + customskinloader.CustomSkinLoader.loadProfileFromCache(p_152788_1_.getName()): + this.skinCacheLoader.getUnchecked(p_152788_1_); + //CustomSkinLoader End } public interface SkinAvailableCallback diff --git a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java index ad997aa..a918e20 100644 --- a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ b/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java @@ -44,15 +44,17 @@ public class ImageBufferDownload implements IImageBuffer var3.dispose(); this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); - this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); - this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); - this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); - this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); - this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); - this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); - this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); - this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); + if(!customskinloader.CustomSkinLoader.config.enableTransparentSkin){ + this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); + this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); + this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); + this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); + this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); + this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); + this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); + this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); + this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); + } return var2; } } diff --git a/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java index 0122dd8..e0a965b 100644 --- a/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -129,7 +129,7 @@ public class SkinManager map.putAll(SkinManager.this.sessionService.getTextures(profile, false)); }*/ - //CustomSkinLoader Begin + //CustomSkinLoader Begin (User Skin/Cape Part) if(customskinloader.CustomSkinLoader.config.enable){ Map newMap=customskinloader.CustomSkinLoader.loadProfile(profile.getName(), map); if(!newMap.isEmpty()){ @@ -160,7 +160,12 @@ public class SkinManager public Map loadSkinFromCache(GameProfile profile) { - return (Map)this.skinCacheLoader.getUnchecked(profile); + //CustomSkinLoader Begin (Skull Part) + //return (Map)this.skinCacheLoader.getUnchecked(profile); + return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? + customskinloader.CustomSkinLoader.loadProfileFromCache(profile.getName()): + this.skinCacheLoader.getUnchecked(profile); + //CustomSkinLoader End } public interface SkinAvailableCallback diff --git a/README.md b/README.md index 778ea12..bee4ee7 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,21 @@ Skin Load API Supported: - Legacy You can use this feature to customize your skin load list so as to load from any website you want. If you are the owner of skin website, you can use CustomSkinLoader to load skin from your website if one of the api has been actualized. - -###HD skins support + +###HD Skins Support Even though there is no Optifine, CustomSkinLoader has fix this problem. You can easily to get a better view in skin. - + +###Skull Support +Fixed skull load bug. + +###Transparent Skin Support + ##Default Load List - [Mojang](http://www.minecraft.net/) (Mojang API) - [Blessing Skin](https://skin.prinzeugen.net/) (CustomSkinAPI) - SkinMe (UniSkinAPI) +- [McSkin](https://www.mcskin.cc/) (CustomSkinAPI) If you want to apply to add other skin website to default list, please go to [issue](https://github.com/JLChnToZ/MCCustomSkinLoader/issues). ##Copyright