[v1.8.4] Merge pull request #398 from bridge-core/dev

Author: Joelant05

app/renderer/src/UI/Windows/Project/Chooser/load.ts

@@ -42,59 +42,64 @@ export async function loadProjects() {
 }
 
 async function loadManifest(projectPath: string) {
-	const manifestPath = join(projectPath, 'manifest.json')
-	let manifest = await readJSON(manifestPath).catch(() => ({
-		header: {},
-		metadata: {},
-	}))
-	let {
-		header: { version, name, description },
-		metadata: { author } = {
-			author: 'Unknown',
-		},
-	} = manifest
+	let langDescription: string
+	try {
+		const langFile = (
+			await fs.readFile(join(projectPath, 'texts/en_US.lang'))
+		).toString('utf-8')
+		const lines = langFile.split('\n')
 
-	if (description === 'pack.description') {
-		try {
-			const langFile = (
-				await fs.readFile(join(projectPath, 'texts/en_US.lang'))
-			).toString('utf-8')
-			const lines = langFile.split('\n')
+		for (let line of lines) {
+			const [key, value] = line.split('=')
+			if (key.trim() === 'pack.description')
+				langDescription = value.trim()
+		}
+	} catch {}
+	try {
+		const manifestPath = join(projectPath, 'manifest.json')
+		let manifest = await readJSON(manifestPath)
+		let {
+			header: { version, name, description },
+			metadata: { author } = {
+				author: 'Unknown',
+			},
+		} = manifest
 
-			for (let line of lines) {
-				const [key, value] = line.split('=')
-				if (key.trim() === 'pack.description')
-					description = value.trim()
-			}
-		} catch {}
-	}
+		if (description === 'pack.description') description = langDescription
 
-	const appVersion = APP_VERSION.replace('v', '')
-	const generatedWithBridge: string[] | undefined =
-		manifest?.metadata?.generated_with?.bridge
-	if (generatedWithBridge) {
-		if (!generatedWithBridge.includes(appVersion))
-			generatedWithBridge.push(appVersion)
-	} else {
-		manifest = {
-			...(manifest ?? {}),
-			metadata: {
-				...(manifest?.metadata ?? {}),
-				generated_with: {
-					...(manifest?.metadata?.generated_with ?? {}),
-					bridge: [appVersion],
+		const appVersion = APP_VERSION.replace('v', '')
+		const generatedWithBridge: string[] | undefined =
+			manifest?.metadata?.generated_with?.bridge
+		if (generatedWithBridge) {
+			if (!generatedWithBridge.includes(appVersion))
+				generatedWithBridge.push(appVersion)
+		} else {
+			manifest = {
+				...(manifest ?? {}),
+				metadata: {
+					...(manifest?.metadata ?? {}),
+					generated_with: {
+						...(manifest?.metadata?.generated_with ?? {}),
+						bridge: generatedWithBridge ?? [appVersion],
+					},
 				},
-			},
+			}
 		}
-	}
 
-	await writeJSON(manifestPath, manifest, true)
-
-	return {
-		version,
-		name,
-		author,
-		description,
+		await writeJSON(manifestPath, manifest, true)
+		return {
+			version,
+			name,
+			author,
+			description,
+		}
+	} catch {
+		return {
+			version: undefined,
+			name: undefined,
+			author: undefined,
+			description: undefined,
+		}
 	}
 }
 

app/renderer/src/UI/Windows/Project/Create/BP/Main.vue

@@ -40,9 +40,7 @@
 
 			<p class="mt-10">
 				The target Minecraft version should be set to what version you
-				are developing for. Currently
-				<strong>{{ MC_STABLE_VERSION }}</strong> is the stable release.
-				and <strong>{{ MC_BETA_VERSION }}</strong> is the beta release.
+				are developing for.
 			</p>
 			<v-select
 				background-color="background"

app/shared/app_version.ts

@@ -1,4 +1,4 @@
 /**
  * Current bridge. app version
  */
-export default 'v1.8.3'
+export default 'v1.8.4'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "private": true,
   "author": "solvedDev <[email protected]>",
   "description": "A powerful add-on editor",