From f61090d9c98b4ce5f629f01a158f1423b3cfee27 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 10 Jul 2019 21:32:36 -0400 Subject: [PATCH] Add a proper callback for clearing the skin cache --- .../java/com/minelittlepony/client/hdskins/MineLPHDSkins.java | 3 ++- src/main/java/com/minelittlepony/client/pony/PonyManager.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index baa29b50..77ad4788 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -6,6 +6,7 @@ import com.minelittlepony.client.hdskins.gui.DummyPony; import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP; import com.minelittlepony.client.hdskins.gui.RenderDummyPony; import com.minelittlepony.common.event.ClientReadyCallback; +import com.minelittlepony.hdskins.SkinCacheClearCallback; import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; @@ -31,7 +32,7 @@ class MineLPHDSkins { // Clear ponies when skins are cleared PonyManager ponyManager = (PonyManager) MineLittlePony.getInstance().getManager(); - manager.addClearListener(ponyManager::onSkinCacheCleared); + SkinCacheClearCallback.EVENT.register(ponyManager::onSkinCacheCleared); // Ponify the skins GUI. manager.getSkinServerList().setSkinsGui(GuiSkinsMineLP::new); diff --git a/src/main/java/com/minelittlepony/client/pony/PonyManager.java b/src/main/java/com/minelittlepony/client/pony/PonyManager.java index cc55f8b3..b6e916bd 100644 --- a/src/main/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/main/java/com/minelittlepony/client/pony/PonyManager.java @@ -265,9 +265,8 @@ public class PonyManager implements IPonyManager, IdentifiableResourceReloadList } } - public boolean onSkinCacheCleared() { + public void onSkinCacheCleared() { MineLittlePony.logger.info("Flushed {} cached ponies.", poniesCache.size()); poniesCache.invalidateAll(); - return true; } }