upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 23:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262 from PeTcHeNkA/fix/issue-32-customnpc-invalid-texture-fallback

Browse Source 
fix: add fallback skin for invalid CustomNPC texture paths#244
This commit is contained in:
Kam authored and GitHub committed 2026-03-10 23:38:09 -04:00
2 parents 60ea87bd2c 6e2fe788d2
commit 5717037012
1 file changed
+67 -52
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+67 -52
View File
@@ -544,65 +544,80 @@ public class RenderNPCInterface extends RenderLiving {
@Override
public ResourceLocation getEntityTexture(Entity entity) {
EntityNPCInterface npc = (EntityNPCInterface) entity;
if (npc.textureLocation == null) {
if (npc.display.skinType == 0) {
// Early exit if texture already resolved
if (npc.textureLocation != null) {
return npc.textureLocation;
}
// SkinType 0: custom texture or default
if (npc.display.skinType == 0) {
if (npc.display.texture.isEmpty()) {
return npc.textureLocation = fallBackSkin(npc);
}
try {
if (npc instanceof EntityCustomNpc && ((EntityCustomNpc) npc).modelData.entityClass == null) {
if (!(npc.display.texture).isEmpty()) {
try {
npc.textureLocation = adjustLocalTexture(npc, new ResourceLocation(npc.display.texture));
} catch (IOException ignored) {
}
}
npc.textureLocation = adjustLocalTexture(npc, new ResourceLocation(npc.display.texture));
} else {
npc.textureLocation = new ResourceLocation(npc.display.texture);
ResourceLocation resLoc = new ResourceLocation(npc.display.texture);
Minecraft.getMinecraft().getResourceManager().getResource(resLoc);
npc.textureLocation = resLoc;
}
} 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);
if (map.containsKey(Type.SKIN)) {
npc.textureLocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture) map.get(Type.SKIN), Type.SKIN);
}
LastTextureTick = 0;
} else if (npc.display.skinType == 2 || npc.display.skinType == 3) {
ResourceLocation location = new ResourceLocation("skins/" + (npc.display.skinType + npc.display.url).hashCode());
// If URL Empty Steve
if (npc.display.url.isEmpty()) {
return fallBackSkin(npc);
}
// If URL Cached then grab it
else if (ClientCacheHandler.isCachedNPC(location)) {
try {
ResourceLocation loc = ClientCacheHandler.getNPCTexture(npc.display.url, npc.display.skinType == 3, location).getLocation();
if (loc != null) {
npc.textureLocation = loc;
} else {
return fallBackSkin(npc);
}
} catch (Exception ignored) {
}
}
// For New URL Requests do not spam it
else if (LastTextureTick < 5) { //fixes request flood somewhat
return fallBackSkin(npc);
} else {
try {
ResourceLocation loc = ClientCacheHandler.getNPCTexture(npc.display.url, npc.display.skinType == 3, location).getLocation();
if (loc != null) {
npc.textureLocation = loc;
} else {
return fallBackSkin(npc);
}
LastTextureTick = 0;
} catch (Exception ignored) {
}
}
} else {
} catch (IOException ignored) {
return fallBackSkin(npc);
}
}
return npc.textureLocation;
// SkinType 1: player profile skin
else if (npc.display.skinType == 1 && npc.display.playerProfile != null) {
final Minecraft minecraft = Minecraft.getMinecraft();
Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile);
if (map.containsKey(Type.SKIN)) {
npc.textureLocation = minecraft.func_152342_ad()
.func_152792_a((MinecraftProfileTexture) map.get(Type.SKIN), Type.SKIN);
}
LastTextureTick = 0;
}
// SkinType 2 / 3: load from URL
else if (npc.display.skinType == 2 || npc.display.skinType == 3) {
if (npc.display.url.isEmpty()) { // If URL is empty → fallback
return fallBackSkin(npc);
}
ResourceLocation location = new ResourceLocation("skins/" + (npc.display.skinType + npc.display.url).hashCode());
try {
if (ClientCacheHandler.isCachedNPC(location)) { // If URL is cached
ResourceLocation loc = ClientCacheHandler
.getNPCTexture(npc.display.url, npc.display.skinType == 3, location)
.getLocation();
if (loc == null) return fallBackSkin(npc);
npc.textureLocation = loc;
} else if (LastTextureTick >= 5) { // Prevent request flooding
ResourceLocation loc = ClientCacheHandler
.getNPCTexture(npc.display.url, npc.display.skinType == 3, location)
.getLocation();
if (loc == null) return fallBackSkin(npc);
npc.textureLocation = loc;
LastTextureTick = 0;
} else {
return fallBackSkin(npc);
}
} catch (Exception ignored) {
return fallBackSkin(npc);
}
}
// Fallback: if no valid skin type matched
else {
return fallBackSkin(npc);
}
// Final safety net
return npc.textureLocation == null ? fallBackSkin(npc) : npc.textureLocation;
}
private ResourceLocation adjustLocalTexture(EntityNPCInterface npc, ResourceLocation location) throws IOException {