diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java index d34de43d..359e3d74 100644 --- a/src/main/java/com/minelittlepony/client/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -90,6 +90,7 @@ public class MineLittlePony implements ClientModInitializer { ScreenInitCallback.EVENT.register(this::onScreenInit); config.load(); + config.onChangedExternally(c -> initialized = false); Channel.bootstrap(); ModelType.bootstrap(); @@ -101,6 +102,10 @@ public class MineLittlePony implements ClientModInitializer { if (!initialized) { initialized = true; renderDispatcher.initialise(client.getEntityRenderDispatcher(), false); + + if (client.currentScreen instanceof PonySettingsScreen screen) { + screen.init(client, screen.width, screen.height); + } } boolean inGame = client.world != null && client.player != null && client.currentScreen == null; diff --git a/src/main/java/com/minelittlepony/client/model/armour/ArmourTextureResolver.java b/src/main/java/com/minelittlepony/client/model/armour/ArmourTextureResolver.java index 491fe934..235f83a0 100644 --- a/src/main/java/com/minelittlepony/client/model/armour/ArmourTextureResolver.java +++ b/src/main/java/com/minelittlepony/client/model/armour/ArmourTextureResolver.java @@ -75,7 +75,7 @@ public class ArmourTextureResolver implements ArmourTextureLookup, IdentifiableR .filter(ArmourTexture::validate) .findFirst() .or(() -> { - MineLittlePony.logger.warn("Could not identify correct texture to use for {}. Was none of: [" + System.lineSeparator() + "{}" + System.lineSeparator() + "]", id, options.stream() + MineLittlePony.LOGGER.warn("Could not identify correct texture to use for {}. Was none of: [" + System.lineSeparator() + "{}" + System.lineSeparator() + "]", id, options.stream() .map(ArmourTexture::texture) .map(Identifier::toString) .collect(Collectors.joining("," + System.lineSeparator())));