PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-26 06:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed villagers with modded professions rendering as purple and black monstrocities

Browse source
This commit is contained in:
Sollace 2023-02-15 20:17:28 +00:00
parent b5b168df06
commit b1442c0874
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/minelittlepony/client/render/entity/npc/NpcClothingFeature.java
View file

@ -2,7 +2,6 @@ package com.minelittlepony.client.render.entity.npc;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.feature.FeatureRendererContext; import net.minecraft.client.render.entity.feature.FeatureRendererContext;
import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.EntityModel;
@ -22,6 +21,7 @@ import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.client.render.IPonyRenderContext; import com.minelittlepony.client.render.IPonyRenderContext;
import com.minelittlepony.client.render.entity.feature.AbstractPonyFeature; import com.minelittlepony.client.render.entity.feature.AbstractPonyFeature;
import com.minelittlepony.client.util.render.TextureFlattener; import com.minelittlepony.client.util.render.TextureFlattener;
import com.minelittlepony.util.ResourceUtil;
import java.util.*; import java.util.*;
@ -57,7 +57,9 @@ class NpcClothingFeature<
if (entity.isBaby() || data.getProfession() == VillagerProfession.NONE) { if (entity.isBaby() || data.getProfession() == VillagerProfession.NONE) {
Identifier typeSkin = createTexture("type", Registries.VILLAGER_TYPE.getId(data.getType())); Identifier typeSkin = createTexture("type", Registries.VILLAGER_TYPE.getId(data.getType()));
if (!ResourceUtil.textureExists(typeSkin)) {
typeSkin = createTexture("type", Registries.VILLAGER_TYPE.getId(VillagerType.PLAINS));
}
renderModel(entityModel, typeSkin, matrixStack, provider, i, entity, 1, 1, 1); renderModel(entityModel, typeSkin, matrixStack, provider, i, entity, 1, 1, 1);
} else { } else {
renderModel(entityModel, getMergedTexture(data), matrixStack, provider, i, entity, 1, 1, 1); renderModel(entityModel, getMergedTexture(data), matrixStack, provider, i, entity, 1, 1, 1);
@ -74,7 +76,7 @@ class NpcClothingFeature<
Identifier key = new Identifier("minelittlepony", (typeId + "/" + profId + "/" + level).replace(':', '_')); Identifier key = new Identifier("minelittlepony", (typeId + "/" + profId + "/" + level).replace(':', '_'));
if (loadedTextures.add(key) && MinecraftClient.getInstance().getTextureManager().getOrDefault(key, null) == null) { if (loadedTextures.add(key) && !ResourceUtil.textureExists(key)) {
TextureFlattener.flatten(computeTextures(typeId, profId, profession == VillagerProfession.NITWIT ? -1 : level), key); TextureFlattener.flatten(computeTextures(typeId, profId, profession == VillagerProfession.NITWIT ? -1 : level), key);
} }
@ -84,8 +86,14 @@ class NpcClothingFeature<
private List<Identifier> computeTextures(Identifier typeId, Identifier profId, int level) { private List<Identifier> computeTextures(Identifier typeId, Identifier profId, int level) {
List<Identifier> skins = new ArrayList<>(); List<Identifier> skins = new ArrayList<>();
skins.add(createTexture("type", typeId)); Identifier typeTexture = createTexture("type", typeId);
skins.add(createTexture("profession", profId)); if (ResourceUtil.textureExists(typeTexture)) {
skins.add(typeTexture);
}
Identifier profTexture = createTexture("profession", profId);
skins.add(ResourceUtil.textureExists(profTexture) ? profTexture : createTexture("profession", new Identifier(VillagerProfession.NITWIT.id())));
if (level != -1) { if (level != -1) {
skins.add(createTexture("profession_level", LEVEL_TO_ID.get(level))); skins.add(createTexture("profession_level", LEVEL_TO_ID.get(level)));
} }