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

Clear the villager base textures when reloading

Browse source
This commit is contained in:
Sollace 2019-10-12 12:09:34 +02:00
parent 3593bf672b
commit 3edf26b1f5
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java
View file

@ -19,7 +19,7 @@ abstract class AbstractVillagerRenderer<
T extends MobEntity & VillagerDataContainer, T extends MobEntity & VillagerDataContainer,
M extends ClientPonyModel<T> & IUnicorn<PonyRenderer> & ModelWithHat> extends RenderPonyMob.Caster<T, M> { M extends ClientPonyModel<T> & IUnicorn<PonyRenderer> & ModelWithHat> extends RenderPonyMob.Caster<T, M> {
private final ITextureSupplier<T> professions; private final ITextureSupplier<T> baseTextures;
private final String entityType; private final String entityType;
@ -27,7 +27,7 @@ abstract class AbstractVillagerRenderer<
super(manager, model); super(manager, model);
entityType = type; entityType = type;
professions = new PonyTextures<>(formatter); baseTextures = new PonyTextures<>(formatter);
addFeature(new ClothingLayer<>(this, entityType)); addFeature(new ClothingLayer<>(this, entityType));
} }
@ -63,6 +63,6 @@ abstract class AbstractVillagerRenderer<
@Override @Override
public Identifier findTexture(T villager) { public Identifier findTexture(T villager) {
return professions.supplyTexture(villager); return baseTextures.supplyTexture(villager);
} }
} }

17
src/main/java/com/minelittlepony/client/render/entities/villager/PonyTextures.java
View file

@ -2,6 +2,9 @@ package com.minelittlepony.client.render.entities.villager;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.resource.ReloadableResourceManager;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.SynchronousResourceReloadListener;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.village.VillagerData; import net.minecraft.village.VillagerData;
import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerDataContainer;
@ -18,7 +21,7 @@ import java.util.Optional;
/** /**
* Cached pool of villager textures. * Cached pool of villager textures.
*/ */
public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implements ITextureSupplier<T> { public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implements ITextureSupplier<T>, SynchronousResourceReloadListener {
private final ITextureSupplier<String> formatter; private final ITextureSupplier<String> formatter;
@ -29,6 +32,8 @@ public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implem
private final Identifier egg; private final Identifier egg;
private final Identifier egg2; private final Identifier egg2;
private final ReloadableResourceManager resourceManager;
/** /**
* Creates a new profession cache * Creates a new profession cache
* *
@ -37,10 +42,18 @@ public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implem
* @param fallback The default if any generated textures fail to load. This is stored in place of failing textures. * @param fallback The default if any generated textures fail to load. This is stored in place of failing textures.
*/ */
public PonyTextures(ITextureSupplier<String> formatter) { public PonyTextures(ITextureSupplier<String> formatter) {
this.resourceManager = (ReloadableResourceManager)MinecraftClient.getInstance().getResourceManager();
this.formatter = formatter; this.formatter = formatter;
this.fallback = formatter.supplyTexture("villager_pony"); this.fallback = formatter.supplyTexture("villager_pony");
this.egg = formatter.supplyTexture("silly_pony"); this.egg = formatter.supplyTexture("silly_pony");
this.egg2 = formatter.supplyTexture("tiny_silly_pony"); this.egg2 = formatter.supplyTexture("tiny_silly_pony");
resourceManager.registerListener(this);
}
@Override
public void apply(ResourceManager manager) {
cache.clear();
} }
@Override @Override
@ -82,7 +95,7 @@ public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implem
} }
protected Optional<Identifier> verifyTexture(Identifier texture) { protected Optional<Identifier> verifyTexture(Identifier texture) {
if (!MinecraftClient.getInstance().getResourceManager().containsResource(texture)) { if (!resourceManager.containsResource(texture)) {
MineLittlePony.logger.warn("Villager texture `" + texture + "` was not found."); MineLittlePony.logger.warn("Villager texture `" + texture + "` was not found.");
return Optional.empty(); return Optional.empty();
} }