update 1.5

damp11113 · damp11113 · commit cdfaf53a5ca4 · 2024-09-12T21:40:45.000+07:00
add dependencies
diff --git a/blocks/Advanced_Peripherals/index.json b/blocks/Advanced_Peripherals/index.json
@@ -9,7 +9,9 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [
+        "CCPeripheral"
+    ],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCColors/index.json b/blocks/CCColors/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": false,
         "adv": true, 
diff --git a/blocks/CCDisk/index.json b/blocks/CCDisk/index.json
@@ -9,7 +9,7 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true,
diff --git a/blocks/CCKeys/index.json b/blocks/CCKeys/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCPeripheral/index.json b/blocks/CCPeripheral/index.json
@@ -9,7 +9,7 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCPeripheral_generic_energy_storage/index.json b/blocks/CCPeripheral_generic_energy_storage/index.json
@@ -9,7 +9,9 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [
+        "CCPeripheral"
+    ],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCPeripheral_generic_fluid_storage/index.json b/blocks/CCPeripheral_generic_fluid_storage/index.json
@@ -9,7 +9,9 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [
+        "CCPeripheral"
+    ],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCPeripheral_generic_inventory/index.json b/blocks/CCPeripheral_generic_inventory/index.json
@@ -9,7 +9,9 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [
+        "CCPeripheral"
+    ],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCRednet/index.json b/blocks/CCRednet/index.json
@@ -9,7 +9,7 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCRedstone/index.json b/blocks/CCRedstone/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCSettings/index.json b/blocks/CCSettings/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCSystem/index.json b/blocks/CCSystem/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCTextutils/index.json b/blocks/CCTextutils/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/CCTurtle/index.json b/blocks/CCTurtle/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": false,
         "adv": false, 
diff --git a/blocks/Create_Additions/index.json b/blocks/Create_Additions/index.json
@@ -9,7 +9,9 @@
     "peripherals": true,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [
+        "CCPeripheral"
+    ],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/NativeIO/index.json b/blocks/NativeIO/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": true,
         "adv": true, 
diff --git a/blocks/_Template/index.json b/blocks/_Template/index.json
@@ -9,7 +9,7 @@
     "peripherals": false,
     "library": false,
     "require_network": false,
-    "dependencies": {},
+    "dependencies": [],
     "design_for_computer": {
         "basic": false,
         "adv": false, 
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "ccide",
-  "version": "1.4",
+  "version": "1.5",
   "description": "ComputerCraft mod virtual lua IDE",
   "main": "index.js",
   "scripts": {
-    "dev": "electron .",
-    "build": "electron-packager . ccIDE --platform=win32 --arch=x64 --icon=assets/ccIDEIcon.ico --out=dist --overwrite && for /d %i in (dist\\ccIDE-*) do copy package.json %i\\",
-    "build_debug": "electron-packager . ccIDE --platform=win32 --arch=x64 --icon=assets/ccIDEIcon.ico --out=dist_debug --overwrite --debug && for /d %i in (dist_debug\\ccIDE-*) do copy package.json %i\\"
+    "dev": "title ccIDE && electron .",
+    "build": "title building ccIDE && electron-packager . ccIDE --platform=win32 --arch=x64 --icon=assets/ccIDEIcon.ico --out=dist --overwrite && for /d %i in (dist\\ccIDE-*) do copy package.json %i\\",
+    "build_debug": "title building ccIDE (Debug) && electron-packager . ccIDE --platform=win32 --arch=x64 --icon=assets/ccIDEIcon.ico --out=dist_debug --overwrite --debug && for /d %i in (dist_debug\\ccIDE-*) do copy package.json %i\\"
   },
   "author": "DPSoftware Foundation",
   "license": "GPL-3.0-or-later",
diff --git a/run.bat b/run.bat
@@ -1,3 +1,5 @@
 @echo off
 title Starting ccIDE
+start "" cmd /c "npm cache clean --force"
+timeout 2
 npm run dev
diff --git a/src/blocksmanager.js b/src/blocksmanager.js
@@ -41,23 +41,26 @@ function mergeXml(xml1, xml2) {
     return mergedXml;
 }
 
-function loadperipheral(workspace, currenttoolbar, peripherals) {
-    console.log(`Importing ${peripherals} blocks`)
-
-    const filePath = path.join(peripheralsfolder, peripherals);
-    const jsonfilePath = path.join(filePath, "block_design.json");
-    const xmlfilePath = path.join(filePath, "toolbox.xml");
-    const generatorfilePath = path.join(filePath, "generator.js"); // Path to generator.js
-
-    // Load generator.js
-    // Load blocks from block_design.json
-    fs.readFile(jsonfilePath, 'utf-8', (err, data) => {
-        if (err) {
-            console.error('Error loading JSON file:', err);
-            return;
-        }
+function loadperipheral(workspace, currenttoolbar, peripherals, usedlibinproject) {
+    if (!usedlibinproject.includes(peripherals)) {
         try {
-            const blocksJson = JSON.parse(data);
+            console.log(`Importing ${peripherals} blocks`);
+
+            const filePath = path.join(peripheralsfolder, peripherals);
+            const jsonfilePath = path.join(filePath, "block_design.json");
+            const xmlfilePath = path.join(filePath, "toolbox.xml");
+            const generatorfilePath = path.join(filePath, "generator.js");
+            const indexfilePath = path.join(filePath, "index.json");
+
+            // Synchronously read and parse the index.json file
+            const indexcontent = JSON.parse(fs.readFileSync(indexfilePath, 'utf8'));
+            const dependencies = indexcontent.dependencies;
+            dependencies.forEach((dependency) => {
+                currenttoolbar = loadperipheral(workspace, currenttoolbar, dependency, usedlibinproject);
+            });
+
+            // Synchronously load and parse block_design.json
+            const blocksJson = JSON.parse(fs.readFileSync(jsonfilePath, 'utf8'));
             for (const blockId in blocksJson) {
                 if (blocksJson.hasOwnProperty(blockId)) {
                     Blockly.Blocks[blockId] = {
@@ -67,25 +70,28 @@ function loadperipheral(workspace, currenttoolbar, peripherals) {
                     };
                 }
             }
-        } catch (e) {
-            document.getElementById('statusMessage').textContent = 'Error parsing JSON file: ' + e;
-            return;
-        }
-    });
 
-    // Load and merge new toolbox XML
-    const toolbar = fs.readFileSync(xmlfilePath, 'utf8');
-    const newxml = mergeXml(currenttoolbar, toolbar);
-    
-    workspace.updateToolbox(newxml);
+            // Synchronously load and merge new toolbox XML
+            const toolbar = fs.readFileSync(xmlfilePath, 'utf8');
+            const newxml = mergeXml(currenttoolbar, toolbar);
+            workspace.updateToolbox(newxml);
 
-    document.getElementById('statusMessage').textContent = `Loaded ${peripherals}`;
+            document.getElementById('statusMessage').textContent = `Loaded ${peripherals}`;
 
-    require(generatorfilePath); // This will execute generator.js if it's a Node.js module
+            // Synchronously require generator.js
+            require(generatorfilePath); // This will execute generator.js if it's a Node.js module
 
-    console.log(`Loaded ${peripherals} blocks`)
+            console.log(`Loaded ${peripherals} blocks`);
+            usedlibinproject.push(peripherals);
 
-    return newxml;
+            return newxml;
+        } catch (e) {
+            document.getElementById('statusMessage').textContent = `Can't Import ${peripherals}: ${e}`;
+            ipc.send("error", `Can't Import ${peripherals}: ${e}`);
+        }
+    } else {
+        return currenttoolbar;
+    }
 }
 
 function extractFolderName(path) {
diff --git a/src/index.js b/src/index.js
@@ -185,18 +185,11 @@ document.getElementById("packageman-import-btn").addEventListener('click', () =>
     const selectedItems = document.querySelectorAll('.library-item.selected');
     selectedItems.forEach(item => {
         const packagefolder = item.getAttribute('data-libraryfolder');
-        if (!usedlibinproject.includes(packagefolder)) {
-            try {
-                originaltoolbar = loadperipheral(workspace, originaltoolbar, packagefolder);
-                usedlibinproject.push(packagefolder);
-            } catch (e) {
-                document.getElementById('statusMessage').textContent = `Can't Import ${packagefolder}: ${e}`;
-            }
-        }
-        setTimeout(() => {
-            document.getElementById('statusMessage').textContent = `Ready`;
-        }, 1000);
+        originaltoolbar = loadperipheral(workspace, originaltoolbar, packagefolder, usedlibinproject);
     });
+    setTimeout(() => {
+        document.getElementById('statusMessage').textContent = `Ready`;
+    }, 1000);
 });
 
 // Ensure Blockly container is shown after the workspace is injected
