Merge branch 'develop' into 'master'

- Log warn logs occurred count See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!54
ModifiedCommand · Aug 16, 2020 · 86a1afa · 86a1afa
2 parents 041218a + 9ea0ffa
commit 86a1afa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.0.3]
+- Log warn logs occurred count
+- Mark warning logs yellow
+
 ## [4.0.2]
 - Fix `pack_format` `6`
 - Remove convert piglin

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrockWebApp",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "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": "4.0.2",
+    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.0.3",
     "clean-webpack-plugin": "3.0.0",
     "css-loader": "3.4.2",
     "favicons-webpack-plugin": "1.0.2",

diff --git a/src/css/style.less b/src/css/style.less
@@ -40,7 +40,7 @@ input[type="file"] {
 .log {
   .grey.lighten-3;
   .black-text;
-  height: 150px;
+  height: 160px;
   overflow: auto;
 }
 

diff --git a/src/js/index.mjs b/src/js/index.mjs
@@ -163,10 +163,10 @@ document.addEventListener("DOMContentLoaded", () => {
      * @returns {Promise<>}
      */
     async function afterConvert(e) {
-        const {log, output} = e.data;
+        const {log, log_color_class, output} = e.data;
 
         if (log) {
-            _log(log);
+            _log(log, log_color_class);
             return;
         }
 
@@ -210,13 +210,18 @@ document.addEventListener("DOMContentLoaded", () => {
 
     /**
      * @param {string|undefined} log
+     * @param {string|undefined} log_color_class
      */
-    function _log(log = undefined) {
+    function _log(log = undefined, log_color_class = undefined) {
         if (log) {
             const li = document.createElement("li");
 
             li.innerText = log;
 
+            if (log_color_class) {
+                li.classList.add(`${log_color_class}-text`, "text-darken-3");
+            }
+
             logs.appendChild(li);
         }
 

diff --git a/src/js/worker.js b/src/js/worker.js
@@ -12,16 +12,20 @@ addEventListener("message", async e => {
                 new class extends AbstractLog {
                     /**
                      * @inheritDoc
+                     *
+                     * @param {string|undefined} log_color_class
                      */
-                    log(log) {
-                        postMessage({log})
+                    log(log, log_color_class = undefined) {
+                        postMessage({log, log_color_class})
                     }
 
                     /**
                      * @inheritDoc
                      */
                     warn(log) {
-                        this.log(`WARNING: ${log}`);
+                        this.warnCount();
+
+                        this.log(`WARNING: ${log}`, "yellow");
                     }
                 }(),
                 options