Merge branch 'develop' into 'master'

Develop

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

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.0.2]
+- Fix `pack_format` `6`
+- Remove convert piglin
+- Fix banner pattern black
+- Fix banner pattern preview max size
+- Fix banner illager pattern
+- Warn for partially missing sprite images (For instance banner pattern, painting and particle), because may they will be transparent in the result
+
 ## [3.6.1]
 - Fix root folder in sub folder in some wrong texture packs
 

README.md

@@ -11,23 +11,22 @@ It supports the follow Minecraft versions:
 | Minecraft | Version |
 |-----------|---------|
 | Java | v1.13.x, v1.14.x, v1.15.x or v1.16.x |
-| Bedrock | v1.16.x |
+| Bedrock | >= v1.16.20 |
 
 This project is inspired by the no longer continued [PCTexture2PE](https://github.com/rodrigojxd/PCTexture2PE)
 
 It supports to convert blocks, items, entities, paintings, particles, map icons, mob effects and hotbar
 
-Some conversions of HD texture packs may takes a while
+Please note:
 
-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 or fonts 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 if it should be a bug in Minecraft
+- Some conversions of HD texture packs may takes a while
+- 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 or fonts are not supported, only classic Vanilla textures
+- Snapshots versions may are also not supported
+- If textures of sprites (For instance banner pattern, painting and particle) are only partially available, the missing will be transparent
+- 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 if it should be a bug in Minecraft
+- Please don't report Java or Bedrock version changes
 
 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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrockWebApp",
-  "version": "3.6.1",
+  "version": "4.0.2",
   "description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
   "dependencies": {},
   "devDependencies": {
-    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "3.6.1",
+    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.0.2",
     "clean-webpack-plugin": "3.0.0",
     "css-loader": "3.4.2",
     "favicons-webpack-plugin": "1.0.2",

src/js/worker.js

@@ -1,12 +1,7 @@
-import {
-    AbstractLog,
-    ArrayInput,
-    ConvertJavaTextureToBedrockApi,
-    FileInputEntry,
-    FileOutput
-} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api";
+import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@ozelot379/convert-base-api";
+import {ConvertJavaTextureToBedrockApi} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api";
 
-addEventListener("message", async (e) => {
+addEventListener("message", async e => {
     try {
         const {files, options} = e.data;
 

webpack.config.js

@@ -44,6 +44,7 @@ module.exports = {
     resolve: {
         alias: {
             fs: __dirname + "/src/js/browserify/fs",
+            jszip: __dirname + "/node_modules/jszip/lib/index.js",
             path: __dirname + "/src/js/browserify/path"
         }
     },