Merge branch 'develop' into 'master'

Develop

See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!42

README.md

@@ -18,12 +18,16 @@ It supports to convert blocks, items, entities, paintings, particles, map icons,
 
 Some conversions of HD texture packs may takes a while
 
-You need a device with corresponding enough memory (like file size and content of the texture pack)
+You need a device with corresponding enough RAM (like the file size and content of the texture pack), because the convert it is not stored in a temporary storage, but in the RAM memory
 
-Shaders or Optifine or 3d textures or mods or datapacks are not supported, only classic Vanilla textures
+Shaders or OptiFine or 3d textures or mods or datapacks are not supported, only classic Vanilla textures
+
+Snapshots versions may are also not supported
 
 Please reopen Minecraft after selecting the converted texture pack, because in the current version it seems to be a bug to reload the texture cache (Otherwise it's possible that you will have a mix between your previous and new texture pack, which can lead to appearance bugs that would not occur)
 
+If it crashed, it doesn't necessarily have to do with the texture pack and this converter can't do much
+
 Some experimental conversions are disabled by default, but can be enabled if you want to try, but please be warned, it contains many bugs and may are not beautiful and may not usable:
 - UI
     - Buttons

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrock",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
@@ -36,6 +36,7 @@
     "mini-css-extract-plugin": "^0.8.0",
     "offline-plugin": "^5.0.7",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "path-browserify": "^1.0.0",
     "sweetalert": "^2.1.2",
     "webpack": "^4.39.2",
     "webpack-cli": "^3.3.7",

src/js/worker.js

@@ -1,9 +1,10 @@
-import ConvertJavaTextureToBedrock, {
+import {
     AbstractLog,
     ArrayInput,
+    ConvertJavaTextureToBedrock,
     FileInputEntry,
     FileOutput
-} from "@ozelot379/convert-minecraft-java-texture-to-bedrock/build/index.web";
+} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
 
 addEventListener("message", async (e) => {
     try {

webpack.config.js

@@ -42,7 +42,17 @@ module.exports = {
     output: {
         filename: "[name].[contenthash].js",
         path: __dirname + "/build",
-        libraryTarget: "umd"
+        libraryTarget: "umd",
+        globalObject: "this" // Fix worker
+    },
+    resolve: {
+        alias: {
+            fs: __dirname + "/src/js/fs_browser_null.js",
+            "fs-extra": __dirname + "/src/js/fs_browser_null.js",
+            "graceful-fs": __dirname + "/src/js/fs_browser_null.js",
+            path: "path-browserify", // Latest version which supports `path.parse`
+            readdirp: __dirname + "/src/js/fs_browser_null.js"
+        }
     },
     plugins: [
         new CleanWebpackPlugin(),