Add skin model auto judge

This commit is contained in:
Alexander Xia committed 2018-05-18 21:06:28 +08:00
1 parent f30d3319b0
commit 883e7b45fc
5 files changed
+37 -17

No files matched your search

@@ -10,7 +10,7 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
private int[] imageData;
private int ratio=1;
@Override
public BufferedImage parseUserSkin(BufferedImage image) {
if(image==null)
@@ -40,27 +40,41 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
}
graphics.dispose();
this.imageData = ((DataBufferInt)bufferedimage.getRaster().getDataBuffer()).getData();
setAreaDueToConfig( 0 * ratio, 0 * ratio,32 * ratio,16 * ratio);//Head - 1
setAreaTransparent(32 * ratio, 0 * ratio,64 * ratio,16 * ratio);//Head - 2
setAreaDueToConfig( 0 * ratio,16 * ratio,16 * ratio,32 * ratio);//Right Leg - 1
setAreaDueToConfig(16 * ratio,16 * ratio,40 * ratio,32 * ratio);//Body - 1
setAreaDueToConfig(40 * ratio,16 * ratio,56 * ratio,32 * ratio);//Right Arm - 1
setAreaTransparent( 0 * ratio,32 * ratio,16 * ratio,48 * ratio);//Right Leg - 2
setAreaTransparent(16 * ratio,32 * ratio,40 * ratio,48 * ratio);//Body - 2
setAreaTransparent(40 * ratio,32 * ratio,56 * ratio,48 * ratio);//Right Arm - 2
setAreaTransparent( 0 * ratio,48 * ratio,16 * ratio,64 * ratio);//Left Leg - 2
setAreaDueToConfig(16 * ratio,48 * ratio,32 * ratio,64 * ratio);//Left Leg - 1
setAreaDueToConfig(32 * ratio,48 * ratio,48 * ratio,64 * ratio);//Left Arm - 1
setAreaTransparent(48 * ratio,48 * ratio,64 * ratio,64 * ratio);//Left Arm - 2
return bufferedimage;
}
/* 2^24-1
/**
* Judge the type of skin
* Must be called after parseUserSkin
* @return type of skin (slim / default)
* @since 14.9
*/
public String judgeType(){
if (this.imageData==null)
return null;
if (((this.imageData[getPosition(55, 20)] & B) >>> 24) == 0)//if (55,20) is transparent
return "slim";
return "default";
}
/* 2^24-1
* 00000000 11111111 11111111 11111111 */
private static final int A=16777215;
private static final int WHITE=getARGB(255,255,255,255);
@@ -82,7 +96,7 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
for (int y=y0;y<y1;++y)
this.imageData[getPosition(x,y)] &= A;
}
/* -2^24
* 00000001 00000000 00000000 00000000 ->
* 11111110 11111111 11111111 11111111 ->
@@ -93,7 +107,7 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
for (int y=y0;y<y1;++y)
this.imageData[getPosition(x,y)] |= B;
}
private void setAreaDueToConfig(int x0,int y0,int x1,int y1){
if(customskinloader.CustomSkinLoader.config.enableTransparentSkin)
setAreaTransparent(x0,y0,x1,y1);
@@ -106,11 +120,11 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
public void skinAvailable(){
//A callback when skin loaded
}
private static int getARGB(int a,int r,int g,int b){
return (a << 24) | (r << 16) | (g << 8) | b;
}
private int getPosition(int x,int y){
return x+y*64*ratio;
}
@@ -100,6 +100,12 @@ public class FakeSkinManager{
public void skinAvailable(){
if (buffer != null)
buffer.skinAvailable();
if ("auto".equals(texture.getMetadata("model")) && buffer instanceof FakeSkinBuffer){
//Auto judge skin type
Map metadata = Maps.newHashMap();
metadata.put("model", ((FakeSkinBuffer) buffer).judgeType());
texture = new MinecraftProfileTexture(texture.getUrl(), metadata);
}
FakeSkinManager.makeCallback(callback,type, location, texture);
}
@@ -69,7 +69,7 @@ public class LegacyLoader implements ProfileLoader.IProfileLoader {
@Override
public boolean compare(SkinSiteProfile ssp0, SkinSiteProfile ssp1) {
return (StringUtils.isNoneEmpty(ssp0.skin)?ssp0.skin.equalsIgnoreCase(ssp1.skin):true) || (StringUtils.isNoneEmpty(ssp0.cape)?ssp0.cape.equalsIgnoreCase(ssp1.cape):true);
return (!StringUtils.isNoneEmpty(ssp0.skin) || ssp0.skin.equalsIgnoreCase(ssp1.skin)) || (!StringUtils.isNoneEmpty(ssp0.cape) || ssp0.cape.equalsIgnoreCase(ssp1.cape));
}
@Override
public String getName() {
@@ -93,10 +93,10 @@ public class ModelManager0 {
if(profile==null)
return map;
if(profile.skinUrl!=null){
Map metadata=null;
if(profile.model!=null&&profile.model.equals("slim")){
Map metadata = null;
if("slim".equals(profile.model) || "auto".equals(profile.model)){
metadata = Maps.newHashMap();
metadata.put("model", "slim");
metadata.put("model", profile.model);
}
map.put(Type.SKIN, getProfileTexture(profile.skinUrl,metadata));
}
+1 -1
View File
@@ -1,7 +1,7 @@
# CustomSkinLoader
## What's this?
Custom Skin Loader mod for Minecraft.
You can use it to load any skin from any website.
It's a mod which can load skin from any online source or local source.
## Download
Build Server : [CircleCI](https://circleci.com/gh/xfl03/MCCustomSkinLoader) & [~~Infinity Studio CI~~](https://ci.infstudio.net/job/CustomSkinLoader/)