Fix root folder in sub folder in some wrong texture packs

Author: ozelot379

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.6.1]
+- Fix root folder in sub folder in some wrong texture packs
+- Fix rename files in local folder to not exists folder
+
 ## [3.6.0]
 - Convert new v1.16 textures
 - Convert wither armor texture

package.json

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

src/converter/FixWrongRootFolderConverter.mjs

@@ -0,0 +1,45 @@
+import {AbstractConverter} from "./AbstractConverter.mjs";
+
+/**
+ * Class FixWrongRootFolderConverter
+ */
+class FixWrongRootFolderConverter extends AbstractConverter {
+    /**
+     * @inheritDoc
+     */
+    async convert() {
+        const [pack_mcmeta, others] = this.data;
+
+        if (await this.output.exists(pack_mcmeta)) {
+            return [];
+        }
+
+        this.log.warn(`${pack_mcmeta} not found in root folder (But are needed in the root folder, even in the Java version) - Try to lookup in sub folders ...`);
+
+        const path = await this.output.lookupFile(pack_mcmeta);
+        if (!path) {
+            throw new Error(`${pack_mcmeta} not found! Is this really a Java texture pack?`);
+        }
+
+        this.log.log(`Root folder found in sub folder ${path}`);
+
+        for (const file of [pack_mcmeta, ...others]) {
+            if (await this.output.exists(`${path}/${file}`)) {
+                await this.output.rename(`${path}/${file}`, `${file}`);
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    static get DEFAULT_CONVERTER_DATA() {
+        return [
+            ["pack.mcmeta", ["pack.png", "assets/", "bedrock_textures/", "bedrock_uuid_header", "bedrock_uuid_module"]]
+        ];
+    }
+}
+
+export {FixWrongRootFolderConverter};

src/converter/MetadataConverter.mjs

@@ -17,7 +17,7 @@ class MetadataConverter extends AbstractConverter {
         this.log.log(`Create metadata ${to}`);
 
         if (!await this.output.exists(from)) {
-            throw new Error(`Missing ${from}! Is this really a java texture pack?`);
+            throw new Error(`Missing ${from}! Is this really a Java texture pack?`);
         }
 
         let uuid_header = "";

src/converter/converters.mjs

@@ -21,6 +21,7 @@ import {DrownedConverter} from "./DrownedConverter.mjs";
 import {EnchantedItemGlintConverter} from "./EnchantedItemGlintConverter.mjs";
 import {FishHookConverter} from "./FishingConverter.mjs";
 import {FireworksConverter} from "./FireworksConverter.mjs";
+import {FixWrongRootFolderConverter} from "./FixWrongRootFolderConverter.mjs";
 import {FoxConverter} from "./FoxConverter.mjs";
 import {HorseConverter} from "./HorseConverter.mjs";
 import {IconsConverter} from "./IconsConverter.mjs";
@@ -49,6 +50,7 @@ import {WeatherConverter} from "./WeatherConverter.mjs";
  * @type {AbstractConverter[]}
  */
 const converters = [
+    FixWrongRootFolderConverter,
     MetadataConverter,
     RenameConverter,
     AtlasConverter,

src/output/AbstractOutput.mjs

@@ -156,6 +156,19 @@ class AbstractOutput {
     async copy(from, to) {
 
     }
+
+    /**
+     * @param {string} name
+     *
+     * @returns {Promise<string|null>}
+     *
+     * @throws {Error}
+     *
+     * @abstract
+     */
+    async lookupFile(name) {
+
+    }
 }
 
 export {AbstractOutput};

src/output/BufferOutput.mjs

@@ -1,4 +1,5 @@
 import {AbstractOutput} from "./AbstractOutput.mjs";
+import {basename, dirname} from "path";
 import JSZip from "jszip";
 
 /**
@@ -107,6 +108,21 @@ class BufferOutput extends AbstractOutput {
             }
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    async lookupFile(name) {
+        const entry = Object.values(this.zip.files).find((entry) => {
+            return (!entry.dir && basename(entry.name) === name);
+        });
+
+        if (entry) {
+            return dirname(entry.name);
+        } else {
+            return null;
+        }
+    }
 }
 
 export {BufferOutput};

src/output/LocalFolderOutput.mjs

@@ -63,10 +63,11 @@ class LocalFolderOutput extends AbstractOutput {
      * @inheritDoc
      */
     async rename(from, to) {
-        if (await this.output.exists(to)) {
+        if (await this.exists(to)) {
             await this.delete(to);
         }
 
+        await mkdir(dirname(this.p(to)), {recursive: true});
         await rename(this.p(from), this.p(to));
     }
 
@@ -99,7 +100,7 @@ class LocalFolderOutput extends AbstractOutput {
         if ((await stat(this.p(from))).isDirectory()) {
             await this.copyScanFiles(from, to);
         } else {
-            await mkdir(this.p(dirname(to)), {recursive: true});
+            await mkdir(dirname(this.p(to)), {recursive: true});
             await copyFile(this.p(from), this.p(to));
         }
     }
@@ -124,6 +125,38 @@ class LocalFolderOutput extends AbstractOutput {
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    async lookupFile(name) {
+        return this.lookupFileScanFiles(name, ".");
+    }
+
+    /**
+     * @param {string} name
+     * @param {string} p
+     *
+     * @returns {Promise<string|null>}
+     *
+     * @private
+     */
+    async lookupFileScanFiles(name, p) {
+        for (const dirent of await readdir(join(this.path, p), {withFileTypes: true})) {
+            if (dirent.isDirectory()) {
+                const path = await this.lookupFileScanFiles(name, join(p, dirent.name));
+                if (path) {
+                    return path;
+                }
+            } else {
+                if (dirent.name === name) {
+                    return p;
+                }
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param {string} p
      *