Reload emotes when changing config

Vinrobot · Aug 12, 2023 · 9b9f481 · 9b9f481
1 parent f3266c7
commit 9b9f481
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/client/java/net/vinrobot/mcemote/client/MinecraftEmoteModClient.java b/src/client/java/net/vinrobot/mcemote/client/MinecraftEmoteModClient.java
@@ -8,6 +8,7 @@
 import net.vinrobot.mcemote.client.providers.IEmoteProvider;
 import net.vinrobot.mcemote.client.text.EmotesManager;
 import net.vinrobot.mcemote.config.Configuration;
+import net.vinrobot.mcemote.config.ConfigurationManager;
 import webpdecoderjn.WebPLoader;
 
 import java.io.IOException;
@@ -27,7 +28,18 @@ public void onInitializeClient() {
 			MinecraftEmoteMod.LOGGER.error("Failed to initialize WebPDecoder", e);
 		}
 
-		final Configuration config = MinecraftEmote.getInstance().getConfigManager().getConfig();
+		final ConfigurationManager configManager = MinecraftEmote.getInstance().getConfigManager();
+
+		configManager.onChange((config) -> {
+			EMOTES_MANAGER.clearEmotes();
+			this.registerEmotes(EMOTES_MANAGER, config);
+		});
+
+		// Load config at startup
+		configManager.getConfig();
+	}
+
+	private void registerEmotes(final EmotesManager manager, final Configuration config) {
 		final ServiceLoader<IEmoteProvider> serviceLoader = ServiceLoader.load(IEmoteProvider.class);
 		final List<IEmoteProvider> providers = ListHelper.sort(serviceLoader);
 
@@ -41,7 +53,7 @@ public void onInitializeClient() {
 				provider.registerEmotes(config, emotes::add);
 
 				for (final Emote emote : emotes) {
-					EMOTES_MANAGER.addEmote(emote);
+					manager.addEmote(emote);
 				}
 
 				MinecraftEmoteMod.LOGGER.info("Registered " + emotes.size() + " emotes from provider " + providerName);

diff --git a/src/main/java/net/vinrobot/mcemote/config/ConfigurationManager.java b/src/main/java/net/vinrobot/mcemote/config/ConfigurationManager.java
@@ -1,10 +1,13 @@
 package net.vinrobot.mcemote.config;
 
 import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import static net.vinrobot.mcemote.MinecraftEmoteMod.LOGGER;
 
 public class ConfigurationManager {
+	private final Set<ChangeCallback> changeCallbacks = new LinkedHashSet<>();
 	private final ConfigurationService configService;
 	private Configuration configuration;
 
@@ -25,12 +28,16 @@ public Configuration load() {
 		} catch (final IOException e) {
 			LOGGER.error("Failed to load config", e);
 			return this.configuration = service.create();
+		} finally {
+			this.triggerOnChange();
 		}
 	}
 
 	public void save() {
 		final Configuration config = this.configuration;
 		if (config != null) {
+			this.triggerOnChange();
+
 			try {
 				this.configService.save(config);
 			} catch (final IOException e) {
@@ -42,4 +49,18 @@ public void save() {
 	public void reset() {
 		this.configuration = this.configService.create();
 	}
+
+	public void onChange(final ChangeCallback callback) {
+		this.changeCallbacks.add(callback);
+	}
+
+	public void triggerOnChange() {
+		for (final ChangeCallback callback : this.changeCallbacks) {
+			callback.onChange(this.configuration);
+		}
+	}
+
+	public interface ChangeCallback {
+		void onChange(Configuration config);
+	}
 }