[v1.7.10] Merge pull request #285 from bridge-core/dev

app/renderer/main.js

@@ -52,4 +52,4 @@ export default new Vue({
 	vuetify,
 	store,
 	template: '<App/>',
-}).$mount('#app')
+}).$mount('#app')

app/renderer/src/TabSystem.ts

@@ -455,7 +455,10 @@ class TabSystem {
 		}
 	}
 	setCurrentUnsaved() {
-		if (!this.getSelected().is_unsaved) {
+		if (
+			!this.getSelected().is_unsaved &&
+			!this.getSelected().is_immutable
+		) {
 			this.getSelected().is_unsaved = true
 			EventBus.trigger('updateSelectedTabUI')
 		}

app/renderer/src/UI/ContextMenu/File.ts

@@ -29,7 +29,7 @@ export const FILE_CONTEXT_MENU = async (
 		icon: 'mdi-arrow-split-vertical',
 		action: () => {
 			TabSystem.split_screen_active = true
-			FileSystem.open(file_path)
+			FileSystem.open(file_path, isImmutable)
 		},
 	}
 
@@ -132,8 +132,12 @@ export const FILE_CONTEXT_MENU = async (
 	 * QUICK ACTION TO TOGGLE CLIENT SCRIPTS
 	 */
 	if (fileName === 'manifest.json') {
-		if (Manifest.getPackFolder(file_path) === 'development_behavior_packs') {
-			let manifest: Manifest = await readJSON(file_path).catch(console.error)
+		if (
+			Manifest.getPackFolder(file_path) === 'development_behavior_packs'
+		) {
+			let manifest: Manifest = await readJSON(file_path).catch(
+				console.error
+			)
 			if (Manifest.hasClientData(manifest)) {
 				DEFAULT_MENU.push({
 					title: 'Remove Client Scripts',

app/renderer/src/UI/Editor/JsonEditor/Main.vue

@@ -6,8 +6,17 @@
 			<span v-if="render_object.children.length > 0">
 				<draggable
 					v-model="render_object.children"
-					v-bind="{ group: 'key', disabled: disabled_dragging }"
+					v-bind="{
+						group: {
+							name: 'key',
+							pull: this.is_immutable ? 'clone' : undefined,
+							put: !this.is_immutable,
+						},
+						sort: !this.is_immutable,
+						disabled: disabled_dragging,
+					}"
 					@change="draggedKey"
+					:clone="cloneDragged"
 				>
 					<details
 						v-for="e in render_object.children"
@@ -229,10 +238,7 @@ export default {
 			return this.render_object.data
 		},
 		disabled_dragging() {
-			return (
-				this.$store.state.Settings.disable_node_dragging ||
-				this.is_immutable
-			)
+			return this.$store.state.Settings.disable_node_dragging
 		},
 	},
 	methods: {
@@ -321,7 +327,13 @@ export default {
 			}, 5)
 		},
 		draggedKey(data) {
-			TabSystem.setCurrentUnsaved()
+			if (!this.is_active)
+				this.$nextTick(() => {
+					TabSystem.split_screen_active = !TabSystem.split_screen_active
+					TabSystem.setCurrentUnsaved()
+					TabSystem.split_screen_active = !TabSystem.split_screen_active
+				})
+			else TabSystem.setCurrentUnsaved()
 
 			if ('removed' in data) {
 				TabSystem.getHistory().add(
@@ -340,6 +352,9 @@ export default {
 				)
 			}
 		},
+		cloneDragged(jsontree) {
+			return jsontree.deepClone()
+		},
 
 		isKnownFileType() {
 			return FileType.get() !== 'unknown'

app/renderer/src/UI/Windows/Renderer/WindowContent.vue

@@ -269,6 +269,7 @@
 		hide-no-data
 		style="max-width: 99%;"
 		dense
+		:disabled="content.is_disabled"
 		:menu-props="{ maxHeight: 162 }"
 		:label="content.text"
 		:items="content.options"

app/renderer/src/autoCompletions/TextProvider.ts

@@ -15,7 +15,10 @@ export default class TextProvider {
 				'TextProvider needs either a filePath or a startState'
 			)
 
-		let path = FileType.transformTextSeparators(line, filePath).split(/\s+/)
+		let path = FileType.transformTextSeparators(
+			line.replace(/\//g, ''),
+			filePath
+		).split(/\s+/)
 		path.pop()
 		let strPath = path.join('/')
 

app/renderer/src/editor/Themes/ThemeManager.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import EventBus from '../../EventBus'
 import ProjectConfig from '../../Project/Config'
 import Store from '../../../store/index'
-import fs from 'fs'
+import fs, { readFileSync } from 'fs'
 import deepmerge from 'deepmerge'
 import { defineMonacoTheme } from './Monaco'
 import { createErrorNotification } from '../../AppCycle/Errors'
@@ -51,6 +51,14 @@ function getDefaultThemes() {
 		const { id, ...theme } = readJSONSync(
 			path.join(__static, `themes/${f}`)
 		)
+		if (theme?.options?.css) {
+			ThemeManager.css.set(
+				theme?.options?.css,
+				readFileSync(
+					path.join(__static, `styles/${theme?.options?.css}`)
+				).toString('utf-8')
+			)
+		}
 		res[id] = theme
 	})
 
@@ -90,10 +98,11 @@ export default class ThemeManager {
 	static get local_theme_names() {
 		let theme_names = []
 		for (let id in this.themes) {
-			theme_names.push({
-				text: this.themes[id]?.name ?? 'Unknown',
-				value: id,
-			})
+			if (!this.themes[id].isHidden)
+				theme_names.push({
+					text: this.themes[id]?.name ?? 'Unknown',
+					value: id,
+				})
 		}
 		for (let id in this.plugin_themes) {
 			theme_names.push({
@@ -112,10 +121,11 @@ export default class ThemeManager {
 	static get global_theme_names() {
 		let theme_names = []
 		for (let id in this.themes) {
-			theme_names.push({
-				text: this.themes[id]?.name ?? 'Unknown',
-				value: id,
-			})
+			if (!this.themes[id].isHidden)
+				theme_names.push({
+					text: this.themes[id]?.name ?? 'Unknown',
+					value: id,
+				})
 		}
 		for (let id in this.plugin_themes_global) {
 			theme_names.push({
@@ -155,6 +165,19 @@ export default class ThemeManager {
 		}
 	}
 
+	private static isHalloween() {
+		const today = new Date(Date.now())
+		const halloween = new Date(today.getUTCFullYear(), 9, 31)
+
+		return (
+			halloween.getMonth() === today.getMonth() &&
+			halloween.getDate() === today.getDate()
+		)
+	}
+	static lockThemeSettings() {
+		return this.isHalloween()
+	}
+
 	static applyTheme(id = 'bridge.default.theme') {
 		this.current_theme = id
 		const theme =
@@ -205,6 +228,11 @@ export default class ThemeManager {
 		this.global_theme = this.global_theme
 			? this.global_theme
 			: Store.state.Settings.global_theme
+
+		//Halloween easter egg
+		if (this.isHalloween())
+			return this.applyTheme('bridge.easterEgg.halloween')
+
 		try {
 			// Regardless of what theme is chosen, save what the local theme is for the settings menu to reference
 			this.local_theme = await ProjectConfig.theme

app/renderer/src/plugins/PluginLoader.ts

@@ -234,15 +234,17 @@ export default class PluginLoader {
 							disposables
 						)
 					),
+					this.loadThemeCSS(pluginPath, disposables).then(() =>
+						this.loadThemes(pluginPath, disposables)
+					),
 					this.loadSnippets(pluginPath, disposables),
-					this.loadThemes(pluginPath, disposables),
 					this.loadComponents(
 						path.join(pluginPath, 'components'),
 						disposables
 					),
 					this.loadAutoCompletions(pluginPath, disposables),
 					this.loadFileDefs(pluginPath, disposables),
-					this.loadThemeCSS(pluginPath, disposables),
+
 					loadCustomCommands(
 						path.join(pluginPath, 'commands'),
 						disposables

app/renderer/src/plugins/scripts/modules/toolbar.ts

@@ -0,0 +1,15 @@
+import { createAppMenu, IAppMenuElement } from '../../../UI/Toolbar/create'
+import { IModuleConfig } from '../types'
+
+export const ToolbarModule = ({ disposables }: IModuleConfig) => ({
+	createCategory(config: {
+		displayName: string
+		displayIcon?: string
+		onClick?: () => void
+		elements?: IAppMenuElement[]
+	}) {
+		const toolbar = createAppMenu(config)
+		disposables.push(toolbar)
+		return toolbar
+	},
+})

app/renderer/src/plugins/scripts/require.ts

@@ -12,6 +12,7 @@ import { PathModule } from './modules/path'
 import { FetchDefinitionModule } from './modules/fetchDefinition'
 import { WindowModule } from './modules/windows'
 import { GlobalsModule } from './modules/globals'
+import { ToolbarModule } from './modules/toolbar'
 
 const BuiltInModules = new Map<string, (config: IModuleConfig) => unknown>([
 	['@bridge/ui', UIModule],
@@ -25,6 +26,7 @@ const BuiltInModules = new Map<string, (config: IModuleConfig) => unknown>([
 	['@bridge/file-importer', ImportFileModule],
 	['@bridge/fetch-definition', FetchDefinitionModule],
 	['@bridge/windows', WindowModule],
+	['@bridge/toolbar', ToolbarModule],
 ])
 //For usage inside of custom commands, components etc.
 const LimitedModules = new Map<string, (config: IModuleConfig) => unknown>([

app/renderer/windows/CreateFile.js

@@ -222,18 +222,18 @@ export default class CreateFileWindow extends ContentWindow {
 			FILE_DATA = FileType.getFileCreators()
 				.filter(({ is_hidden }) => !is_hidden)
 				.sort(({ title: t1 }, { title: t2 }) => t1.localeCompare(t2))
+		FILE_DATA = FILE_DATA.filter(
+			({ target_version }) =>
+				target_version === undefined || compileCondition(target_version)
+		)
 
 		super({
 			display_name: 'New File',
 			options: {
 				is_visible: false,
 				is_persistent: false,
 			},
-			sidebar: FILE_DATA.filter(
-				({ target_version }) =>
-					target_version === undefined ||
-					compileCondition(target_version)
-			).map(({ icon, title, rp_definition }, index) => {
+			sidebar: FILE_DATA.map(({ icon, title, rp_definition }, index) => {
 				return {
 					icon,
 					title,

app/renderer/windows/Settings.ts

@@ -449,6 +449,7 @@ export default class SettingsWindow extends TabWindow {
 					key: uuid(),
 					type: 'autocomplete',
 					is_box: true,
+					is_disabled: ThemeManager.lockThemeSettings(),
 					color: 'primary',
 					text: 'None',
 					input: ThemeManager.local_theme,
@@ -469,6 +470,7 @@ export default class SettingsWindow extends TabWindow {
 					key: `settings.editor.tab.appearance.global_theme`,
 					type: 'autocomplete',
 					is_box: true,
+					is_disabled: ThemeManager.lockThemeSettings(),
 					color: 'primary',
 					text: 'Choose a global theme...',
 					input: this.data.global_theme,

app/shared/app_version.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "author": "solvedDev <[email protected]>",
   "description": "A powerful add-on editor",
   "license": "GNU",

static/highlighter/block.json

@@ -3,6 +3,6 @@
     "define": {
         "keywords": ["minecraft", "description", "components", "bridge", "permutations", "events"],
         "titles": ["format_version"],
-        "symbols": ["properties"]
+        "symbols": ["properties", "sequence", "randomize"]
     }
 }

static/highlighter/fog.json

@@ -1,7 +1,7 @@
 {
     "set": {},
     "define": {
-        "keywords": ["minecraft", "description", "distance"],
+        "keywords": ["minecraft", "description", "distance", "volumetric"],
         "titles": ["format_version"],
         "symbols": []
     }

static/highlighter/item.json

@@ -3,6 +3,6 @@
     "define": {
         "keywords": ["minecraft", "description", "components", "bridge", "events"],
         "titles": ["format_version"],
-        "symbols": []
+        "symbols": ["sequence", "randomize"]
     }
 }

static/styles/halloween.css

@@ -0,0 +1,14 @@
+.v-system-bar > img {
+	filter: hue-rotate(160deg) saturate(1.6);
+}
+
+.file-displayer
+	.v-icon:not(.mdi-folder):not(.mdi-folder-open):not(.mdi-folder-lock) {
+	color: var(--v-primary-base);
+}
+
+.file-displayer .v-icon.mdi-folder,
+.v-icon.mdi-folder-open,
+.v-icon.mdi-folder-lock {
+	color: var(--v-success-lighten1);
+}