Merge branch 'develop' into 'master'

Develop See merge request minecraft/ConvertJavaTextureToBedrock!20
ModifiedCommand · Jan 1, 2020 · 008afe1 · 008afe1
2 parents 94bfff8 + 02d8eec
commit 008afe1
Show file tree

Hide file tree

Showing 37 changed files with 792 additions and 393 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
@@ -11,11 +11,11 @@ assignees: ''
 A clear and concise description of what the issue is.
 
 **Context**
-WebApp or CLI?
+Web app or CLI?
 
 **System info**
 System OS: 
-Browser (If WebApp): 
+Browser (If web app): 
 NodeJS (If CLI): 
 
 **Texture pack**

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [3.0.0]
+- Most ui conversions are now experimental and need to enabled (if you want to try)
+- Convert dialog and inventory ui (Experimental)
+- Improve error handling
+- Possible bugs fixed in:
+    - Fix crosshair
+    - Fix dye
+    - Fix enchanted item glint
+    - Fix grass block
+    - Fix sheep
+
 ## [2.0.2]
 - Support java v1.15 and bedrock v1.14
 - Convert hotbar, bars, buttons and tabs ui and inventory icons

diff --git a/README.md b/README.md
@@ -1,28 +1,35 @@
-THIS PROJECT IS NO OFFICIAL MINECRAFT] PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
+THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
 
 ---
 
 # Convert Minecraft Java texture packs to Bedrock texture packs
-
-Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
-
-It works directly in your browser
-
-It supports currently the follow Minecraft versions:
+It supports the follow Minecraft versions:
 
 | Minecraft | Version |
 |-----------|---------|
 | Java | v1.13.x, v1.14.x or v1.15.x |
 | Bedrock | v1.14.x |
 
-Currently it supports to convert blocks, items, entities, paintings, particles, map icons, mob effects and some basic ui textures
-
 Some conversions of HD texture packs may takes a while
 
 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 some more basic ui textures (hotbar)
+
+Some experimental features are disabled by default, but can be enabled if you want to try:
+- UI
+    - Buttons
+    - Tabs
+    - Dialogs
+    - Inventory
+
+## Web app
+Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
+
+Works directly in your browser - no upload
+
 ## CLI
-As an alternative you can also use the cli version
+As an alternative you can also use the cli version on your computer
 
 First be sure you have installed [NodeJS](https://nodejs.org) (At least the LTS version) and install [Yarn](https://yarnpkg.com/en/docs/install)
 
@@ -43,10 +50,10 @@ ConvertJavaTextureToBedrock -i input/java_texture_pack.zip -o output/bedrock_tex
 | -i (Required) | Input folder or zip path |
 | -o (Required) | Output folder or zip path |
 | -l | Show log (Default `true`) |
+| -e | Experimental features (Default `false`) |
 
-## Known issues
-- Convert horse textures is very tricky and may buggy
-- Convert weather textures (rain and snow) may not works (seems to be an other format as the default)
+## Report issue
+Use github repo issues (https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose)
 
 # Extras (for texture pack creators)
 
@@ -72,7 +79,7 @@ Then install the dependencies
 yarn
 ```
 
-## WebApp
+## Web app
 ```bash
 NODE_ENV=development yarn debug:webapp
 ```
@@ -82,6 +89,11 @@ NODE_ENV=development yarn debug:webapp
 NODE_ENV=development yarn debug:cli
 ```
 
+## Build
+```bash
+yarn build
+```
+
 # How this work
 This project uses the follow main features or external libraries:
 
@@ -108,7 +120,7 @@ You can now convert your texture packs
 ```javascript
 let output;
 try {
-    output = await new ConvertJavaTextureToBedrock(input, output, log).convert();
+    output = await new ConvertJavaTextureToBedrock(input, output, log, options).convert();
 } catch (err) {
 
 }
@@ -149,6 +161,11 @@ try {
 | `SlientLog` | Disable log |
 | `AbstractLog` | Base log |
 
+## Options
+| Key | Description |
+|-----|-------------|
+| `experimental` | Experimental features |
+
 ## Example
 ```javascript
 import ConvertJavaTextureToBedrock, {ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
   "productName": "ConvertJavaTextureToBedrock",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "Convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
@@ -57,8 +57,9 @@
     "ConvertJavaTextureToBedrock": "dist/cli.js"
   },
   "scripts": {
+    "build": "webpack --config ./webpack.config.cli.js && webpack --config ./webpack.config.webapp.js",
     "debug:cli": "webpack --config ./webpack.config.cli.js && node ./dist/cli.js",
     "debug:webapp": "webpack-dev-server --config ./webpack.config.webapp.js",
-    "prepublishOnly": "webpack --config ./webpack.config.cli.js && webpack --config ./webpack.config.webapp.js && gh-pages -d ./dist/webapp"
+    "prepublishOnly": "yarn build && gh-pages -d ./dist/webapp"
   }
 }
diff --git a/src/Options.js b/src/Options.js
@@ -0,0 +1,13 @@
+/**
+ * Class Options
+ */
+class Options {
+    constructor() {
+        /**
+         * @type {boolean}
+         */
+        this.experimental = false;
+    }
+}
+
+export {Options};
diff --git a/src/cli.js b/src/cli.js
@@ -31,6 +31,12 @@ import yargs from "yargs";
                 default: true,
                 describe: "Log",
                 type: "boolean"
+            },
+            e: {
+                alias: "experimental",
+                default: false,
+                describe: "Experimental features",
+                type: "boolean"
             }
         })
         .help("help").alias("h", "help")
@@ -41,7 +47,10 @@ import yargs from "yargs";
         return new ConvertJavaTextureToBedrock(
             new Input(fs.statSync(argv.input).isDirectory() ? new LocalFolderInputEntry(argv.input) : new LocalFileInputEntry(argv.input)),
             (argv.output.includes(".") ? new LocalFileOutput(argv.output) : new LocalFolderOutput(argv.output)),
-            (argv.log ? new ConsoleLog() : new SilentLog())
+            (argv.log ? new ConsoleLog() : new SilentLog()),
+            {
+                experimental: argv.experimental
+            }
         ).convert();
     } catch (err) {
         console.error(err.message);

diff --git a/src/converter/AbstractConverter.js b/src/converter/AbstractConverter.js
@@ -2,6 +2,7 @@ import {AbstractInput} from "./../input"
 import {AbstractLog} from "./../log";
 import {AbstractOutput} from "./../output";
 import Jimp from "@ozelot379/jimp-plugins";
+import {Options} from "./../Options";
 
 /**
  * Class AbstractConverter
@@ -63,6 +64,12 @@ class AbstractConverter {
          * @protected
          */
         this.log;
+        /**
+         * @type {Object}
+         *
+         * @protected
+         */
+        this.options;
         /**
          * @type {*}
          *
@@ -75,13 +82,15 @@ class AbstractConverter {
      * @param {AbstractInput} input
      * @param {AbstractOutput} output
      * @param {AbstractLog} log
+     * @param {Options} options
      *
      * @returns Promise<>
      */
-    async _init(input, output, log) {
+    async _init(input, output, log, options) {
         this.input = input;
         this.output = output;
         this.log = log;
+        this.options = options;
     }
 
     /**

diff --git a/src/converter/BarConverter.js b/src/converter/BarConverter.js
@@ -8,22 +8,22 @@ class BarConverter extends AbstractConverter {
      * @inheritDoc
      */
     async convert() {
-        const [icons, bars, nubs] = this.data;
+        const [from, factor_detect, bars, nubs] = this.data;
 
-        if (!await this.output.exists(icons)) {
+        if (!await this.output.exists(from)) {
             return [];
         }
 
-        const icons_image = await this.readImage(icons);
+        const image_from = await this.readImage(from);
 
-        const factor = (icons_image.getWidth() / 256);
+        const factor = (image_from.getWidth() / factor_detect);
 
         for (const [y, tos] of bars) {
-            const image = icons_image.clone().crop(0, (y * factor), (182 * factor), (5 * factor));
+            const image = image_from.clone().crop(0, (y * factor), (182 * factor), (5 * factor));
 
             const metadata = {
-                nineslice_size: [factor, 0, factor, 0],
-                base_size: [image.getWidth(), image.getHeight()]
+                nineslice_size: [1, 0, 1, 0],
+                base_size: [182, 5]
             };
 
             for (const [to, colorize] of tos) {
@@ -52,6 +52,7 @@ class BarConverter extends AbstractConverter {
         return [
             [
                 "textures/gui/icons.png",
+                256,
                 [
                     [64, [
                         ["textures/gui/achievements/hotdogempty"],
@@ -75,7 +76,7 @@ class BarConverter extends AbstractConverter {
                 [
                     "textures/gui/achievements/nub.png",
                     "textures/ui/experiencenub.png",
-                    "textures/ui/experience_bar_nub_blue.png",
+                    "textures/ui/experience_bar_nub_blue.png"
                 ]
             ]
         ];