[v1.7.12] Merge pull request #289 from bridge-core/dev

app/main/communicator.ts

@@ -7,7 +7,7 @@ import {
 	OpenDialogOptions,
 } from 'electron'
 import { dialog } from 'electron'
-import fs from 'fs'
+import { promises as fs } from 'fs'
 import { DefaultDir } from '../shared/DefaultDir'
 import { download } from 'electron-dl'
 import path from 'path'
@@ -37,15 +37,15 @@ ipcMain.handle(
 	}
 )
 
-ipcMain.on('saveAsFileDialog', async (event, { path, content }) => {
+ipcMain.handle('saveAsFileDialog', async (event, { path, content }) => {
 	let { filePath, canceled } = await dialog.showSaveDialog({
 		defaultPath: path.replace(/\//g, '\\'),
 	})
 
-	if (!canceled)
-		fs.writeFile(filePath, content, err => {
-			if (err) throw err
-		})
+	if (canceled) return false
+
+	await fs.writeFile(filePath, content)
+	return true
 })
 
 ipcMain.on('chooseDefaultDirectory', async (event, args) => {

app/renderer/src/AppCycle/startUp.ts

@@ -15,16 +15,21 @@ import { loadDependency } from './fetchDeps'
 
 export default async function startUp() {
 	SETTINGS.setup()
+
+	// Load toolbar
+	setupDefaultMenus()
+
 	// Start listening for online and offline events
 	CONNECTION.startListening()
 
+	createAppUpdateNotification()
+
 	//Setup auto-completions
 	Provider.loadAssets(
 		await loadDependency('auto-completions.js'),
 		await loadDependency('file-definitions.js')
 	)
 
-	setupDefaultMenus()
 	if (process.env.NODE_ENV !== 'development') {
 		let discordMsg = createNotification({
 			icon: 'mdi-discord',
@@ -38,8 +43,6 @@ export default async function startUp() {
 		})
 	}
 
-	createAppUpdateNotification()
-
 	if (process.env.NODE_ENV !== 'development') {
 		let getting_started = createNotification({
 			icon: 'mdi-help-circle-outline',

app/renderer/src/FileSystem.ts

@@ -49,13 +49,13 @@ export default class FileSystem {
 		if (open) this.addAsTab(path, content, 0, content)
 		trigger('bridge:finishedSaving', path, true, false)
 	}
-	static basicSaveAs(
+	static async basicSaveAs(
 		path: string,
 		content: string,
 		update = false,
 		open = true
 	) {
-		ipcRenderer.send('saveAsFileDialog', { path, content })
+		return await ipcRenderer.invoke('saveAsFileDialog', { path, content })
 	}
 
 	static async open(file_path: string, is_immutable = false) {

app/renderer/src/TabSystem.ts

@@ -558,8 +558,9 @@ class TabSystem {
 
 		//Load .no-cache file
 		const shouldBeCached = await useCache(current.file_path)
+		let shouldSetSaved = true
 		if (!shouldBeCached) {
-			FileSystem[fsMethod](
+			await FileSystem[fsMethod](
 				current.file_path,
 				await this.getSaveContent(
 					current,
@@ -570,7 +571,7 @@ class TabSystem {
 			)
 		} else {
 			let comment_char = FileType.getCommentChar(current.file_path)
-			FileSystem[fsMethod](
+			shouldSetSaved = await FileSystem[fsMethod](
 				current.file_path,
 				`${comment_char}bridge-file-version: #${
 					current.file_version
@@ -583,7 +584,7 @@ class TabSystem {
 			)
 		}
 
-		this.setCurrentSaved()
+		if (shouldSetSaved) this.setCurrentSaved()
 		win.close()
 	}
 	saveCurrentAs() {

app/renderer/src/UI/Sidebar/Content/Explorer.vue

@@ -153,7 +153,7 @@ export default {
 			projectIcon: undefined,
 		}
 	},
-	mounted() {
+	created() {
 		this.projectIcon = this.loadProjectIcon()
 		this.$root.$on('refreshExplorer', () =>
 			EventBus.trigger('bridge:refreshExplorer')
@@ -171,7 +171,6 @@ export default {
 	destroyed() {
 		this.$root.$off('refreshExplorer')
 		EventBus.off('bridge:refreshExplorer', this.refresh)
-		EventBus.off('bridge:selectProject', this.selectProject)
 		EventBus.off('bridge:loadedFileDefs', this.onFileDefsLoaded)
 
 		this.disposables.forEach(disposable => disposable.dispose())

app/shared/app_version.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.7.11",
+  "version": "1.7.12",
   "author": "solvedDev <solveddev@gmail.com>",
   "description": "A powerful add-on editor",
   "license": "GNU",

static/file_creator/texture_set.json

@@ -0,0 +1,13 @@
+{
+    "icon": "mdi-texture",
+    "title": "Texture Set",
+    "extension": "json",
+    "path": "textures/blocks/",
+
+    "templates": {
+        "Blank Texture Set": {
+            "format_version": {},
+            "minecraft:texture_set": {}
+        }
+    }
+}

static/highlighter/texture_set.json

@@ -0,0 +1,8 @@
+{
+    "set": {},
+    "define": {
+        "keywords": ["minecraft"],
+        "titles": ["format_version"],
+        "symbols": []
+    }
+}

static/presets/item_beta/item.json

@@ -12,7 +12,9 @@
         "nutrition": 4,
         "saturation_modifier": "low"
       },
-      "minecraft:icon": "{{PROJ_PREFIX}}_{{IDENTIFIER}}",
+      "minecraft:icon": {
+        "texture": "{{PROJ_PREFIX}}_{{IDENTIFIER}}"
+      },
       "minecraft:use_animation": "eat",
       "minecraft:render_offsets": "apple"
     }