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

Changed fallback handling for villager textures to try the plains biome as fail-safe before going to the default/nitwit texture

Browse source
This commit is contained in:
Sollace 2019-06-29 23:44:12 +02:00
parent fb235f9179
commit 7f6222d0d6
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java
View file

@ -11,9 +11,9 @@ import net.minecraft.village.VillagerType;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.util.resources.ITextureSupplier;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
/**
* Cached pool of villager textures.
@ -55,33 +55,43 @@ class VillagerProfessionTextureCache<T extends LivingEntity & VillagerDataContai
}
}
if (entity.getVillagerData().getProfession() == VillagerProfession.NONE) {
return fallback;
}
return cache.computeIfAbsent(formatTexture(entity), this::getTexture);
}
public String formatTexture(T entity) {
VillagerData t = entity.getVillagerData();
VillagerType type = t.getType();
VillagerProfession profession = t.getProfession();
return String.format("pony/%s/%s", type, profession.toString());
return getTexture(t.getType(), t.getProfession());
}
private Identifier getTexture(String professionId) {
Identifier generated = formatter.supplyTexture(professionId);
private Identifier getTexture(final VillagerType type, final VillagerProfession profession) {
try {
MinecraftClient.getInstance().getResourceManager().getResource(generated);
} catch (IOException e) {
MineLittlePony.logger.error("Error loading villager texture `" + generated + "`.", e);
// if texture loading fails, use the fallback.
if (profession == VillagerProfession.NONE) {
return fallback;
}
return generated;
String key = String.format("pony/%s/%s", type, profession);
if (cache.containsKey(key)) {
return cache.get(key); // People often complain that villagers cause lag,
// so let's do better than Mojang and rather NOT go
// through all the lambda generations if we can avoid it.
}
return cache.computeIfAbsent(key, k -> {
return verifyTexture(formatter.supplyTexture(k)).orElseGet(() -> {
if (type == VillagerType.PLAINS) {
// if texture loading fails, use the fallback.
return fallback;
}
return getTexture(VillagerType.PLAINS, profession);
});
});
}
protected Optional<Identifier> verifyTexture(Identifier texture) {
if (!MinecraftClient.getInstance().getResourceManager().containsResource(texture)) {
MineLittlePony.logger.warn("Villager texture `" + texture + "` was not found.");
return Optional.empty();
}
return Optional.of(texture);
}
}