Skip to content

Commit 52d3d8f

Browse files
author
ozelot379
committed
WIP
1 parent 7b46d8c commit 52d3d8f

9 files changed

Lines changed: 158 additions & 89 deletions

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## [3.4.2]
4+
-
5+
36
## [3.4.1]
47
- "ES module"
58
- Docker images

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
33
"type": "module",
44
"productName": "ConvertJavaTextureToBedrock",
5-
"version": "3.4.1",
5+
"version": "3.4.2",
66
"description": "API for convert Minecraft Java texture packs to Bedrock texture packs",
77
"keywords": [
88
"Minecraft",
@@ -23,11 +23,9 @@
2323
},
2424
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2525
"dependencies": {
26-
"@ozelot379/jimp-plugins": "1.2.5",
27-
"fs-extra": "8.1.0",
26+
"@ozelot379/jimp-plugins": "1.2.6",
2827
"jimp": "0.9.8",
2928
"jszip": "3.4.0",
30-
"readdirp": "3.4.0",
3129
"tga": "1.0.3",
3230
"uuid": "3.4.0"
3331
},

‎src/converter/converters.mjs‎

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -47,50 +47,54 @@ import {WeatherConverter} from "./WeatherConverter.mjs";
4747
* @type {AbstractConverter[]}
4848
*/
4949
const converters = [
50-
...MetadataConverter.getDefaultConverters(),
51-
...RenameConverter.getDefaultConverters(),
52-
...AtlasConverter.getDefaultConverters(),
53-
...BannerPatternConverter.getDefaultConverters(),
54-
...BedConverter.getDefaultConverters(),
55-
...ChestNormalConverter.getDefaultConverters(),
56-
...ChestLeftRightDoubleConverter.getDefaultConverters(),
57-
...ChestFrontConverter.getDefaultConverters(),
58-
...ChestSideConverter.getDefaultConverters(),
59-
...DrownedConverter.getDefaultConverters(),
60-
...FireworksConverter.getDefaultConverters(),
61-
...FishHookConverter.getDefaultConverters(),
62-
...FoxConverter.getDefaultConverters(),
63-
...HorseConverter.getDefaultConverters(),
64-
...IconsConverter.getDefaultConverters(),
65-
...MapIconsConverter.getDefaultConverters(),
66-
...PistonArmConverter.getDefaultConverters(),
67-
...RedstoneDustConverter.getDefaultConverters(),
68-
...SheepConverter.getDefaultConverters(),
69-
...VillagerConverter.getDefaultConverters(),
70-
...TurtleConverter.getDefaultConverters(),
71-
...WeatherConverter.getDefaultConverters(),
72-
...OpaqueConverter.getDefaultConverters(),
73-
...WaterConverter.getDefaultConverters(),
74-
...BeeConverter.getDefaultConverters(),
75-
...TitleConverter.getDefaultConverters(),
76-
...DespriteConverter.getDefaultConverters(),
77-
...DespriteExperimentalConverter.getDefaultConverters(),
78-
...BarConverter.getDefaultConverters(),
79-
...NineSliceConverter.getDefaultConverters(),
80-
...DialogConverter.getDefaultConverters(),
81-
...OverlayToTranslateConverter.getDefaultConverters(),
82-
...ColorizeOverlayConverter.getDefaultConverters(),
83-
...PlaceholderConverter.getDefaultConverters(),
84-
...SideRotateConverter.getDefaultConverters(),
85-
...ArrowConverter.getDefaultConverters(),
86-
...Particles1_13Converter.getDefaultConverters(),
87-
...SpriteConverter.getDefaultConverters(),
88-
...DestroyStageConverter.getDefaultConverters(),
89-
...EnchantedItemGlintConverter.getDefaultConverters(),
90-
...PngToTgaConverter.getDefaultConverters(),
91-
...CopyConverter.getDefaultConverters(),
92-
...DeleteConverter.getDefaultConverters()
93-
];
50+
MetadataConverter,
51+
RenameConverter,
52+
AtlasConverter,
53+
BannerPatternConverter,
54+
BedConverter,
55+
ChestNormalConverter,
56+
ChestLeftRightDoubleConverter,
57+
ChestFrontConverter,
58+
ChestSideConverter,
59+
DrownedConverter,
60+
FireworksConverter,
61+
FishHookConverter,
62+
FoxConverter,
63+
HorseConverter,
64+
IconsConverter,
65+
MapIconsConverter,
66+
PistonArmConverter,
67+
RedstoneDustConverter,
68+
SheepConverter,
69+
VillagerConverter,
70+
TurtleConverter,
71+
WeatherConverter,
72+
OpaqueConverter,
73+
WaterConverter,
74+
BeeConverter,
75+
TitleConverter,
76+
DespriteConverter,
77+
DespriteExperimentalConverter,
78+
BarConverter,
79+
NineSliceConverter,
80+
DialogConverter,
81+
OverlayToTranslateConverter,
82+
ColorizeOverlayConverter,
83+
PlaceholderConverter,
84+
SideRotateConverter,
85+
ArrowConverter,
86+
Particles1_13Converter,
87+
SpriteConverter,
88+
DestroyStageConverter,
89+
EnchantedItemGlintConverter,
90+
PngToTgaConverter,
91+
CopyConverter,
92+
DeleteConverter
93+
].reduce((converters, converter) => {
94+
converters.push(...converter.getDefaultConverters());
95+
96+
return converters;
97+
}, []);
9498

9599
/**
96100
* @returns {AsyncIterableIterator<AbstractConverter>}

‎src/input/entry/BufferInputEntry.mjs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {AbstractInputEntry} from "./AbstractInputEntry.mjs";
2-
import fs from "fs-extra";
2+
import {dirname, join} from "path";
33
import JSZip from "jszip";
4-
import path from "path";
4+
import {mkdir, writeFile} from "fs/promises";
55

66
/**
77
* Class BufferInputEntry
@@ -34,12 +34,13 @@ class BufferInputEntry extends AbstractInputEntry {
3434
zip = await zip.loadAsync(this.buffer);
3535

3636
for (const entry of Object.values(zip.files)) {
37-
const destPath = path.join(folder, entry.name);
37+
const destPath = join(folder, entry.name);
3838

3939
if (entry.dir) {
40-
await fs.ensureDir(destPath); // Empty folders
40+
await mkdir(destPath, {recursive: true}); // Empty folders
4141
} else {
42-
await fs.outputFile(destPath, await zip.file(entry.name).async("nodebuffer"));
42+
await mkdir(dirname(destPath), {recursive: true});
43+
await writeFile(destPath, await zip.file(entry.name).async("nodebuffer"));
4344
}
4445
}
4546
}

‎src/input/entry/FileInputEntry.mjs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {BufferInputEntry} from "./BufferInputEntry.mjs";
2-
import fs from "fs-extra";
3-
import path from "path";
2+
import {dirname, join, parse, sep} from "path";
3+
import {mkdir, writeFile} from "fs/promises";
44

55
/**
66
* Class FileInputEntry
@@ -14,11 +14,12 @@ class FileInputEntry extends BufferInputEntry {
1414
// File is part of selected folder
1515
this.log.log(`Extract`);
1616

17-
let destPath = this.buffer.webkitRelativePath.split(path.sep);
17+
let destPath = this.buffer.webkitRelativePath.split(sep);
1818
destPath.shift();
19-
destPath = path.join([folder, ...destPath]);
19+
destPath = join([folder, ...destPath]);
2020

21-
await fs.outputFile(destPath, this.buffer);
21+
await mkdir(dirname(destPath), {recursive: true});
22+
await writeFile(destPath, this.buffer);
2223
} else {
2324
// File is a normal Buffer
2425
return super.applyToFolder(folder);
@@ -31,9 +32,9 @@ class FileInputEntry extends BufferInputEntry {
3132
async applyToZip(zip) {
3233
if (this.buffer.webkitRelativePath) {
3334
// File is part of selected folder
34-
let destPath = this.buffer.webkitRelativePath.split(path.sep);
35+
let destPath = this.buffer.webkitRelativePath.split(sep);
3536
destPath.shift();
36-
destPath = destPath.join(path.sep);
37+
destPath = destPath.join(sep);
3738

3839
this.log.log(`Pack ${destPath}`);
3940

@@ -49,9 +50,9 @@ class FileInputEntry extends BufferInputEntry {
4950
*/
5051
async getName() {
5152
if (this.buffer.webkitRelativePath) {
52-
return this.buffer.webkitRelativePath.split(path.sep).shift(); // First folder is the name of selected folder
53+
return this.buffer.webkitRelativePath.split(sep).shift(); // First folder is the name of selected folder
5354
} else {
54-
return path.parse(this.buffer.name).name; // Name without file extension
55+
return parse(this.buffer.name).name; // Name without file extension
5556
}
5657
}
5758
}

‎src/input/entry/LocalFileInputEntry.mjs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {BufferInputEntry} from "./BufferInputEntry.mjs";
2-
import fs from "fs-extra";
3-
import path from "path";
2+
import {parse} from "path";
3+
import {readFile} from "fs/promises";
44

55
/**
66
* Class LocalFileInputEntry
@@ -12,7 +12,7 @@ class LocalFileInputEntry extends BufferInputEntry {
1212
* @param {string} path
1313
*/
1414
constructor(path) {
15-
super(Buffer.alloc(0)); // `await fs.readFile(path)` not works here without change the usage of this class
15+
super(Buffer.alloc(0)); // `await readFile(path)` not works here without change the usage of this class
1616

1717
/**
1818
* @type {string}
@@ -44,7 +44,7 @@ class LocalFileInputEntry extends BufferInputEntry {
4444
* @inheritDoc
4545
*/
4646
async getName() {
47-
return path.parse(this.path).name; // Name without file extension
47+
return parse(this.path).name; // Name without file extension
4848
}
4949

5050
/**
@@ -56,7 +56,7 @@ class LocalFileInputEntry extends BufferInputEntry {
5656
if (this.buffer.byteLength === 0) {
5757
this.log.log(`Read ${this.path}`);
5858

59-
this.buffer = await fs.readFile(this.path);
59+
this.buffer = await readFile(this.path);
6060
}
6161
}
6262
}

‎src/input/entry/LocalFolderInputEntry.mjs‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {AbstractInputEntry} from "./AbstractInputEntry.mjs";
2-
import fs from "fs-extra";
3-
import path from "path";
4-
import readdirp from "readdirp";
2+
import {copyFile, mkdir, readdir, readFile} from "fs/promises";
3+
import {join, parse} from "path";
4+
import JSZip from "jszip";
55

66
/**
77
* Class LocalFolderInputEntry
@@ -29,7 +29,27 @@ class LocalFolderInputEntry extends AbstractInputEntry {
2929
async applyToFolder(folder) {
3030
this.log.log(`Copy ${this.path}`);
3131

32-
return fs.copy(this.path, folder);
32+
await this.applyToFolderScanFiles(this.path, folder);
33+
}
34+
35+
/**
36+
* @param {string} from
37+
* @param {string} to
38+
*
39+
* @returns {Promise<void>}
40+
*
41+
* @private
42+
*/
43+
async applyToFolderScanFiles(from, to) {
44+
for (const dirent of await readdir(from, {withFileTypes: true})) {
45+
if (dirent.isDirectory()) {
46+
await mkdir(join(to, dirent.name), {recursive: true});
47+
await this.applyToFolderScanFiles(join(from, dirent.name), join(to, dirent.name));
48+
} else {
49+
await mkdir(to, {recursive: true});
50+
await copyFile(join(from, dirent.name), join(to, dirent.name));
51+
}
52+
}
3353
}
3454

3555
/**
@@ -38,15 +58,27 @@ class LocalFolderInputEntry extends AbstractInputEntry {
3858
async applyToZip(zip) {
3959
this.log.log(`Pack ${this.path}`);
4060

41-
for await (const {fullPath, path, dirent} of readdirp(this.path, {
42-
type: "files_directories"
43-
})) {
44-
const destPath = path.replace(/\\/g, "/");
61+
await this.applyToZipScanFiles(zip, ".");
62+
63+
}
64+
65+
/**
66+
* @param {JSZip} zip
67+
* @param {string} p
68+
*
69+
* @returns {Promise<void>}
70+
*
71+
* @private
72+
*/
73+
async applyToZipScanFiles(zip, p) {
74+
for (const dirent of await readdir(join(this.path, p), {withFileTypes: true})) {
75+
const destPath = join(p, dirent.name).replace(/\\/g, "/");
4576

4677
if (dirent.isDirectory()) {
4778
zip.folder(destPath); // Empty folders
79+
await this.applyToZipScanFiles(zip, destPath);
4880
} else {
49-
zip.file(destPath, await fs.readFile(fullPath));
81+
zip.file(destPath, await readFile(join(this.path, destPath)));
5082
}
5183
}
5284
}
@@ -55,7 +87,7 @@ class LocalFolderInputEntry extends AbstractInputEntry {
5587
* @inheritDoc
5688
*/
5789
async getName() {
58-
return path.parse(this.path).name; // Name without file extension
90+
return parse(this.path).name; // Name without file extension
5991
}
6092
}
6193

‎src/output/LocalFileOutput.mjs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {BufferOutput} from "./BufferOutput.mjs";
2-
import fs from "fs-extra";
2+
import {dirname} from "path";
3+
import {mkdir, writeFile} from "fs/promises";
34

45
/**
56
* Class LocalFileOutput
@@ -29,7 +30,8 @@ class LocalFileOutput extends BufferOutput {
2930

3031
this.log.log(`Write ${this.path}`);
3132

32-
await fs.outputFile(this.path, data);
33+
await mkdir(dirname(this.path), {recursive: true});
34+
await writeFile(this.path, data);
3335

3436
return this.path;
3537
}

0 commit comments

Comments
 (0)