From 5ff5bfc7ff19c41396bc8b237b5feb3d2e61bcc0 Mon Sep 17 00:00:00 2001
From: sussy layers dev <jwklong@gmx.com>
Date: Tue, 20 Feb 2024 19:10:39 +0000
Subject: [PATCH] probably final legacy update

---
 src/lib/Toolbox/Toolbox.xml     | 13 +++++++++++--
 src/resources/blocks/debug.js   |  2 +-
 src/resources/blocks/json.js    | 24 ++++++++++++++++++++++++
 src/resources/compiler/index.js |  5 +++++
 src/resources/renderer/index.js |  6 ++++--
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/lib/Toolbox/Toolbox.xml b/src/lib/Toolbox/Toolbox.xml
index 60113a8..fb25231 100644
--- a/src/lib/Toolbox/Toolbox.xml
+++ b/src/lib/Toolbox/Toolbox.xml
@@ -97,6 +97,7 @@
         <block type="json_arraylength" />
         <sep gap="64"></sep>
         <block type="json_objectset" />
+        <block type="json_objectmerge" />
         <sep gap="48"></sep>
         <block type="json_objectget" />
         <block type="json_objectkeys" />
@@ -111,8 +112,16 @@
         <block type="blocks_return" />
     </category>
     <category name="Functions" colour="#5531D6">
-        <block type="functions_create" />
-        <block type="functions_inline" />
+        <block type="functions_create">
+            <statement name="FUNC">
+                <block type="functions_return" />
+            </statement>
+        </block>
+        <block type="functions_inline">
+            <statement name="FUNC">
+                <block type="functions_return" />
+            </statement>
+        </block>
         <sep gap="48"></sep>
         <block type="functions_return" />
         <sep gap="48"></sep>
diff --git a/src/resources/blocks/debug.js b/src/resources/blocks/debug.js
index 45c27f9..15480fe 100644
--- a/src/resources/blocks/debug.js
+++ b/src/resources/blocks/debug.js
@@ -116,7 +116,7 @@ function register() {
         colour: categoryColor
     }, (block) => {
         const COMMENT = block.getFieldValue('COMMENT')
-        const code = `// ${Comment}`;
+        const code = `// ${COMMENT}`;
         return `${code}\n`;
     })
 
diff --git a/src/resources/blocks/json.js b/src/resources/blocks/json.js
index f47de69..98fee64 100644
--- a/src/resources/blocks/json.js
+++ b/src/resources/blocks/json.js
@@ -265,6 +265,30 @@ function register() {
         const X = javascriptGenerator.valueToCode(block, 'X', javascriptGenerator.ORDER_ATOMIC);
         return [`Object.values(${X})`, javascriptGenerator.ORDER_ATOMIC];
     })
+
+    // merge
+    registerBlock(`${categoryPrefix}objectmerge`, {
+        message0: 'merge object %1 with %2',
+        args0: [
+            {
+                "type": "input_value",
+                "name": "X",
+                "check": "JSONObject"
+            },
+            {
+                "type": "input_value",
+                "name": "Y",
+                "check": "JSONObject"
+            },
+        ],
+        output: "JSONObject",
+        inputsInline: true,
+        colour: categoryColor
+    }, (block) => {
+        const X = javascriptGenerator.valueToCode(block, 'X', javascriptGenerator.ORDER_ATOMIC);
+        const Y = javascriptGenerator.valueToCode(block, 'Y', javascriptGenerator.ORDER_ATOMIC);
+        return [`{...${X}, ...${Y}}`, javascriptGenerator.ORDER_ATOMIC];
+    })
 }
 
 export default register;
diff --git a/src/resources/compiler/index.js b/src/resources/compiler/index.js
index 14b1d9b..b787f6e 100644
--- a/src/resources/compiler/index.js
+++ b/src/resources/compiler/index.js
@@ -1,6 +1,11 @@
 import javascriptGenerator from '../javascriptGenerator';
 
 const start = `
+if (!Scratch.unsandboxed) {
+  alert("This extension needs to be unsandboxed to run!")
+  return
+}
+
 function doSound(ab, cd, runtime) {
 const audioEngine = runtime.audioEngine;
 
diff --git a/src/resources/renderer/index.js b/src/resources/renderer/index.js
index d3b3d26..cd58a76 100644
--- a/src/resources/renderer/index.js
+++ b/src/resources/renderer/index.js
@@ -146,6 +146,8 @@ class CustomConstantProvider extends Blockly.zelos.ConstantProvider {
             );
         }
 
+        var this2 = this
+
         return {
             type: this.SHAPES.HEXAGONAL,
             isDynamic: true,
@@ -169,10 +171,10 @@ class CustomConstantProvider extends Blockly.zelos.ConstantProvider {
                 return makeMainPath(height, true, false);
             },
             pathRightDown(height) {
-                return makeMainPath(height, false, true);
+                return this2.ROUNDED.pathRightDown(height)
             },
             pathRightUp(height) {
-                return makeMainPath(height, false, true);
+                return this2.ROUNDED.pathRightUp(height)
             },
         };
     }