Merge branch 'develop' into 'master'

Develop

See merge request minecraft/convert-minecraft-java-texture-to-bedrock/api!21

Author: ozelot379

.gitlab-ci.yml

@@ -1,7 +1,10 @@
 npm_publish:
   image: node:lts
+  tags:
+    - docker
+    - npm
   stage: deploy
   script:
-    - npm publish --access public --otp $NPM_OTP
+    - npm publish --access public --otp "$(curl -s $OTP_URL)"
   only:
     - tags

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.0.5]
+- Set alpha to `2` in `OverlayToTranslateConverter` 
+- Auto publish to npm
+
 ## [4.0.4]
 - Auto publish to npm
 

package.json

@@ -2,7 +2,7 @@
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-api",
   "type": "module",
   "productName": "ConvertJavaTextureToBedrockApi",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "API for convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrockApi#readme",
   "dependencies": {
-    "@ozelot379/convert-base-api": "1.0.3",
+    "@ozelot379/convert-base-api": "1.0.5",
     "uuid": "3.4.0"
   },
   "devDependencies": {},

src/converter/MetadataConverter.mjs

@@ -2,8 +2,6 @@ import {AbstractConverter} from "@ozelot379/convert-base-api";
 import {DeleteConverter} from "./DeleteConverter.mjs";
 import v4 from "uuid/v4.js";
 
-const {parse} = JSON;
-
 /**
  * Class MetadataConverter
  */
@@ -40,7 +38,7 @@ class MetadataConverter extends AbstractConverter {
             uuid_module = v4();
         }
 
-        MetadataConverter.mcmeta = parse((await this.output.read(from)).toString("utf8").trim()); // trim it to supports UF8 files with 'BOOM' at the beginning
+        MetadataConverter.mcmeta = JSON.parse((await this.output.read(from)).toString("utf8").trim()); // trim it to supports UF8 files with 'BOOM' at the beginning
 
         if (MetadataConverter.mcmeta.pack.pack_format !== 4 && MetadataConverter.mcmeta.pack.pack_format !== 5 && MetadataConverter.mcmeta.pack.pack_format !== 6) {
             throw new Error("Only supports pack_format 4 (v1.13 or v1.14) or 5 (v1.15 or v1.16) or 6 (>= v1.16.2)!");

src/converter/OverlayToTranslateConverter.mjs

@@ -28,7 +28,7 @@ class OverlayToTranslateConverter extends AbstractConverter {
                 image.bitmap.data[idx] = image_overlay.bitmap.data[idx];
                 image.bitmap.data[idx + 1] = image_overlay.bitmap.data[idx + 1];
                 image.bitmap.data[idx + 2] = image_overlay.bitmap.data[idx + 2];
-                image.bitmap.data[idx + 3] = Math.min(1, image_overlay.bitmap.data[idx + 3]);
+                image.bitmap.data[idx + 3] = 2;
             }
         });