🛜 Fixed some Offline Loading Errors

- Added a warning when starting up in offline mode.
- Fixed a few version manager issues when starting up without an internet connection.

Author: SnaveSutit

src/components/animatedJavaLoadingPopup.svelte

@@ -4,14 +4,24 @@
 </script>
 
 <script lang="ts">
+	import { translate } from '../util/translation'
+
 	export let loaded: Valuable<boolean>
+	export let offline: Valuable<boolean>
 </script>
 
-<div class="floating">
-	{#if $loaded}
-		<div>Animated Java Loaded Successfully!</div>
+<div class={`floating ${$offline ? 'red-border' : 'blue-border'}`}>
+	{#if $offline}
+		<div style="display: flex; flex-direction: column;">
+			{@html translate('popup.loading.offline')
+				.split('\n')
+				.map(v => '<p>' + v + '</p>')
+				.join('')}
+		</div>
+	{:else if $loaded}
+		<div>{translate('popup.loading.success')}</div>
 	{:else}
-		<div class="text">Loading Animated Java...</div>
+		<div class="text">{translate('popup.loading.loading')}</div>
 		<img src={RunningArmorStand} alt="Running Armor Stand" />
 	{/if}
 </div>
@@ -23,11 +33,16 @@
 		right: 2rem;
 		background: var(--color-ui);
 		padding: 8px 16px;
-		border: 1px solid var(--color-accent);
 		display: flex;
 		align-items: center;
 		flex-direction: row;
 	}
+	.blue-border {
+		border: 1px solid var(--color-accent);
+	}
+	.red-border {
+		border: 1px solid var(--color-error);
+	}
 	.text {
 		margin-right: 16px;
 	}

src/index.ts

@@ -69,7 +69,11 @@ import { openUnexpectedErrorDialog } from './interface/unexpectedErrorDialog'
 import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat'
 import { TextDisplay } from './outliner/textDisplay'
 import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
-import { hideLoadingPopup, showLoadingPopup } from './interface/animatedJavaLoadingPopup'
+import {
+	hideLoadingPopup,
+	showLoadingPopup,
+	showOfflineError,
+} from './interface/animatedJavaLoadingPopup'
 import { getVanillaFont } from './systems/minecraft/fontManager'
 import * as assetManager from './systems/minecraft/assetManager'
 import * as itemModelManager from './systems/minecraft/itemModelManager'
@@ -81,6 +85,12 @@ import { exportProject } from './systems/exporter'
 
 // 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())),

src/interface/animatedJavaLoadingPopup.ts

@@ -4,6 +4,7 @@ import { injectSvelteCompomponent } from '../util/injectSvelte'
 import { Valuable } from '../util/stores'
 
 const LOADED = new Valuable(false)
+const OFFLINE = new Valuable(false)
 let activeComponent: SvelteComponent | undefined
 
 export async function showLoadingPopup() {
@@ -12,6 +13,7 @@ export async function showLoadingPopup() {
 		svelteComponent: AnimatedJavaLoadingPopup,
 		svelteComponentProperties: {
 			loaded: LOADED,
+			offline: OFFLINE,
 		},
 		elementSelector() {
 			return document.body
@@ -28,3 +30,14 @@ export function hideLoadingPopup() {
 		activeComponent = undefined
 	}, 2000)
 }
+
+export function showOfflineError() {
+	if (!activeComponent) return
+	OFFLINE.set(true)
+	// FIXME - Change this into a X button instead of a timeout.
+	setTimeout(() => {
+		if (!activeComponent) return
+		activeComponent.$destroy()
+		activeComponent = undefined
+	}, 10000)
+}

src/lang/en.yml

@@ -12,6 +12,13 @@ animated_java.action.create_vanilla_block_display.title: Add Vanilla Block Displ
 animated_java.action.open_vanilla_item_display_config.name: Vanilla Item Display Config
 animated_java.action.open_vanilla_block_display_config.name: Vanilla Block Display Config
 
+### Popups
+animated_java.popup.loading.loading: Loading Animated Java...
+animated_java.popup.loading.success: Animated Java Loaded Successfully!
+animated_java.popup.loading.offline: |-
+    Animated Java Failed to Connect!
+    Some features may be unavailable.
+
 ### Dialogs
 
 ## About

src/systems/minecraft/blockstateManager.ts

@@ -103,5 +103,7 @@ export async function getBlockState(block: string) {
 }
 
 events.LOAD.subscribe(() => {
-	void checkForRegistryUpdate()
+	void checkForRegistryUpdate().catch(err => {
+		console.error(err)
+	})
 })

src/systems/minecraft/registryManager.ts

@@ -178,7 +178,7 @@ export async function checkForRegistryUpdate() {
 	requestAnimationFrame(() => events.MINECRAFT_REGISTRY_LOADED.dispatch())
 }
 
-events.LOAD.subscribe(() => {
+events.NETWORK_CONNECTED.subscribe(() => {
 	void checkForRegistryUpdate().then(async () => {
 		await checkForAssetsUpdate()
 	})

src/systems/minecraft/versionManager.ts

@@ -1,4 +1,5 @@
-const VERSION_MANIFEST_URL = 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json'
+export const VERSION_MANIFEST_URL =
+	'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json'
 
 interface IMinecraftVersion {
 	id: string
@@ -21,6 +22,13 @@ export interface IMinecraftVersionManifest {
 let latestMinecraftVersion: IMinecraftVersion | undefined
 export async function getLatestVersion() {
 	if (latestMinecraftVersion) return latestMinecraftVersion
+	if (!window.navigator.onLine) {
+		console.warn('Not connected to the internet! Using last known latest version.')
+		latestMinecraftVersion = getCurrentVersion()
+		if (!latestMinecraftVersion)
+			throw new Error('No internet connection, and no previous latest version cached!')
+		return latestMinecraftVersion
+	}
 	let response: Response | undefined
 	try {
 		response = await fetch(VERSION_MANIFEST_URL)

src/util/events.ts

@@ -20,6 +20,8 @@ export const events = {
 	INJECT_MODS: new PluginEvent('injectMods'),
 	EXTRACT_MODS: new PluginEvent('extractMods'),
 
+	NETWORK_CONNECTED: new PluginEvent('networkConnected'),
+
 	MINECRAFT_ASSETS_LOADED: new PluginEvent('minecraftAssetsLoaded'),
 	MINECRAFT_REGISTRY_LOADED: new PluginEvent('minecraftRegistriesLoaded'),
 	MINECRAFT_FONTS_LOADED: new PluginEvent('minecraftFontsLoaded'),