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 memory leak when repeatedly reloading textures

Browse source
This commit is contained in:
Sollace 2019-12-01 13:30:41 +02:00
parent 4e8fe18800
commit 90d5e00efc
2 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,8 @@ import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.render.entity.model.ModelWithHat; import net.minecraft.client.render.entity.model.ModelWithHat;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.resource.ReloadableResourceManager;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.SynchronousResourceReloadListener; import net.minecraft.resource.Resource;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
@ -37,7 +35,7 @@ import java.util.Map;
class NpcClothingFeature< class NpcClothingFeature<
T extends LivingEntity & VillagerDataContainer, T extends LivingEntity & VillagerDataContainer,
M extends EntityModel<T> & IPonyModel<T> & ModelWithHat, M extends EntityModel<T> & IPonyModel<T> & ModelWithHat,
C extends FeatureRendererContext<T, M> & IPonyRenderContext<T, M>> extends AbstractPonyFeature<T, M> implements SynchronousResourceReloadListener { C extends FeatureRendererContext<T, M> & IPonyRenderContext<T, M>> extends AbstractPonyFeature<T, M> {
private static final Int2ObjectMap<Identifier> LEVEL_TO_ID = Util.create(new Int2ObjectOpenHashMap<>(), a -> { private static final Int2ObjectMap<Identifier> LEVEL_TO_ID = Util.create(new Int2ObjectOpenHashMap<>(), a -> {
a.put(1, new Identifier("stone")); a.put(1, new Identifier("stone"));
@ -52,13 +50,11 @@ class NpcClothingFeature<
private final String entityType; private final String entityType;
private final ReloadableResourceManager resourceManager; private final ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
public NpcClothingFeature(C context, String type) { public NpcClothingFeature(C context, String type) {
super(context); super(context);
entityType = type; entityType = type;
resourceManager = (ReloadableResourceManager)MinecraftClient.getInstance().getResourceManager();
resourceManager.registerListener(this);
} }
public static Identifier getClothingTexture(VillagerDataContainer entity, String entityType) { public static Identifier getClothingTexture(VillagerDataContainer entity, String entityType) {
@ -131,12 +127,6 @@ class NpcClothingFeature<
}); });
} }
@Override
public void apply(ResourceManager manager) {
profHatCache.clear();
typeHatCache.clear();
}
public Identifier findTexture(String category, Identifier identifier) { public Identifier findTexture(String category, Identifier identifier) {
return new Identifier("minelittlepony", "textures/entity/" + entityType + "/" + category + "/" + identifier.getPath() + ".png"); return new Identifier("minelittlepony", "textures/entity/" + entityType + "/" + category + "/" + identifier.getPath() + ".png");
} }

14
src/main/java/com/minelittlepony/client/render/entity/npc/PonyTextures.java
View file

@ -2,9 +2,7 @@ package com.minelittlepony.client.render.entity.npc;
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.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;
@ -20,7 +18,7 @@ import java.util.Optional;
/** /**
* Cached pool of villager textures. * Cached pool of villager textures.
*/ */
public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implements TextureSupplier<T>, SynchronousResourceReloadListener { public class PonyTextures<T extends LivingEntity & VillagerDataContainer> implements TextureSupplier<T> {
private final TextureSupplier<String> formatter; private final TextureSupplier<String> formatter;
@ -31,7 +29,7 @@ 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; private final ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
/** /**
* Creates a new profession cache * Creates a new profession cache
@ -41,18 +39,10 @@ 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(TextureSupplier<String> formatter) { public PonyTextures(TextureSupplier<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