From f7cd8ef749b3f556ed2ee3100c919450dfaef31c Mon Sep 17 00:00:00 2001 From: solvedDev <33347616+solvedDev@users.noreply.github.com> Date: Tue, 13 Dec 2022 22:55:52 +0100 Subject: [PATCH] v1.8.5 - fix: don't fallback to run_command --- app/renderer/src/bridgeCore/EntityHandler.ts | 46 ++++++++++---------- app/shared/app_version.ts | 2 +- package.json | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/renderer/src/bridgeCore/EntityHandler.ts b/app/renderer/src/bridgeCore/EntityHandler.ts index eca4a256e..39b305a1e 100644 --- a/app/renderer/src/bridgeCore/EntityHandler.ts +++ b/app/renderer/src/bridgeCore/EntityHandler.ts @@ -93,7 +93,8 @@ async function transformEvent( let { commands: e_c } = use(event, 'execute') || {} if (typeof e_c === 'string') e_c = [e_c] if (e_c !== undefined && Array.isArray(e_c)) { - if (compare(formatVersion, '1.16.100', '<')) { + // Disabled because run_command is still experimental + // if (compare(formatVersion, '1.16.100', '<')) { let e_c_group = `execute_command_id_${++COM_ID_COUNTER}` if (!COMMAND_ANIM_REGISTERED) { @@ -147,27 +148,28 @@ async function transformEvent( }, } ) - } else { - if (event?.run_command?.command === undefined) - event.run_command = { - ...(event.run_command ?? {}), - command: await transformRunCommands( - file_uuid, - e_c.map(c => (c[0] === '/' ? c.slice(1) : c)) - ), - } - else { - if (typeof event.run_command.command === 'string') - event.run_command.command = [event.run_command.command] - if (Array.isArray(event.run_command.command)) - event.run_command.command.push( - ...(await transformRunCommands( - file_uuid, - e_c.map(c => (c[0] === '/' ? c.slice(1) : c)) - )) - ) - } - } + + // } else { + // if (event?.run_command?.command === undefined) + // event.run_command = { + // ...(event.run_command ?? {}), + // command: await transformRunCommands( + // file_uuid, + // e_c.map(c => (c[0] === '/' ? c.slice(1) : c)) + // ), + // } + // else { + // if (typeof event.run_command.command === 'string') + // event.run_command.command = [event.run_command.command] + // if (Array.isArray(event.run_command.command)) + // event.run_command.command.push( + // ...(await transformRunCommands( + // file_uuid, + // e_c.map(c => (c[0] === '/' ? c.slice(1) : c)) + // )) + // ) + // } + // } } else if (e_c !== undefined) { createErrorNotification( new Error( diff --git a/app/shared/app_version.ts b/app/shared/app_version.ts index 40b86fd8a..0a7676680 100644 --- a/app/shared/app_version.ts +++ b/app/shared/app_version.ts @@ -1,4 +1,4 @@ /** * Current bridge. app version */ -export default 'v1.8.4' +export default 'v1.8.5' diff --git a/package.json b/package.json index 08aeddd8a..34346e1e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridge", - "version": "1.8.4", + "version": "1.8.5", "private": true, "author": "solvedDev ", "description": "A powerful add-on editor",