🛠️ Possible fix for infinite loading

Author: SnaveSutit

src/index.ts

@@ -46,32 +46,7 @@ import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
 import { exportProject } from './systems/exporter'
 import { openBlueprintLoadingDialog } from './interface/blueprintLoadingPopup'
 import { openInstallPopup } from './interface/installedPopup'
-
-// Show loading popup
-void showLoadingPopup().then(async () => {
-	if (!window.navigator.onLine) {
-		showOfflineError()
-		// return
-	}
-	events.NETWORK_CONNECTED.dispatch()
-
-	await Promise.all([
-		new Promise<void>(resolve => events.MINECRAFT_ASSETS_LOADED.subscribe(() => resolve())),
-		new Promise<void>(resolve => events.MINECRAFT_REGISTRY_LOADED.subscribe(() => resolve())),
-		new Promise<void>(resolve => events.MINECRAFT_FONTS_LOADED.subscribe(() => resolve())),
-		new Promise<void>(resolve => events.BLOCKSTATE_REGISTRY_LOADED.subscribe(() => resolve())),
-	])
-		.then(() => {
-			hideLoadingPopup()
-		})
-		.catch(error => {
-			console.error(error)
-			Blockbench.showToastNotification({
-				text: 'Animated Java failed to load! Please restart Blockbench',
-				color: 'var(--color-error)',
-			})
-		})
-})
+import { createBlockbenchMod } from './util/moddingTools'
 
 // @ts-ignore
 globalThis.AnimatedJava = {

src/mods/assetSetupMod.ts

@@ -0,0 +1,51 @@
+import { PACKAGE } from '../constants'
+import {
+	hideLoadingPopup,
+	showLoadingPopup,
+	showOfflineError,
+} from '../interface/animatedJavaLoadingPopup'
+import { events } from '../util/events'
+import { createBlockbenchMod } from '../util/moddingTools'
+
+createBlockbenchMod(
+	`${PACKAGE.name}:assetLoading`,
+	undefined,
+	() => {
+		// Show loading popup
+		void showLoadingPopup().then(async () => {
+			if (!window.navigator.onLine) {
+				showOfflineError()
+				// return
+			}
+			events.NETWORK_CONNECTED.dispatch()
+
+			await Promise.all([
+				new Promise<void>(resolve =>
+					events.MINECRAFT_ASSETS_LOADED.subscribe(() => resolve())
+				),
+				new Promise<void>(resolve =>
+					events.MINECRAFT_REGISTRY_LOADED.subscribe(() => resolve())
+				),
+				new Promise<void>(resolve =>
+					events.MINECRAFT_FONTS_LOADED.subscribe(() => resolve())
+				),
+				new Promise<void>(resolve =>
+					events.BLOCKSTATE_REGISTRY_LOADED.subscribe(() => resolve())
+				),
+			])
+				.then(() => {
+					hideLoadingPopup()
+				})
+				.catch(error => {
+					console.error(error)
+					Blockbench.showToastNotification({
+						text: 'Animated Java failed to load! Please restart Blockbench',
+						color: 'var(--color-error)',
+					})
+				})
+		})
+	},
+	() => {
+		//
+	}
+)

src/mods/index.ts

@@ -1,3 +1,4 @@
+import './assetSetupMod'
 import './addLocatorActionMod'
 import './animationControllerMod'
 import './animationPropertiesAction'