Merge pull request #19 from HiveGamesOSS/1.1.0

1.1.0

.github/workflows/build_platform.yml

@@ -35,7 +35,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Mark Gradle as Executable
         run: chmod +x gradlew
@@ -71,7 +71,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Build with Gradle Wrapper
         run: ./gradlew build -x test
@@ -113,7 +113,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Mark Gradle as Executable
         run: chmod +x gradlew

.github/workflows/build_test_linux.yml

@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Mark Gradle as Executable
         run: chmod +x gradlew

.github/workflows/dependency-submission.yml

@@ -24,4 +24,4 @@ jobs:
           distribution: 'temurin'
 
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+        uses: gradle/actions/dependency-submission@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4.0.1

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Mark Gradle as Executable
         run: chmod +x gradlew
@@ -62,7 +62,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Build with Gradle Wrapper
         run: ./gradlew build -x test
@@ -103,7 +103,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4
 
       - name: Mark Gradle as Executable
         run: chmod +x gradlew
@@ -162,15 +162,15 @@ jobs:
 
       - name: Compress Windows CLI
         run: |
-          cd artifacts && zip -r "chunker-cli-windows-x64.zip" "chunker-cli" && cd ..
+          cd artifacts && zip -r "chunker-cli-windows-x86.zip" "chunker-cli" && cd ..
           rm -rf "artifacts/chunker-cli"
 
       - name: Rename exe files
         run: |
           for file in artifacts/*.exe; do
             base_name="${file#artifacts/Chunker }"
             base_name="${base_name%.exe}"
-            mv "$file" "artifacts/Chunker-${base_name}-windows-x64.exe"
+            mv "$file" "artifacts/Chunker-${base_name}-windows-x86.exe"
           done
 
       - name: Download Mac artifact

README.md

@@ -17,7 +17,7 @@ Supported Formats:
     - 1.18.0 - 1.18.30
     - 1.19.0 - 1.19.80
     - 1.20.0 - 1.20.80
-    - 1.21.0 - 1.21.20
+    - 1.21.0 - 1.21.30
 - Java
     - 1.8.8
     - 1.9.0 - 1.9.3

app/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chunker-electron",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Convert worlds between Java and Bedrock.",
   "private": true,
   "main": "src/index.js",
@@ -14,7 +14,7 @@
   "author": "Hive Games Limited",
   "license": "MIT",
   "devDependencies": {
-    "electron": "31.3.1",
+    "electron": "32.0.1",
     "electron-builder": "24.13.3",
     "git-last-commit": "^1.0.1"
   },
@@ -28,6 +28,11 @@
         "portable"
       ]
     },
+    "linux": {
+      "target": [
+        "AppImage"
+      ]
+    },
     "extraResources": [
       {
         "from": "../../cli/build/libs/packaged",
@@ -49,7 +54,8 @@
   "dependencies": {
     "archiver": "^7.0.1",
     "electron-dl": "^4.0.0",
-    "jszip": "^3.10.1",
-    "electron-log": "^5.1.7"
+    "electron-log": "^5.1.7",
+    "fs-extra": "^11.2.0",
+    "jszip": "^3.10.1"
   }
 }

app/electron/src/preload.js

@@ -1,7 +1,8 @@
-const {contextBridge, ipcRenderer} = require("electron");
+const {contextBridge, ipcRenderer, webUtils} = require("electron");
 const versionInfo = ipcRenderer.sendSync("versionInfo");
 
 contextBridge.exposeInMainWorld("chunker", {
+    getPathForFile: webUtils.getPathForFile,
     version: versionInfo.version,
     gitVersion: versionInfo.git,
     platform: versionInfo.platform,

app/electron/src/session.js

@@ -1,8 +1,7 @@
 import {spawn} from "child_process"
 import {app} from "electron"
 import path from "path"
-import fs from "fs/promises"
-import fsSync from "fs"
+import fs from "fs-extra"
 import jszip from "jszip"
 import {copyRecursive, countFiles, zipRecursive} from "./util.js";
 import {download} from "electron-dl";
@@ -47,12 +46,12 @@ export class Session {
             let cliDirectory = executable ?? path.join(path.dirname(app.getAppPath()), "chunker-cli");
 
             // Use the bin directory if it's present for the executable
-            if (fsSync.existsSync(path.join(cliDirectory, "bin"))) {
+            if (fs.existsSync(path.join(cliDirectory, "bin"))) {
                 cliDirectory = path.join(cliDirectory, "bin");
             }
 
             // Find the executable for this platform
-            let files = fsSync.readdirSync(cliDirectory, {withFileTypes: true})
+            let files = fs.readdirSync(cliDirectory, {withFileTypes: true})
                 .filter(file => file.isFile() && file.name.startsWith("chunker-cli") && !file.name.endsWith(".ico") && !file.name.endsWith("-unshaded.jar"));
 
             // Close if there is no executable (this is a packaging issue)
@@ -119,7 +118,7 @@ export class Session {
 
         // Setup output path
         this._sessionPath = path.join(app.getPath("temp"), "chunker-electron", this._sessionID);
-        fsSync.mkdirSync(this._sessionPath, {recursive: true});
+        fs.mkdirSync(this._sessionPath, {recursive: true});
     }
 
     close(errorCode) {

app/package.json

@@ -17,6 +17,6 @@
   "devDependencies": {
     "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
-    "wait-on": "^7.2.0"
+    "wait-on": "^8.0.0"
   }
 }

app/ui/package.json

@@ -15,7 +15,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "base64-arraybuffer": "^1.0.2",
-    "chroma-js": "^2.6.0",
+    "chroma-js": "^3.0.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1",
     "leaflet": "^1.9.4",
@@ -24,7 +24,7 @@
     "leaflet-mouse-position": "^1.2.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.26.0",
+    "react-router-dom": "^6.26.1",
     "react-scripts": "^5.0.1",
     "react-select": "^5.8.0",
     "react-syntax-highlighter": "^15.5.0",