[2.0.0-alpha.2] Merge pull request #10 from bridge-core/dev

data/preset/entity/panda/en_US.lang

@@ -0,0 +1,2 @@
+item.spawn_egg.entity.{{PROJECT_PREFIX}}:{{IDENTIFIER}}.name=Spawn {{IDENTIFIER_NAME}}
+entity.{{PROJECT_PREFIX}}:{{IDENTIFIER}}.name={{IDENTIFIER_NAME}}

data/schema/manifest/main.json

@@ -38,7 +38,14 @@
 					"description": "This is a short description of the pack. It will appear in the game below the name of the pack."
 				},
 				"uuid": {
-					"$ref": "../general/uuid.json",
+					"anyOf": [
+						{
+							"$ref": "../general/uuid.json"
+						},
+						{
+							"type": "string"
+						}
+					],
 					"description": "This is a special type of identifier that uniquely identifies this pack from any other pack."
 				},
 				"version": {
@@ -83,8 +90,14 @@
 							"type": "string"
 						},
 						"uuid": {
-							"type": "string",
-							"$ref": "../general/uuid.json"
+							"anyOf": [
+								{
+									"$ref": "../general/uuid.json"
+								},
+								{
+									"type": "string"
+								}
+							],
 						},
 						"verison": {
 							"$ref": "#/definitions/triple_integer"
@@ -101,8 +114,14 @@
 				"required": ["uuid", "version"],
 				"properties": {
 					"uuid": {
-						"type": "string",
-						"$ref": "../general/uuid.json",
+						"anyOf": [
+							{
+								"$ref": "../general/uuid.json"
+							},
+							{
+								"type": "string"
+							}
+						],
 						"description": "This is the unique identifier of the pack that this pack depends on. It needs to be the exact same UUID that the pack has defined in the header section of it's manifest file."
 					},
 					"version": {

data/version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

src/App.ts

@@ -32,6 +32,7 @@ import { WindowResize } from '@/components/Common/WindowResize'
 import { InstallApp } from '@/components/App/Install'
 import { LanguageManager } from '@/components/Languages/LanguageManager'
 import { ProjectManager } from './components/Projects/ProjectManager'
+import { ContextMenu } from './components/ContextMenu/ContextMenu'
 
 export class App {
 	public static toolbar = new Toolbar()
@@ -57,6 +58,7 @@ export class App {
 	public readonly projectManager = Vue.observable(new ProjectManager(this))
 	public readonly extensionLoader = new ExtensionLoader()
 	public readonly windowResize = new WindowResize()
+	public readonly contextMenu = new ContextMenu()
 
 	protected languageManager = new LanguageManager()
 	protected installApp = new InstallApp()
@@ -124,7 +126,7 @@ export class App {
 					this.themeManager.updateTheme()
 
 					// Set language
-					if (typeof settingsState.general.locale === 'string')
+					if (typeof settingsState?.general?.locale === 'string')
 						selectLanguage(settingsState?.general?.locale)
 					else {
 						// Set language based off of browser language
@@ -153,6 +155,7 @@ export class App {
 		// Try setting up the file system
 		const fileHandle = await setupFileSystem(this.instance)
 		if (!fileHandle) return this.instance.windows.loadingWindow.close()
+
 		this.instance.fileSystem.setup(fileHandle)
 
 		// Load settings

src/App.vue

@@ -20,6 +20,8 @@
 			<WelcomeScreen v-else />
 			<!--  -->
 		</v-main>
+
+		<ContextMenu v-if="contextMenu" :contextMenu="contextMenu" />
 	</v-app>
 </template>
 
@@ -32,21 +34,31 @@ import TabBar from './components/TabSystem/TabBar.vue'
 import { platform } from './utils/os'
 import { TabSystemMixin } from '@/components/Mixins/TabSystem'
 import WelcomeScreen from '@/components/TabSystem/WelcomeScreen'
+import ContextMenu from '@/components/ContextMenu/ContextMenu.vue'
+import { App } from '@/App'
 
 export default Vue.extend({
 	name: 'App',
 	mixins: [TabSystemMixin],
 
+	mounted() {
+		App.getApp().then(app => {
+			this.contextMenu = app.contextMenu
+		})
+	},
+
 	components: {
 		Sidebar,
 		Toolbar,
 		WindowRenderer,
 		TabBar,
 		WelcomeScreen,
+		ContextMenu,
 	},
 
 	data: () => ({
 		isMacOs: platform() === 'darwin',
+		contextMenu: null,
 	}),
 })
 </script>

src/appVersion.json

@@ -1,3 +1,3 @@
 {
-	"version": "2.0.0-alpha.0"
+	"version": "2.0.0-alpha.2"
 }

src/components/Compiler/Compiler.ts

@@ -102,7 +102,12 @@ export class Compiler extends Signal<void> {
 			if (entry.kind !== 'file' || entry.name === '.DS_Store') continue
 
 			const file = await entry.getFile()
-			const config = JSON5.parse(await file.text())
+			let config
+			try {
+				config = JSON5.parse(await file.text())
+			} catch {
+				continue
+			}
 
 			actionManager.create({
 				icon: config.icon,

src/components/ContextMenu/ContextMenu.ts

@@ -0,0 +1,18 @@
+import { ActionManager } from '../Actions/ActionManager'
+
+export class ContextMenu {
+	protected isVisible = false
+	protected actionManager: ActionManager | undefined = undefined
+	protected position = {
+		x: 0,
+		y: 0,
+	}
+
+	show(event: MouseEvent, actionManager: ActionManager) {
+		this.position.x = event.clientX
+		this.position.y = event.clientY
+		this.actionManager = actionManager
+
+		this.isVisible = true
+	}
+}

src/components/ContextMenu/ContextMenu.vue

@@ -0,0 +1,66 @@
+<template>
+	<v-menu
+		v-if="isVisible"
+		v-model="isVisible"
+		:position-x="contextMenu.position.x"
+		:position-y="contextMenu.position.y"
+		rounded="lg"
+		absolute
+		offset-y
+	>
+		<v-list dense>
+			<v-list-item
+				v-for="action in contextMenu.actionManager.state"
+				:key="action.id"
+				origin="center center"
+				transition="scale-transition"
+				@click="action.trigger()"
+			>
+				<v-list-item-icon class="mr-2">
+					<v-icon color="primary">{{ action.icon }}</v-icon>
+				</v-list-item-icon>
+				<v-list-item-action class="ma-0">{{
+					t(action.name)
+				}}</v-list-item-action>
+			</v-list-item>
+		</v-list>
+	</v-menu>
+</template>
+
+<script>
+import { TranslationMixin } from '@/utils/locales'
+export default {
+	name: 'ContextMenu',
+	mixins: [TranslationMixin],
+	props: {
+		contextMenu: Object,
+	},
+	data: () => ({
+		shouldRender: false,
+		timeoutId: 0,
+	}),
+	computed: {
+		isVisible: {
+			set(val) {
+				this.contextMenu.isVisible = val
+			},
+			get() {
+				return this.contextMenu.isVisible
+			},
+		},
+	},
+	watch: {
+		isVisible() {
+			if (!this.isVisible) {
+				this.timeoutId = setTimeout(
+					() => (this.shouldRender = false),
+					500
+				)
+			} else {
+				this.shouldRender = true
+				clearTimeout(this.timeoutId)
+			}
+		},
+	},
+}
+</script>

src/components/ContextMenu/showContextMenu.ts

@@ -0,0 +1,18 @@
+import { App } from '@/App'
+import { IActionConfig } from '../Actions/Action'
+import { ActionManager } from '../Actions/ActionManager'
+
+export async function showContextMenu(
+	event: MouseEvent,
+	actions: IActionConfig[]
+) {
+	event.preventDefault()
+	event.stopImmediatePropagation()
+
+	const app = await App.getApp()
+	const actionManager = new ActionManager(app)
+
+	actions.forEach(action => actionManager.create(action))
+
+	app.contextMenu.show(event, actionManager)
+}

src/components/Data/JSONDefaults.ts

@@ -61,7 +61,12 @@ export namespace JSONDefaults {
 					schema: await entry
 						.getFile()
 						.then(file => file.text())
-						.then(json5.parse),
+						.then(json5.parse)
+						.catch(() => {
+							throw new Error(
+								`Failed to load schema "${currentPath}"`
+							)
+						}),
 				}
 			} else {
 				promises.push(loadStaticSchemas(entry, currentPath))

src/components/Extensions/Extension.ts

@@ -8,7 +8,6 @@ import { App } from '@/App'
 import { loadScripts } from './Scripts/loadScripts'
 import { ExtensionViewer } from '../Windows/ExtensionStore/Extension'
 import { ExtensionStoreWindow } from '../Windows/ExtensionStore/ExtensionStore'
-import json5 from 'json5'
 import { iterateDir } from '@/utils/iterateDir'
 
 export class Extension {

src/components/Extensions/Themes/ThemeManager.ts

@@ -117,7 +117,12 @@ export class ThemeManager extends EventDispatcher<'light' | 'dark'> {
 		disposables?: IDisposable[]
 	) {
 		const file = await fileHandle.getFile()
-		const themeDefinition = json5.parse(await file.text())
+		let themeDefinition
+		try {
+			themeDefinition = json5.parse(await file.text())
+		} catch {
+			throw new Error(`Failed to load theme "${file.name}"`)
+		}
 
 		const disposable = this.addTheme(themeDefinition, isGlobal)
 		if (disposables) disposables.push(disposable)

src/components/FileSystem/FileSystem.ts

@@ -137,7 +137,11 @@ export class FileSystem extends Signal<void> {
 
 	async readJSON(path: string) {
 		const file = await this.readFile(path)
-		return await json5.parse(await file.text())
+		try {
+			return await json5.parse(await file.text())
+		} catch {
+			throw new Error(`Invalid JSON: ${path}`)
+		}
 	}
 	writeJSON(path: string, data: any, beautify = false) {
 		return this.writeFile(

src/components/FileSystem/setup.ts

@@ -11,7 +11,15 @@ export async function setupFileSystem(app: App) {
 		return false
 	}
 
-	let fileHandle = await get<FileSystemDirectoryHandle>('bridgeBaseDir')
+	let fileHandle = await get<FileSystemDirectoryHandle | undefined>(
+		'bridgeBaseDir'
+	)
+
+	try {
+		await fileHandle?.getDirectoryHandle('data')
+	} catch {
+		fileHandle = undefined
+	}
 
 	if (!fileHandle) {
 		await createSelectProjectFolderWindow(async chosenFileHandle => {

src/components/Projects/CreateProject/CreateProject.ts

@@ -91,7 +91,7 @@ export class CreateProjectWindow extends BaseWindow {
 				)
 
 				for (const createFile of this.createFiles) {
-					createFile.create(scopedFs, this.createOptions)
+					await createFile.create(scopedFs, this.createOptions)
 				}
 				for (const pack of this.createOptions.packs) {
 					await this.packs[pack].create(scopedFs, this.createOptions)

src/components/Projects/CreateProject/Files/Manifest.ts

@@ -28,7 +28,12 @@ export class CreateManifest extends CreateFile {
 				header: {
 					name: 'pack.name',
 					description: 'pack.description',
-					min_engine_version: createOptions.targetVersion.split('.'),
+					min_engine_version:
+						this.type === 'data'
+							? createOptions.targetVersion
+									.split('.')
+									.map(str => Number(str))
+							: undefined,
 					uuid: uuid(),
 					version: [1, 0, 0],
 				},