Merge upstream

.github/workflows/rebuild.yml

@@ -4,12 +4,12 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop
+      - merge-upstream
 
 jobs:
   rebuild:
     concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -19,7 +19,8 @@ jobs:
 
       - name: Rebuild
         run: |
-         sudo apt install python2-minimal
+         sudo apt update
+         sudo apt-get install python2-minimal
          npm install
          npm run translate
 
@@ -44,6 +45,8 @@ jobs:
         run: |
           rm -rf dist/*
           rm -rf media/*
+          git rm -rf .
+          echo '{"name":"scratch-blocks","version":"0.1.0","description":"built scratch-blocks files","license":"GPL-3.0","repository":{},"main":"./dist/vertical.js","browser":"./dist/vertical.js","scripts":{},"dependencies":{},"devDependencies":{}}' > ./package.json
 
       - name: Download built-dist
         uses: actions/download-artifact@v3.0.1

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "develop"
+    ]
+}

blocks_vertical/control.js

@@ -215,6 +215,69 @@ Blockly.Blocks['control_if_else'] = {
   }
 };
 
+
+Blockly.Blocks['control_try_catch'] = {
+  /**
+   * Block for try-catch.
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "type": "control_try_catch",
+      "message0": "try to do",
+      "message1": "%1",
+      "message2": "if a block errors",
+      "message3": "%1",
+      "args1": [
+        {
+          "type": "input_statement",
+          "check": 'normal',
+          "name": "SUBSTACK"
+        }
+      ],
+      "args3": [
+        {
+          "type": "input_statement",
+          "check": 'normal',
+          "name": "SUBSTACK2"
+        }
+      ],
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "shape_statement"]
+    });
+  }
+};
+
+Blockly.Blocks['control_throw_error'] = {
+  init: function () {
+    this.jsonInit({
+      "message0": 'throw error %1',
+      "args0": [
+        {
+          "type": "input_value",
+          "name": "ERROR"
+        }
+      ],
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "shape_end"]
+    });
+  }
+};
+
+Blockly.Blocks['control_error'] = {
+  /**
+   * pm: Block to get a try catch error.
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "message0": "error",
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "output_string"]
+    });
+  }
+};
+
 Blockly.Blocks['control_stop'] = {
   /**
    * Block for stop all scripts.
@@ -445,6 +508,8 @@ Blockly.Blocks['control_for_each'] = {
       "type": "control_for_each",
       "message0": Blockly.Msg.CONTROL_FOREACH,
       "message1": "%1",
+      "message2": "%1",
+      "lastDummyAlign2": "RIGHT",
       "args0": [
         {
           "type": "field_variable",
@@ -462,6 +527,16 @@ Blockly.Blocks['control_for_each'] = {
           "name": "SUBSTACK"
         }
       ],
+      "args2": [
+        {
+          "type": "field_image",
+          "src": Blockly.mainWorkspace.options.pathToMedia + "repeat.svg",
+          "width": 24,
+          "height": 24,
+          "alt": "*",
+          "flip_rtl": true
+        }
+      ],
       "category": Blockly.Categories.control,
       "extensions": ["colours_control", "shape_statement"]
     });
@@ -565,6 +640,20 @@ Blockly.Blocks['control_delete_this_clone'] = {
   }
 };
 
+Blockly.Blocks['control_is_clone'] = {
+  /**
+   * pm: Block to check if a sprite is a clone.
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "message0": "is clone?",
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "output_boolean"]
+    });
+  }
+};
+
 Blockly.Blocks['control_stop_sprite_menu'] = {
   /**
    * pm: Stop-sprite drop-down menu.
@@ -828,7 +917,7 @@ Blockly.Blocks["control_if_return_else_return"] = {
   init: function() {
     this.jsonInit({
       "inputsInline": true,
-      "message0": "if %1 is true %2 is false %3",
+      "message0": "if %1 then %2 else %3",
       "args0": [
         {
           "type": "input_value",
@@ -987,6 +1076,26 @@ Blockly.Blocks['control_exitLoop'] = {
   }
 };
 
+Blockly.Blocks['control_continueLoop'] = {
+  init: function() {
+    this.jsonInit({
+      "message0": 'continue loop %1',
+      "args0": [
+        {
+          "type": "field_image",
+          "src": Blockly.mainWorkspace.options.pathToMedia + "repeat.svg",
+          "width": 24,
+          "height": 24,
+          "alt": "*",
+          "flip_rtl": true
+        }
+      ],
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "shape_end"]
+    });
+  }
+};
+
 Blockly.Blocks['control_javascript_command'] = {
   /**
    * pm: Block to run javascript code.

blocks_vertical/data.js

@@ -301,6 +301,31 @@ Blockly.Blocks['data_deletealloflist'] = {
   }
 };
 
+Blockly.Blocks['data_shiftlist'] = {
+  /**
+   * Block to delete all items from list.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": "shift %1 by %2",
+      "args0": [
+        {
+          "type": "field_variable",
+          "name": "LIST",
+          "variableTypes": [Blockly.LIST_VARIABLE_TYPE]
+        },
+        {
+          "type": "input_value",
+          "name": "INDEX"
+        }
+      ],
+      "category": Blockly.Categories.dataLists,
+      "extensions": ["colours_data_lists", "shape_statement"]
+    });
+  }
+};
+
 Blockly.Blocks['data_insertatlist'] = {
   /**
    * Block to insert item to list.
@@ -577,6 +602,81 @@ Blockly.Blocks['data_listarray'] = {
   }
 };
 
+Blockly.Blocks['data_amountinlist'] = {
+  init: function() {
+    this.jsonInit({
+      "message0": 'amount of %1 in %2',
+      "args0": [
+        {
+          "type": "input_value",
+          "name": "VALUE"
+        },
+        {
+          "type": "field_variable",
+          "name": "LIST",
+          "variableTypes": [Blockly.LIST_VARIABLE_TYPE]
+        }
+      ],
+      "category": Blockly.Categories.dataLists,
+      "extensions": ["colours_data_lists", "output_number"]
+    });
+  }
+};
+
+Blockly.Blocks['data_filterlistitem'] = {
+  init: function() {
+    this.jsonInit({
+      "message0": 'item',
+      "args0": [],
+      "category": Blockly.Categories.dataLists,
+      "extensions": ["colours_data_lists", "output_string"],
+      "canDragDuplicate": true
+    });
+  }
+};
+
+Blockly.Blocks['data_filterlistindex'] = {
+  init: function() {
+    this.jsonInit({
+      "message0": 'index',
+      "args0": [],
+      "category": Blockly.Categories.dataLists,
+      "extensions": ["colours_data_lists", "output_string"],
+      "canDragDuplicate": true
+    });
+  }
+};
+
+Blockly.Blocks['data_filterlist'] = {
+  init: function() {
+    this.jsonInit({
+      "message0": 'filter %1 by %2 %3 %4',
+      "args0": [
+        {
+          "type": "field_variable",
+          "name": "LIST",
+          "variableTypes": [Blockly.LIST_VARIABLE_TYPE]
+        },
+        {
+          "type": "input_value",
+          "name": "INDEX"
+        },
+        {
+          "type": "input_value",
+          "name": "ITEM"
+        },
+        {
+          "type": "input_value",
+          "name": "BOOL",
+          "check": "Boolean"
+        }
+      ],
+      "category": Blockly.Categories.dataLists,
+      "extensions": ["colours_data_lists", "shape_statement"]
+    });
+  }
+};
+
 Blockly.Blocks['data_arraylist'] = {
   init: function() {
     this.jsonInit({

blocks_vertical/default_toolbox.js

@@ -30,6 +30,13 @@ goog.require('Blockly.Blocks');
 
 Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: none">' +
   '<category name="%{BKY_CATEGORY_MOTION}" id="motion" colour="#4C97FF" secondaryColour="#3373CC">' +
+    '<block type="motion_movesteps" id="motion_movesteps">' +
+      '<value name="STEPS">' +
+        '<shadow type="math_number">' +
+          '<field name="NUM">10</field>' +
+        '</shadow>' +
+      '</value>' +
+    '</block>' +
     '<block type="motion_movesteps" id="motion_movesteps">' +
       '<value name="STEPS">' +
         '<shadow type="math_number">' +
@@ -194,6 +201,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
       '</value>' +
     '</block>' +
     '<block type="looks_gotofrontback" id="looks_gotofrontback"></block>' +
+    '<block type="looks_goTargetLayer" id="looks_goTargetLayer"></block>' +
     '<block type="looks_goforwardbackwardlayers" id="looks_goforwardbackwardlayers">' +
       '<value name="NUM">' +
         '<shadow type="math_integer">' +

blocks_vertical/live_tests.js

@@ -254,6 +254,53 @@ Blockly.Blocks['control_fieldcheckboxoriginal'] = {
   }
 };
 
+Blockly.Blocks['control_testcolorfieldoriginal'] = {
+  /**
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "message0": 'color %1',
+      "args0": [
+        {
+          "type": "field_colour",
+          "colour": "#ff0000",
+          "name": "COLOR"
+        }
+      ],
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "shape_statement"]
+    });
+  }
+};
+
+Blockly.Blocks['control_blockduplicatesondrag'] = {
+  /**
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "message0": 'duplicate',
+      "category": Blockly.Categories.control,
+      "canDragDuplicate": true,
+      "extensions": ["colours_control", "shape_statement"]
+    });
+  }
+};
+
+Blockly.Blocks['control_dualblock'] = {
+  /**
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.jsonInit({
+      "message0": 'dual block',
+      "category": Blockly.Categories.control,
+      "extensions": ["colours_control", "shape_statement", "output_string"]
+    });
+  }
+};
+
 Blockly.Blocks['operators_expandablejoininputs'] = {
   /**
    * @this Blockly.Block
@@ -356,4 +403,4 @@ Blockly.Blocks['operators_expandablejoininputs'] = {
       'mutation', null, oldMutation, newMutation));
     Blockly.Events.setGroup(false);
   }
-};
+};