Add config hot reloading listening on Data Pack Reload.

Author: Ampflower

src/main/java/net/kjp12/ddc/Config.java

@@ -42,7 +42,7 @@ public class Config {
 	 */
 	private static final Gson GSON = new GsonBuilder().enableComplexMapKeySerialization().setPrettyPrinting()
 			.setLenient().registerTypeAdapter(Identifier.class, new IdentifierTypeAdaptor()).create();
-	public static final Config INSTANCE;
+	public static Config instance;
 
 	/**
 	 * Whether the config is being initialised for the first time.
@@ -84,6 +84,10 @@ public class Config {
 	public Map<Identifier, Float> compostableItems;
 
 	static {
+		reload();
+	}
+
+	public static void reload() {
 		Config instance = null;
 		if (Files.exists(config)) {
 			try (var reader = Files.newBufferedReader(config)) {
@@ -92,11 +96,19 @@ public class Config {
 				Main.logger.warn("Unable to read config, regenerating...", ioe);
 			}
 		}
+
 		if (instance == null) {
-			instance = new Config();
-			instance.generating = true;
+			if (Config.instance == null) {
+				instance = new Config();
+				instance.generating = true;
+			} else {
+				Main.logger.warn("Configuration already in memory, writing back to disc...");
+				Config.instance.write();
+				return;
+			}
 		}
-		INSTANCE = instance;
+
+		Config.instance = instance;
 	}
 
 	/* Private as you shouldn't be directly initialising this. */
@@ -119,11 +131,15 @@ public void generateSettings() {
 			ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE
 					.forEach((item, value) -> compostableItems.put(Registry.ITEM.getId(item.asItem()), value));
 
-			try (var writer = Files.newBufferedWriter(config)) {
-				GSON.toJson(this, writer);
-			} catch (IOException ioe) {
-				Main.logger.warn("Unable to write config?", ioe);
-			}
+			write();
+		}
+	}
+
+	private void write() {
+		try (var writer = Files.newBufferedWriter(config)) {
+			GSON.toJson(this, writer);
+		} catch (IOException ioe) {
+			Main.logger.warn("Unable to write config?", ioe);
 		}
 	}
 

src/main/java/net/kjp12/ddc/Main.java

@@ -41,8 +41,8 @@ public static void init() {
 			vanillaCompostableItems = new Object2FloatArrayMap<>(ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE);
 
 			// Generate settings if they aren't already present.
-			if (!Config.INSTANCE.isReady()) {
-				Config.INSTANCE.generateSettings();
+			if (!Config.instance.isReady()) {
+				Config.instance.generateSettings();
 			}
 
 			ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.clear();
@@ -55,8 +55,10 @@ public static void init() {
 		// This is somewhat hacky, but intends to make sure that other implementations
 		// such as QSL has the ability to register its own additions via its internal
 		// registries.
-		ServerLifecycleEvents.START_DATA_PACK_RELOAD
-				.register((server, resourceManager) -> ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.clear());
+		ServerLifecycleEvents.START_DATA_PACK_RELOAD.register((server, resourceManager) -> {
+			ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.clear();
+			Config.reload();
+		});
 
 		ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, success) -> hotLoad());
 
@@ -67,7 +69,7 @@ public static void init() {
 				ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.putAll(vanillaCompostableItems);
 
 				vanillaCompostableItems = null;
-			} else if (Config.INSTANCE.disableDefaultVanillaRegistry) {
+			} else if (Config.instance.disableDefaultVanillaRegistry) {
 				logger.warn("The vanillaCompostableItems map is missing. This shouldn't happen!");
 			}
 		});
@@ -84,18 +86,18 @@ public static void hotLoad() {
 		// cleared.
 		// This intends to clear any interference that may otherwise be caused by
 		// hot reloading.
-		if (Config.INSTANCE.disableDefaultVanillaRegistry) {
+		if (Config.instance.disableDefaultVanillaRegistry) {
 			// The registry is already cleared by the outer method prior to reloading.
 			// This only clears if datapack clearing is also enabled.
-			if (Config.INSTANCE.disableDatapackRegistry) {
+			if (Config.instance.disableDatapackRegistry) {
 				logger.info("[DDC] Evoking {} as `disableDatapackRegistry` for the composter is enabled.",
 						ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE);
 				ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.clear();
 			}
 		} else {
 			// Same as above, but redeploys the vanilla registry.
 			// Not sure why you want this, but here you go.
-			if (Config.INSTANCE.disableDatapackRegistry) {
+			if (Config.instance.disableDatapackRegistry) {
 				logger.info(
 						"[DDC] Evoking {} in favour of vanilla registry base as `disableDatapackRegistry` for the composter is enabled.",
 						ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE);
@@ -128,7 +130,7 @@ public static void hotLoad() {
 	public static void register() {
 		var compostableItems = new Object2FloatOpenHashMap<ItemConvertible>();
 
-		Config.INSTANCE.compostableItems.forEach((k, v) -> {
+		Config.instance.compostableItems.forEach((k, v) -> {
 			var item = Registry.ITEM.getOrEmpty(k);
 			if (item.isEmpty()) {
 				logger.warn("{} -> {} not preset at current time.", k, v);

src/main/java/net/kjp12/ddc/mixins/MixinComposterBlock.java

@@ -34,7 +34,7 @@ public class MixinComposterBlock {
 
 	@Redirect(method = "<clinit>", at = @At(value = "FIELD", opcode = Opcodes.PUTSTATIC, target = "Lnet/minecraft/block/ComposterBlock;ITEM_TO_LEVEL_INCREASE_CHANCE:Lit/unimi/dsi/fastutil/objects/Object2FloatMap;"))
 	private static void ddc$redirectToLoggingMap(Object2FloatMap<ItemConvertible> value) {
-		ITEM_TO_LEVEL_INCREASE_CHANCE = Config.INSTANCE.logAllDirectRegistration ? new LoggingObject2FloatMap<>(value)
+		ITEM_TO_LEVEL_INCREASE_CHANCE = Config.instance.logAllDirectRegistration ? new LoggingObject2FloatMap<>(value)
 				: value;
 	}
 }