mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 07:39:41 +00:00
Better Client Skin Loading for Cached Skins
This commit is contained in:
1 parent
27359a429d
commit
c2e4213df5
3 files changed
+26
-19
No files matched your search
@@ -43,6 +43,12 @@ public class ClientCacheHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isCachedNPC(ResourceLocation resource) {
|
||||
synchronized (imageDataCache) {
|
||||
return imageDataCache.containsKey(resource.getResourcePath());
|
||||
}
|
||||
}
|
||||
|
||||
public static void clearCache() {
|
||||
ClientCacheHandler.imageDataCache.clear();
|
||||
ClientCacheHandler.animationCache.clear();
|
||||
|
||||
@@ -83,7 +83,7 @@ public class ImageData {
|
||||
}
|
||||
}
|
||||
|
||||
private ResourceLocation getLocation() {
|
||||
public ResourceLocation getLocation() {
|
||||
return this.isUrl && this.imageDownloadAlt.getBufferedImage() == null ? null : this.location;
|
||||
}
|
||||
|
||||
|
||||
@@ -320,8 +320,6 @@ public class RenderNPCInterface extends RenderLiving{
|
||||
} else {
|
||||
npc.textureLocation = new ResourceLocation(npc.display.texture);
|
||||
}
|
||||
} else if(LastTextureTick < 5) { //fixes request flood somewhat
|
||||
return AbstractClientPlayer.locationStevePng;
|
||||
} else if(npc.display.skinType == 1 && npc.display.playerProfile != null) {
|
||||
Minecraft minecraft = Minecraft.getMinecraft();
|
||||
Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile);
|
||||
@@ -330,22 +328,25 @@ public class RenderNPCInterface extends RenderLiving{
|
||||
}
|
||||
LastTextureTick = 0;
|
||||
} else if (npc.display.skinType == 2 || npc.display.skinType == 3) {
|
||||
try {
|
||||
MessageDigest digest = MessageDigest.getInstance("MD5");
|
||||
byte[] hash = digest.digest(npc.display.url.getBytes("UTF-8"));
|
||||
StringBuilder sb = new StringBuilder(2*hash.length);
|
||||
for (byte b : hash) {
|
||||
sb.append(String.format("%02x", b&0xff));
|
||||
}
|
||||
if (npc.display.skinType == 2) {
|
||||
npc.textureLocation = new ResourceLocation("skins/" + sb.toString());
|
||||
ClientCacheHandler.getNPCTexture(npc.display.url, false, npc.textureLocation);
|
||||
} else {
|
||||
npc.textureLocation = new ResourceLocation("skins64/" + sb.toString());
|
||||
ClientCacheHandler.getNPCTexture(npc.display.url, true, npc.textureLocation);
|
||||
}
|
||||
LastTextureTick = 0;
|
||||
} catch(Exception ignored){}
|
||||
ResourceLocation location = new ResourceLocation("skins/" + (npc.display.modelType + npc.display.url).hashCode());
|
||||
// If URL Empty Steve
|
||||
if(npc.display.url.isEmpty()){ return AbstractClientPlayer.locationStevePng; }
|
||||
// If URL Cached then grab it
|
||||
else if(ClientCacheHandler.isCachedNPC(location)){
|
||||
try {
|
||||
npc.textureLocation = ClientCacheHandler.getNPCTexture(npc.display.url, npc.display.modelType > 0, location).getLocation();
|
||||
} catch(Exception ignored){}
|
||||
}
|
||||
// For New URL Requests do not spam it
|
||||
else if(LastTextureTick < 5) { //fixes request flood somewhat
|
||||
return AbstractClientPlayer.locationStevePng;
|
||||
}
|
||||
else {
|
||||
try {
|
||||
npc.textureLocation = ClientCacheHandler.getNPCTexture(npc.display.url, npc.display.modelType > 0, location).getLocation();
|
||||
LastTextureTick = 0;
|
||||
} catch(Exception ignored){}
|
||||
}
|
||||
} else {
|
||||
return AbstractClientPlayer.locationStevePng;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user