From 2676503d98b718d1f3ca166eb7dae3013c7d9f34 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 24 Jul 2019 21:35:21 -0400 Subject: [PATCH] Use config listeners for skulls. --- gradle.properties | 3 ++- src/main/java/com/minelittlepony/client/MineLittlePony.java | 6 +++--- .../java/com/minelittlepony/client/gui/GuiPonySettings.java | 2 -- .../client/render/tileentities/skull/PonySkullRenderer.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index cae801fd..43d371ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,6 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ - kirin_version=1.14.4-1.4.2 + # TODO update kirin before release + kirin_version=1.14.4-1.4.3-SNAPSHOT hd_skins_version=1.14.4-5.4.2 diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java index 8588c0f5..b17892e1 100644 --- a/src/main/java/com/minelittlepony/client/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -93,9 +93,9 @@ public class MineLittlePony implements ClientModInitializer { ClientTickCallback.EVENT.register(this::onTick); ClientReadyCallback.EVENT.register(this::onClientReady); ScreenInitCallback.EVENT.register(this::onScreenInit); - if (config.ponyskulls.get()) { - PonySkullRenderer.resolve(); - } + config.ponyskulls.onChanged(PonySkullRenderer::resolve); + // TODO Config is loaded too early for listeners + PonySkullRenderer.resolve(config.ponyskulls.get()); if (FabricLoader.getInstance().isModLoaded("hdskins")) { IndirectHDSkins.initialize(); diff --git a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java index e5502d37..d38a4ece 100644 --- a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -155,7 +155,5 @@ public class GuiPonySettings extends GameGui { @Override public void removed() { config.save(); - - PonySkullRenderer.resolve(); } } diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index c1b3c61e..b32bb65d 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -43,8 +43,8 @@ public class PonySkullRenderer extends SkullBlockEntityRenderer { * * Original/Existing renderer is stored to a backup variable as a fallback in case of mods. */ - public static void resolve() { - if (MineLittlePony.getInstance().getConfig().ponyskulls.get()) { + public static void resolve(boolean ponySkulls) { + if (ponySkulls) { if (!(INSTANCE instanceof PonySkullRenderer)) { backup = INSTANCE; BlockEntityRendererRegistry.INSTANCE.register(SkullBlockEntity.class, ponyInstance);