Merge branch 'master' into master

TurboWarp · Jul 26, 2023 · 68b5ae6 · 68b5ae6
2 parents 1ec0c96 + 378f3e9
commit 68b5ae6
Show file tree

Hide file tree

Showing 51 changed files with 2,756 additions and 59 deletions.
diff --git a/development/builder.js b/development/builder.js
@@ -105,6 +105,39 @@ class SVGFile extends ImageFile {
   }
 }
 
+class SitemapFile extends DiskFile {
+  constructor (build) {
+    super(null);
+    this.getDiskPath = null;
+    this.build = build;
+  }
+
+  getType () {
+    return '.xml';
+  }
+
+  read () {
+    let xml = '';
+    xml += '<?xml version="1.0" encoding="UTF-8"?>\n';
+    xml += '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n';
+
+    xml += Object.keys(this.build.files)
+      .filter(file => file.endsWith('.html'))
+      .map(file => file.replace('index.html', '').replace('.html', ''))
+      .sort((a, b) => {
+        if (a.length < b.length) return -1;
+        if (a.length > b.length) return 1;
+        return a - b;
+      })
+      .map(path => `https://extensions.turbowarp.org${path}`)
+      .map(absoluteURL => `<url><loc>${absoluteURL}</loc></url>`)
+      .join('\n');
+
+    xml += '</urlset>\n';
+    return xml;
+  }
+}
+
 const IMAGE_FORMATS = new Map();
 IMAGE_FORMATS.set('.png', ImageFile);
 IMAGE_FORMATS.set('.jpg', ImageFile);
@@ -116,7 +149,7 @@ class Build {
   }
 
   getFile (path) {
-    return this.files[path] || this.files[`${path}index.html`] || null;
+    return this.files[path] || this.files[`${path}.html`] || this.files[`${path}index.html`] || null;
   }
 
   export (root) {
@@ -192,6 +225,10 @@ class Builder {
       build.files[oldPath] = build.files[newPath];
     }
 
+    if (this.mode !== 'desktop') {
+      build.files['/sitemap.xml'] = new SitemapFile(build);
+    }
+
     const mostRecentExtensions = extensionFiles
       .sort((a, b) => b.getLastModified() - a.getLastModified())
       .slice(0, 5)

diff --git a/extensions/Alestore/nfcwarp.js b/extensions/Alestore/nfcwarp.js
@@ -0,0 +1,73 @@
+(function(Scratch) {
+  'use strict';
+
+  /* globals NDEFReader */
+
+  const extIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAACN0lEQVR4nK2WzW7TQBDHDRIVHCr6CYV+PUG5hENvlpKdfyxX6q0SanmVqo+AkKqqPAG8CAVE1RJaKYn6cSiiIO70RBnYydi4ttcJjiPtIbsz/59nPZ4Zz9MfEz1nog8MXDHAhYvoGxPtMDAvvrXaHQZeJ2ysxnsGNiL9HgR4lRK6YOB8AOAPNmZJNJaX76lf2m73XyTZwwM2ZoGBswFgLfa8W6q16bBb9zTEDEgjnWei074wgMTemKeOh9nzHO9EQOIcBHNMdNInqheJ67vOOf/pOZxjkAjU67MMdAtAe4mkusyzKQTx6uooAxN6LY+ZqOMAXSYSq/v/oDBclMRoNCblf7P5iInaOaBrm+IKOiwLskKf2Pen9GoeMHCU8THmvoIOyoMGgdXrD6sBRd+MC2bMwvAg+y0RHcewIJjW1J+OsywMF6uIaF9Egc8Ka3MYzqjwfqWgRAStGGazsFKQvZ6b19XS/eO4Hg4F6hXWaO/IJoDs+/6UZGHSZ8iIZlJZ17EVQs5WVsYZ+FgNqCfGTpjvj8WwkqBDcVpbG2Hgdw6sbRNBbBqNSREvBSLqJIrkd5cNR5EBE7YAl4noawKU1xhZV9e2kNRY4ARlGx/RL/b9u+r4sgDE0hSDYK4QpI3vnUOkpineLARBS1Q0EeWD3tqDDYfzpjhubd2OS0/xOtPvLg/0LAp3N+fwi50BtBo8kdGqP+w8M3IR7aRnu3Xb+2+8M6I3cee0Qwqw7ZoJUutKtKJI/gr8AfOqgU5hKhA4AAAAAElFTkSuQmCC';
+  const blocksIcon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMCIgd2lkdGg9IjE2MDAuMDAwMDAwcHQiIGhlaWdodD0iMTYwMC4wMDAwMDBwdCIgdmlld0JveD0iMCAwIDE2MDAuMDAwMDAwIDE2MDAuMDAwMDAwIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KPG1ldGFkYXRhIGZpbGw9IiNmZmZmZmYiPgpDcmVhdGVkIGJ5IHBvdHJhY2UgMS4xNSwgd3JpdHRlbiBieSBQZXRlciBTZWxpbmdlciAyMDAxLTIwMTcKPC9tZXRhZGF0YT4KPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsMTYwMC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiIGZpbGw9IiNmZmZmZmYiIHN0cm9rZT0ibm9uZSI+CjxwYXRoIGQ9Ik0yNjk3IDE1OTg5IGMtNTY1IC01MCAtMTEwOCAtMjY0IC0xNTY3IC02MTkgLTExNCAtODggLTM5MSAtMzYyIC00ODQgLTQ4MCAtMTY0IC0yMDYgLTM0MCAtNTA5IC00MzQgLTc0NSAtODQgLTIxMSAtMTQzIC00MzAgLTE4NCAtNjgwIGwtMjMgLTE0MCAtMyAtNTEwNSBjLTIgLTM3MDkgMCAtNTE0NSA4IC01MjUwIDcwIC05MDUgNTQ5IC0xNzI0IDEzMDQgLTIyMjkgMzU3IC0yMzkgNzc4IC00MDIgMTIwMyAtNDY2IDIwOSAtMzIgNDA0IC0zNiAxNDM4IC0zMyBsMTAzMCAzIC01MCAyOSBjLTQ3MyAyNzIgLTkwMCA5ODAgLTExMzUgMTg4MCAtMTM2IDUyMSAtMjAwIDk1MiAtMjYyIDE3NjYgLTkgMTE2IC0xMyAxNTYzIC0xNSA1NzE5IGwtMyA1NTY0IDU5IC01NCBjMzMgLTMwIDE0NTAgLTE0MzMgMzE1MCAtMzExOSBsMzA5MSAtMzA2NSAwIC05NjAgMCAtOTYwIC0xNjcgMTY2IGMtMjc2IDI3MiAtMzY2MiAzNjM3IC00Mjg4IDQyNjEgbC01ODAgNTc4IC0zIC0zMDI4IGMtMyAtMzA1NiAwIC0zMzg3IDM0IC0zOTU3IDc2IC0xMjg5IDI1NyAtMjI1MSA1NTggLTI5NjggNTggLTEzOCAxOTUgLTQwNCAyNzEgLTUyNyAxNTYgLTI1MSA0MzQgLTU2MCA2NDggLTcxOSAzNTcgLTI2NiA3NzkgLTQ0OSAxMzIwIC01NzEgbDE3NyAtNDEgMjYzMyA0IGMyODk0IDMgMjY2NyAtMiAyOTgzIDYyIDk2MSAxOTQgMTc4NyA4OTMgMjE0OCAxODE2IDg2IDIyMSAxNDAgNDMwIDE4MyA3MDkgMTYgMTA4IDE4IDQxMyAyMSA1MTg1IDIgMzQ1NCAwIDUxMTcgLTggNTIxNyAtMTkgMjc4IC02MSA0OTAgLTE0NCA3NDMgLTM3NCAxMTI2IC0xMzc3IDE5MTQgLTI1NjEgMjAxNSAtNzIgNiAtNTU1IDEwIC0xMjAwIDEwIGwtMTA4MCAwIDU4IC0zMyBjMTAwIC01NiAxNzkgLTExOSAyOTcgLTIzNyA0NjUgLTQ2MyA4MDggLTEyNzMgOTc5IC0yMzEwIDU0IC0zMjkgODkgLTY1NCAxMjMgLTExNDUgOCAtMTI1IDEyIC0xNjI3IDE1IC01NzA0IGw0IC01NTMzIC0zOSAzMyBjLTIyIDE5IC0xMDc0IDEwNjAgLTIzMzggMjMxNCAtMTI2NCAxMjU0IC0yNjY1IDI2NDIgLTMxMTEgMzA4NSBsLTgxMyA4MDUgMCA5NjQgMCA5NjMgMTg1MyAtMTg0MyBjMTAxOCAtMTAxNCAyMTUyIC0yMTQzIDI1MjAgLTI1MDggbDY2NyAtNjY1IDAgMzAyNSBjMCAxNzQ5IC00IDMxNTMgLTEwIDMzMjkgLTU3IDE3OTQgLTI3NCAyOTkyIC02OTUgMzgzOCAtMTUzIDMwOCAtMzExIDUzNiAtNTI1IDc1NiAtMjIxIDIyNyAtNDQxIDM4NiAtNzM1IDUzMSAtMjY2IDEzMSAtNTM2IDIyMyAtODgzIDMwMSBsLTE1NCAzNCAtMjU5NiAtMSBjLTE0MjkgLTEgLTI2MzYgLTUgLTI2ODUgLTEweiIgZmlsbD0iI2ZmZmZmZiIvPgo8L2c+Cjwvc3ZnPg==';
+
+  class NFCWarp {
+    getInfo() {
+      return {
+        id: 'alestorenfc',
+        name: 'NFCWarp',
+        color1: '#FF4646',
+        color2: '#FF0000',
+        color3: '#990033',
+        menuIconURI: extIcon,
+        blockIconURI: blocksIcon,
+        blocks: [
+          {
+            blockType: Scratch.BlockType.LABEL,
+            text: 'Only works in Chrome on Android'
+          },
+          {
+            opcode: 'supported',
+            blockType: Scratch.BlockType.BOOLEAN,
+            text: 'NFC supported?'
+          },
+          {
+            opcode: 'nfcRead',
+            blockType: Scratch.BlockType.REPORTER,
+            text: 'read NFC tag',
+            disableMonitor: true
+          }
+        ]
+      };
+    }
+
+    supported () {
+      return typeof NDEFReader !== 'undefined';
+    }
+
+    nfcRead() {
+      if (!this.supported()) {
+        return 'NFC not supported';
+      }
+      return new Promise((resolve, reject) => {
+        const ndef = new NDEFReader();
+        ndef.scan()
+          .then(() => {
+            ndef.onreadingerror = event => {
+              console.log('Reading error', event);
+              resolve('Tag not supported');
+            };
+            ndef.onreading = evt => {
+              const decoder = new TextDecoder();
+              const record = evt.message.records[0];
+              console.log('Record type: ' + record.recordType);
+              console.log('Record encoding: ' + record.encoding);
+              console.log('Record data: ' + decoder.decode(record.data));
+              resolve(decoder.decode(record.data));
+            };
+          })
+          .catch(error => {
+            console.log('Scan error', error);
+            resolve(`Error: ${error}`);
+          });
+      });
+    }
+  }
+
+  Scratch.extensions.register(new NFCWarp());
+})(Scratch);
diff --git a/extensions/CST1229/zip.js b/extensions/CST1229/zip.js
diff --git a/extensions/DT/cameracontrols.js b/extensions/DT/cameracontrols.js
@@ -19,6 +19,7 @@
 
   vm.runtime.runtimeOptions.fencing = false;
   vm.renderer.offscreenTouching = true;
+  vm.setInterpolation(false);
 
   function updateCamera(x = cameraX, y = cameraY, scale = cameraZoom / 100, rot = -cameraDirection + 90) {
     rot = rot / 180 * Math.PI;
@@ -347,6 +348,7 @@
     setCol(args, util) {
       const rgb = Scratch.Cast.toRgbColorList(args.val);
       Scratch.vm.renderer.setBackgroundColor(rgb[0] / 255, rgb[1] / 255, rgb[2] / 255);
+      cameraBG = args.val;
     }
     getCol() {
       return cameraBG;

diff --git a/extensions/Lily/Cast.js b/extensions/Lily/Cast.js
@@ -0,0 +1,73 @@
+(function (Scratch) {
+  'use strict';
+
+  const Cast = Scratch.Cast;
+
+  class CastUtil {
+    getInfo() {
+      return {
+        id: 'lmsCast',
+        name: 'Cast',
+        blocks: [
+          {
+            opcode: 'toType',
+            blockType: Scratch.BlockType.REPORTER,
+            text: 'cast [INPUT] to [TYPE]',
+            allowDropAnywhere: true,
+            disableMonitor: true,
+            arguments: {
+              INPUT: {
+                type: Scratch.ArgumentType.STRING,
+                defaultValue: 'apple'
+              },
+              TYPE: {
+                type: Scratch.ArgumentType.STRING,
+                menu: 'type'
+              }
+            }
+          },
+          {
+            opcode: 'typeOf',
+            blockType: Scratch.BlockType.REPORTER,
+            text: 'type of [INPUT]',
+            disableMonitor: true,
+            arguments: {
+              INPUT: {
+                type: Scratch.ArgumentType.STRING,
+                defaultValue: 'apple'
+              }
+            }
+          }
+        ],
+        menus: {
+          type: {
+            acceptReporters: true,
+            items: ['number', 'string', 'boolean', 'default']
+          }
+        }
+      };
+    }
+
+    toType(args) {
+      const input = args.INPUT;
+      switch (args.TYPE) {
+        case ('number'): return Cast.toNumber(input);
+        case ('string'): return Cast.toString(input);
+        case ('boolean'): return Cast.toBoolean(input);
+        default: return input;
+      }
+    }
+
+    typeOf(args) {
+      const input = args.INPUT;
+      switch (typeof input) {
+        case ('number'): return 'number';
+        case ('string'): return 'string';
+        case ('boolean'): return 'boolean';
+        default: return '';
+      }
+    }
+  }
+
+  Scratch.extensions.register(new CastUtil());
+})(Scratch);
diff --git a/extensions/Lily/TempVariables2.js b/extensions/Lily/TempVariables2.js
@@ -14,7 +14,6 @@
   });
 
   function resetRuntimeVariables() {
-    console.log('runtime variables cleared');
     runtimeVariables = Object.create(null);
   }