Reorder loading sequence

Author: mclemente

src/module/polyglot.js

@@ -26,25 +26,25 @@ Hooks.once("init", () => {
 });
 
 Hooks.once("i18nInit", () => {
+	registerProviderSettings();
 	game.polyglot.languageProvider.i18nInit();
 });
 
-Hooks.on("setup", async () => {
+Hooks.on("setup", () => {
 	if (game.user.isGM && game.user.character) {
 		console.warn(
 			`Polyglot | ${game.i18n.format("POLYGLOT.GameMasterHasAssignedCharacter", {
 				GM: game.i18n.localize("USER.RoleGamemaster"),
 			})}`,
 		);
 	}
-	registerProviderSettings();
 	registerTours();
-	await game.polyglot.languageProvider.setup();
+	game.polyglot.languageProvider.setup();
 });
-Hooks.on("ready", () => {
-	game.polyglot.ready();
+Hooks.on("ready", async () => {
+	await game.polyglot.ready();
 	Hooks.callAll("polyglot.ready", LanguageProvider);
-	game.polyglot.languageProvider.ready();
+	await game.polyglot.languageProvider.ready();
 });
 Hooks.on("renderSettingsConfig", renderSettingsConfigHandler);
 Hooks.on("renderPolyglotGeneralSettings", renderPolyglotGeneralSettingsHandler);

src/module/providers/templates/Base.js

@@ -273,45 +273,49 @@ export default class LanguageProvider {
 	// Hooks //
 	// /////////
 
-	init() {}
+	async initSequence() {
+		await this.getLanguages();
+		this.loadFonts();
+		this.loadLanguages();
+		this.loadCustomFonts();
+		this.reloadLanguages();
+	}
 
-	i18nInit() {}
+	async setupSequence() {
+		this.getDefaultLanguage();
+	}
 
-	/**
-	 * Loads everything that can't be loaded on the constructor due to async/await.
-	 * It Hooks on ready if the system depends on reading compendiums.
-	 */
-	async setup() {
+	init() {
 		game.polyglot.omniglot = game.settings.get("polyglot", "omniglot");
 		game.polyglot.comprehendLanguages = game.settings.get("polyglot", "comprehendLanguages");
 		game.polyglot.truespeech = game.settings.get("polyglot", "truespeech");
+	}
 
-		const setupSteps = async () => {
-			await this.getLanguages();
-			this.loadFonts();
-			this.loadLanguages();
-			this.loadCustomFonts();
-			this.reloadLanguages();
-			this.getDefaultLanguage();
-		};
-		if (this.requiresReady) {
-			if (game.modules.get("babele")?.active) {
-				Hooks.on("babele.ready", async () => {
-					await setupSteps();
-					Hooks.callAll("polyglot.languageProvider.ready");
-				});
-			} else {
-				Hooks.on("ready", async () => {
-					await setupSteps();
-					Hooks.callAll("polyglot.languageProvider.ready");
-				});
-			}
-		} else {
-			await setupSteps();
+	async i18nInit() {
+		if (!this.requiresReady) {
+			await this.initSequence();
+		}
+	}
+
+	async setup() {
+		if (!this.requiresReady) {
+			await this.setupSequence();
+		} else if (game.modules.get("babele")?.active) {
+			Hooks.on("babele.ready", async () => {
+				await this.initSequence();
+				await this.setupSequence();
+				Hooks.callAll("polyglot.languageProvider.ready");
+			});
 		}
 	}
 
-	ready() {}
+	async ready() {
+		if (this.requiresReady && !game.modules.get("babele")?.active) {
+			await this.initSequence();
+			await this.setupSequence();
+			Hooks.callAll("polyglot.languageProvider.ready");
+		}
+	}
 
 	/**
 	 * Even though the base method doesn't have an await, some providers might need it to look into compendiums.