From f40d9f9381c2ef559cbc237390adaf98a10f8a04 Mon Sep 17 00:00:00 2001
From: Oliver <oliver@noreply.localhost>
Date: Sat, 6 Dec 2025 23:23:48 -0700
Subject: [PATCH] Bring the preventUserConfigOpen into line with the rest of
 the setting implementations that I like more

---
 module/hooks/init.mjs                     |  3 --
 module/hooks/renderUserConfig.mjs         | 12 -------
 module/oft.mjs                            |  3 +-
 module/settings/chatSidebarBackground.mjs |  1 +
 module/settings/preventUserConfigOpen.mjs | 39 +++++++++++++----------
 module/settings/startingSidebarTab.mjs    |  3 +-
 6 files changed, 27 insertions(+), 34 deletions(-)
 delete mode 100644 module/hooks/renderUserConfig.mjs

diff --git a/module/hooks/init.mjs b/module/hooks/init.mjs
index 4a0de21..e459bd6 100644
--- a/module/hooks/init.mjs
+++ b/module/hooks/init.mjs
@@ -1,10 +1,7 @@
 import { __ID } from "../consts.mjs";
-import { preventUserConfigOpen } from "../settings/preventUserConfigOpen.mjs";
 import { startSidebarExpanded } from "../settings/startSidebarExpanded.mjs";
 
 Hooks.once(`init`, () => {
 	console.log(`${__ID} | Initializing`);
-
-	preventUserConfigOpen.register();
 	startSidebarExpanded.register();
 });
diff --git a/module/hooks/renderUserConfig.mjs b/module/hooks/renderUserConfig.mjs
deleted file mode 100644
index 54e51b2..0000000
--- a/module/hooks/renderUserConfig.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import { preventUserConfigOpen } from "../settings/preventUserConfigOpen.mjs";
-
-// #region Once
-Hooks.once(`renderUserConfig`, (app, element) => {
-
-	// MARK: Prevent Unready Open
-	if (!game.ready && preventUserConfigOpen.value()) {
-		element.style.display = `none`;
-		app.close();
-	};
-});
-// #endregion Once
diff --git a/module/oft.mjs b/module/oft.mjs
index dbeba52..693a85b 100644
--- a/module/oft.mjs
+++ b/module/oft.mjs
@@ -2,11 +2,12 @@
 import "./hooks/init.mjs";
 import "./hooks/ready.mjs";
 import "./hooks/renderSidebar.mjs";
-import "./hooks/renderUserConfig.mjs";
 import { chatSidebarBackground } from "./settings/chatSidebarBackground.mjs";
+import { preventUserConfigOpen } from "./settings/preventUserConfigOpen.mjs";
 import { startingSidebarTab } from "./settings/startingSidebarTab.mjs";
 
 Hooks.once(`init`, () => {
 	chatSidebarBackground();
+	preventUserConfigOpen();
 	startingSidebarTab();
 });
diff --git a/module/settings/chatSidebarBackground.mjs b/module/settings/chatSidebarBackground.mjs
index 9bc18a8..d7a7f38 100644
--- a/module/settings/chatSidebarBackground.mjs
+++ b/module/settings/chatSidebarBackground.mjs
@@ -4,6 +4,7 @@ import { Logger } from "../utils/Logger.mjs";
 const key = `chatSidebarBackground`;
 
 export function chatSidebarBackground() {
+	Logger.log(`Registering setting: ${key}`);
 
 	// #region Registration
 	game.settings.register(__ID, key, {
diff --git a/module/settings/preventUserConfigOpen.mjs b/module/settings/preventUserConfigOpen.mjs
index c4e2412..2c07bf6 100644
--- a/module/settings/preventUserConfigOpen.mjs
+++ b/module/settings/preventUserConfigOpen.mjs
@@ -1,22 +1,29 @@
 import { __ID } from "../consts.mjs";
+import { Logger } from "../utils/Logger.mjs";
 
 const key = `preventUserConfigOpen`;
 
-const config = {
-	name: `OFT.setting.${key}.name`,
-	hint: `OFT.setting.${key}.hint`,
-	scope: `user`,
-	type: Boolean,
-	default: false,
-	config: true,
-	requiresReload: false,
-};
+export function preventUserConfigOpen() {
+	Logger.log(`Registering setting: ${key}`);
 
-export const preventUserConfigOpen = {
-	value() {
-		return game.settings.get(__ID, key);
-	},
-	register() {
-		game.settings.register(__ID, key, config);
-	},
+	// #region Registration
+	game.settings.register(__ID, key, {
+		name: `OFT.setting.${key}.name`,
+		hint: `OFT.setting.${key}.hint`,
+		scope: `user`,
+		type: Boolean,
+		default: false,
+		config: true,
+		requiresReload: false,
+	});
+	// #endregion Registration
+
+	// #region Implementation
+	Hooks.once(`renderUserConfig`, (app, element) => {
+		if (!game.ready && game.settings.get(__ID, key)) {
+			element.style.display = `none`;
+			app.close();
+		};
+	});
+	// #endregion Implementation
 };
diff --git a/module/settings/startingSidebarTab.mjs b/module/settings/startingSidebarTab.mjs
index 1863269..0369eaa 100644
--- a/module/settings/startingSidebarTab.mjs
+++ b/module/settings/startingSidebarTab.mjs
@@ -4,7 +4,7 @@ import { Logger } from "../utils/Logger.mjs";
 const key = `startingSidebarTab`;
 
 export function startingSidebarTab() {
-	Logger.log(`Registering ${key} setting`);
+	Logger.log(`Registering setting: ${key}`);
 
 	// #region Registration
 	game.settings.register(__ID, key, {
@@ -49,4 +49,3 @@ export function startingSidebarTab() {
 	});
 	// #endregion Implementation
 };
-