PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed exceptions when resolving armour textures

Browse source
This commit is contained in:
Sollace 2020-03-20 19:34:06 +02:00
parent ac80091587
commit f75bf7ff15
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java
View file

@ -79,23 +79,25 @@ public class DefaultArmourTextureResolver<T extends LivingEntity> implements IAr
}); });
} }
private Identifier getArmorTexture(String def, @Nullable String type) { private Identifier getArmorTexture(String def, String type) {
return HUMAN_ARMOUR.computeIfAbsent(def + "#" + type, s -> {
if (type.isEmpty() || type.equals(def)) {
return HUMAN_ARMOUR.computeIfAbsent(def, Identifier::new);
}
return HUMAN_ARMOUR.computeIfAbsent(type, s -> {
Identifier modId = new Identifier(s);
Identifier defId = new Identifier(def); Identifier defId = new Identifier(def);
Path defPath = Paths.get(defId.getPath()); if (type.isEmpty() || type.equals(def)) {
return defId;
}
String domain = modId.getNamespace(); Identifier modId = new Identifier(type);
String path = Paths.get(modId.getPath()).getParent().resolve(defPath.getFileName()).toString().replace('\\', '/'); Path modPath = Paths.get(modId.getPath()).getParent();
Identifier interemId = new Identifier(domain, path); if (modPath == null) {
return defId;
}
Path path = modPath.resolve(Paths.get(defId.getPath()).getFileName());
Identifier interemId = new Identifier(modId.getNamespace(), path.toString().replace('\\', '/'));
if (MinecraftClient.getInstance().getResourceManager().containsResource(interemId)) { if (MinecraftClient.getInstance().getResourceManager().containsResource(interemId)) {
return interemId; return interemId;