Convert new v1.16 textures

Author: ozelot379

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [3.6.0]
+- Convert new v1.16 textures
+- Convert wither armor texture
+- Fix spawn egg mask texture
+
 ## [3.5.1]
 - Fix conduit textures
 

README.md

@@ -124,12 +124,12 @@ This files are applied additionally before output
 
 This project uses the follow main features or external libraries:
 
-- [Web Worker](https://developer.mozilla.org/docs/Web/API/Web_Workers_API) for convert it in the background to not freeze the browser ui (web app)
+- [Web Worker](https://developer.mozilla.org/docs/Web/API/Web_Workers_API) for convert it in the background to not freeze the browser ui (Web app)
 - [jszip](https://www.npmjs.com/package/jszip) for read, modify and write zip files
 - [jimp](https://www.npmjs.com/package/jimp) for graphic manipulation
-- [file-saver](https://www.npmjs.com/package/file-saver) for deliver the converted pack to download
-- [webpack](https://www.npmjs.com/package/webpack) for bundle the dist code
-- [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) for offline cache and usage (web app)
+- [file-saver](https://www.npmjs.com/package/file-saver) for deliver the converted pack to download (Web app)
+- [webpack](https://www.npmjs.com/package/webpack) for bundle the dist code (Web app)
+- [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) for offline cache and usage (Web app)
 
 ## Web app
 

package.json

@@ -2,7 +2,7 @@
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-api",
   "type": "module",
   "productName": "ConvertJavaTextureToBedrockApi",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "API for convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",

src/converter/ColorizeOverlayConverter.mjs

@@ -134,6 +134,8 @@ class ColorizeOverlayConverter extends AbstractConverter {
 
             // Saddle
             [[["textures/entity/pig/pig.png"], ["textures/entity/saddle.png"]], "textures/entity/pig/pig_saddle.png"],
+            [[["textures/entity/strider/strider.png"], ["textures/entity/strider/strider_saddle.png"]], "textures/entity/strider/strider_saddled.png"],
+            [[["textures/entity/strider/strider_suffocated.png"], ["textures/entity/strider/strider_saddle.png", null, true]], "textures/entity/strider/strider_suffocated_saddled.png"],
 
             // Splash potion (Colors from px 7/9 from original bedrock textures)
             [[["textures/items/potion_overlay.png", [88, 184, 255]], ["textures/items/potion_bottle_splash_empty.png"]], "textures/items/potion_bottle_splash.png"],
@@ -166,6 +168,7 @@ class ColorizeOverlayConverter extends AbstractConverter {
 
             // Spawn egg (Colors from px 8/9 and 5/9 from original bedrock textures)
             [[["textures/items/spawn_egg.png", [65, 53, 41]], ["textures/items/spawn_egg_overlay.png", [13, 13, 13]]], "textures/items/egg_bat.png"],
+            [[["textures/items/spawn_egg.png", [204, 167, 58]], ["textures/items/spawn_egg_overlay.png", [59, 32, 24]]], "textures/items/egg_bee.png"],
             [[["textures/items/spawn_egg.png", [211, 153, 1]], ["textures/items/spawn_egg_overlay.png", [226, 220, 112]]], "textures/items/egg_blaze.png"],
             [[["textures/items/spawn_egg.png", [239, 200, 142]], ["textures/items/spawn_egg_overlay.png", [135, 101, 74]]], "textures/items/egg_cat.png"],
             [[["textures/items/spawn_egg.png", [10, 57, 67]], ["textures/items/spawn_egg_overlay.png", [149, 12, 12]]], "textures/items/egg_cave_spider.png"],
@@ -189,7 +192,7 @@ class ColorizeOverlayConverter extends AbstractConverter {
             [[["textures/items/spawn_egg.png", [102, 99, 83]], ["textures/items/spawn_egg_overlay.png", [197, 191, 127]]], "textures/items/egg_husk.png"],
             [[["textures/items/spawn_egg.png", [45, 0, 0]], ["textures/items/spawn_egg_overlay.png", [223, 223, 0]]], "textures/items/egg_lava_slime.png"],
             [[["textures/items/spawn_egg.png", [165, 136, 107]], ["textures/items/spawn_egg_overlay.png", [136, 84, 57]]], "textures/items/egg_llama.png"],
-            [[["textures/items/spawn_egg.png"], ["textures/items/spawn_egg_overlay.png"]], "textures/items/egg_mask.png"],
+            [[["textures/items/spawn_egg.png", [219, 0, 0]], ["textures/items/spawn_egg_overlay.png", [240, 226, 0]]], "textures/items/egg_mask.png"],
             [[["textures/items/spawn_egg.png", [23, 2, 0]], ["textures/items/spawn_egg_overlay.png", [72, 45, 26]]], "textures/items/egg_mule.png"],
             [[["textures/items/spawn_egg.png", [137, 13, 14]], ["textures/items/spawn_egg_overlay.png", [162, 162, 162]]], "textures/items/egg_mushroomcow.png"],
             [[["textures/items/spawn_egg.png"], ["textures/items/spawn_egg_overlay.png"]], "textures/items/egg_null.png"],

src/converter/CopyConverter.mjs

@@ -26,6 +26,13 @@ class CopyConverter extends AbstractConverter {
      */
     static get DEFAULT_CONVERTER_DATA() {
         return [
+            // Battern
+            ["textures/entity/banner/banner_pattern_illager.tga", "textures/entity/banner/banner_illager.tga"],
+
+            // Beef
+            ["textures/items/beef_cooked.png", "textures/items/hoglin_meat_cooked.png"],
+            ["textures/items/beef_raw.png", "textures/items/hoglin_meat_raw.png"],
+
             // Cat
             ["textures/entity/cat/redtabby.png", "textures/entity/cat/red.png"],
             ["textures/entity/cat/siamesecat.png", "textures/entity/cat/siamese.png"],
@@ -37,6 +44,10 @@ class CopyConverter extends AbstractConverter {
             // Command block
             ["textures/blocks/command_block_back_mipmap.png", "textures/blocks/command_block.png"],
 
+            // Compass & clock
+            ["textures/items/compass_atlas.png", "textures/items/lodestonecompass_atlas.png"],
+            ["textures/items/compass_item.png", "textures/items/lodestonecompass_item.png"],
+
             // Fire
             ["textures/blocks/fire_0.png", "textures/flame_atlas.png"],
 
@@ -75,6 +86,9 @@ class CopyConverter extends AbstractConverter {
             ["textures/items/empty_armor_slot_leggings.png", "textures/ui/empty_armor_slot_leggings.png"],
             ["textures/items/empty_armor_slot_shield.png", "textures/ui/empty_armor_slot_shield.png"],
 
+            // Wither
+            ["textures/entity/creeper/creeper_armor.png", "textures/entity/wither_boss/wither_armor_blue.png"],
+
             ["bedrock_textures/", "textures/"]
         ];
     }

src/converter/DeleteConverter.mjs

@@ -28,6 +28,8 @@ class DeleteConverter extends AbstractConverter {
         return [
             "assets/", // Speed up loading
 
+            "textures/blocks/chain.png",
+
             "textures/blocks/conduit.png",
             "textures/entity/conduit/break_particle.png",
 

src/converter/DespriteExperimentalConverter.mjs

@@ -159,6 +159,15 @@ class DespriteExperimentalConverter extends AbstractConverter {
                     [192, 0, 16, 16, "textures/ui/loom_dye_empty.png", [33, 26, 16, 16]],
                     [208, 0, 16, 16, "textures/ui/loom_pattern_item_empty.png", [23, 45, 16, 16]]
                 ]
+            ],
+            [
+                "textures/gui/container/smithing.png",
+                256,
+                [
+                    [17, 7, 30, 30, "textures/ui/smithing_icon.png"],
+                    [53, 49, 13, 13, "textures/ui/smithing-table-plus.png"],
+                    [76, 47, 16, 16, "textures/ui/ingot_image.png"]
+                ]
             ]
         ];
     }

src/converter/DialogConverter.mjs

@@ -79,6 +79,7 @@ class DialogConverter extends AbstractConverter {
                         ["textures/ui/dialog_background_hollow_2", [8, 23, 8, 42]],
                         ["textures/ui/dialog_background_hollow_3", [8, 23, 8, 8]],
                         ["textures/ui/dialog_background_hollow_4", [8, 8, 8, 8]],
+                        ["textures/ui/dialog_background_hollow_4_thin", [6, 6, 6, 6]],
                         ["textures/ui/dialog_background_hollow_5", [8, 17, 8, 42]],
                         ["textures/ui/dialog_background_hollow_6", [8, 23, 8, 104]],
                         ["textures/ui/dialog_background_hollow_7", [8, 66, 8, 8]],

src/converter/MetadataConverter.mjs

@@ -41,7 +41,7 @@ class MetadataConverter extends AbstractConverter {
         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) {
-            throw new Error("Only supports pack_format 4 (v1.13 and v1.14) or 5 (v1.15)!");
+            throw new Error("Only supports pack_format 4 (v1.13 or v1.14) or 5 (v1.15 or v1.16)!");
         }
 
         const manifest = {

src/converter/PiglinConverter.mjs

@@ -0,0 +1,57 @@
+import {AbstractConverter} from "./AbstractConverter.mjs";
+import {DeleteConverter} from "./DeleteConverter.mjs";
+
+/**
+ * Class PiglinConverter
+ */
+class PiglinConverter extends AbstractConverter {
+    /**
+     * @inheritDoc
+     */
+    async convert() {
+        const [from, to, delete_from] = this.data;
+
+        const to_delete = [];
+
+        if (!await this.output.exists(from)) {
+            return to_delete;
+        }
+
+        this.log.log(`Convert piglin ${to}`);
+
+        const image_from = await this.readImage(from);
+
+        const factor = (image_from.getWidth() / 64);
+
+        const image = await this.createImage((128 * factor), (128 * factor));
+
+        image.composite(image_from.clone().crop(0, 0, (36 * factor), (64 * factor)), 0, 0);
+
+        image.composite(image_from.clone().crop((36 * factor), factor, (5 * factor), (5 * factor)), (36 * factor), factor);
+
+        image.composite(image_from.clone().crop((39 * factor), (6 * factor), (10 * factor), (9 * factor)), (57 * factor), (22 * factor));
+        image.composite(image_from.clone().crop((51 * factor), (6 * factor), (10 * factor), (9 * factor)), (57 * factor), (38 * factor));
+
+        image.composite(image_from.clone().crop((36 * factor), (16 * factor), (28 * factor), (48 * factor)), (36 * factor), (16 * factor));
+
+        await this.writeImage(to, image);
+
+        if (delete_from) {
+            to_delete.push(new DeleteConverter(from));
+        }
+
+        return to_delete;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    static get DEFAULT_CONVERTER_DATA() {
+        return [
+            ["textures/entity/piglin/piglin.png", "textures/entity/piglin/piglin.png"],
+            ["textures/entity/piglin/zombified_piglin.png", "textures/entity/piglin/zombie_piglin.png", true]
+        ];
+    }
+}
+
+export {PiglinConverter};