Skip to content

Commit a8288d0

Browse files
author
ozelot379
committed
createImage
1 parent 37a89d4 commit a8288d0

19 files changed

Lines changed: 33 additions & 32 deletions

‎src/converter/AbstractConverter.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,20 @@ class AbstractConverter {
6161
this.log = log;
6262
}
6363

64+
/**
65+
* @param {number} width
66+
* @param {number} height
67+
*
68+
* @returns {Promise<Jimp>}
69+
*
70+
* @throws {Error}
71+
*
72+
* @protected
73+
*/
74+
async createImage(width, height) {
75+
return Jimp.create(width, height);
76+
}
77+
6478
/**
6579
* @param {string} file
6680
*
@@ -112,7 +126,7 @@ class AbstractConverter {
112126
}
113127

114128
/**
115-
* @returns {Promise<Function<AbstractConverter>[]>}
129+
* @returns {Promise<AbstractConverter[]>}
116130
*
117131
* @throws {Error}
118132
*

‎src/converter/AtlasConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {AbstractConverter} from "./AbstractConverter";
22
import {DeleteConverter} from "./DeleteConverter";
3-
import Jimp from "jimp";
43

54
/**
65
* Class AtlasConverter
@@ -24,7 +23,7 @@ class AtlasConverter extends AbstractConverter {
2423
if (image === null) {
2524
this.log.log(`Create atlas ${to}`);
2625

27-
image = await Jimp.create(image_step.getWidth(), (image_step.getHeight() * (count + 1)));
26+
image = await this.createImage(image_step.getWidth(), (image_step.getHeight() * (count + 1)));
2827
}
2928

3029
image.composite(image_step, 0, (image_step.getHeight() * i));

‎src/converter/BedConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class BedConverter
@@ -17,7 +16,7 @@ class BedConverter extends AbstractConverter {
1716

1817
const factor = (bed_image.getWidth() / 64);
1918

20-
const image = await Jimp.create(bed_image.getWidth(), bed_image.getHeight());
19+
const image = await this.createImage(bed_image.getWidth(), bed_image.getHeight());
2120

2221
// Top part
2322
image.composite(bed_image.clone().crop(0, 0, (44 * factor), (22 * factor)), 0, 0);

‎src/converter/ChestFrontConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class ChestFrontConverter
@@ -17,7 +16,7 @@ class ChestFrontConverter extends AbstractConverter {
1716

1817
const factor = (image_from.getWidth() / 64);
1918

20-
const image = await Jimp.create((14 * factor), (14 * factor));
19+
const image = await this.createImage((14 * factor), (14 * factor));
2120

2221
image.composite(image_from.clone().crop((14 * factor), (14 * factor), (14 * factor), (5 * factor)), 0, 0);
2322

‎src/converter/ChestSideConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class ChestSideConverter
@@ -17,7 +16,7 @@ class ChestSideConverter extends AbstractConverter {
1716

1817
const factor = (image_from.getWidth() / 64);
1918

20-
const image = await Jimp.create((14 * factor), (14 * factor));
19+
const image = await this.createImage((14 * factor), (14 * factor));
2120

2221
image.composite(image_from.clone().crop((28 * factor), (14 * factor), (14 * factor), (5 * factor)), 0, 0);
2322

‎src/converter/ColorizeOverlayConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {AbstractConverter} from "./AbstractConverter";
22
import {DeleteConverter} from "./DeleteConverter";
3-
import Jimp from "jimp";
43

54
/**
65
* Class ColorizeOverlayConverter
@@ -22,7 +21,7 @@ class ColorizeOverlayConverter extends AbstractConverter {
2221
if (image === null) {
2322
this.log.log(`Colorize and overlay ${to}`);
2423

25-
image = await Jimp.create(image_overlay.getWidth(), image_overlay.getHeight());
24+
image = await this.createImage(image_overlay.getWidth(), image_overlay.getHeight());
2625
}
2726

2827
if (Array.isArray(color) && color.length >= 3) {

‎src/converter/FireworksConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class FireworksConverter
@@ -17,7 +16,7 @@ class FireworksConverter extends AbstractConverter {
1716

1817
const factor = (image_from.getWidth() / 16);
1918

20-
const image = await Jimp.create((32 * factor), (32 * factor));
19+
const image = await this.createImage((32 * factor), (32 * factor));
2120

2221
image.composite(image_from.clone().crop((6 * factor), (2 * factor), (5 * factor), (12 * factor)).rotate(-90).crop(1, 0, (12 * factor), (5 * factor)), (3 * factor), (6 * factor)); // TODO: Why the rotated image is 2px to large in both sides?
2322

‎src/converter/FishingConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class FishHookConverter
@@ -17,7 +16,7 @@ class FishHookConverter extends AbstractConverter {
1716

1817
const factor = (image_from.getWidth() / 8);
1918

20-
const image = await Jimp.create((24 * factor), (3 * factor));
19+
const image = await this.createImage((24 * factor), (3 * factor));
2120

2221
image.composite(image_from.clone().crop((3 * factor), factor, (3 * factor), factor), 0, 0);
2322
image.composite(image_from.clone().crop((3 * factor), factor, factor, factor), 0, factor);

‎src/converter/HorseConverter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {AbstractConverter} from "./AbstractConverter";
2-
import Jimp from "jimp";
32

43
/**
54
* Class HorseConverter
@@ -17,7 +16,7 @@ class HorseConverter extends AbstractConverter {
1716

1817
const factor = (image_from.getWidth() / 64);
1918

20-
const image = await Jimp.create((image_from.getWidth() * 2), (image_from.getWidth() * 2));
19+
const image = await this.createImage((image_from.getWidth() * 2), (image_from.getWidth() * 2));
2120

2221
// Chest
2322
image.composite(image_from.clone().crop((26 * factor), (21 * factor), (22 * factor), (11 * factor)), 0, (34 * factor));

‎src/converter/MapIconsConverter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MapIconsConverter extends AbstractConverter {
1717

1818
const factor = (from_image.getWidth() / 128);
1919

20-
const image = await Jimp.create((64 * factor), (64 * factor));
20+
const image = await this.createImage((64 * factor), (64 * factor));
2121

2222
image.composite(from_image.clone().crop(0, 0, (8 * factor), (8 * factor)).scale(2, Jimp.RESIZE_NEAREST_NEIGHBOR), -factor, factor);
2323
image.composite(from_image.clone().crop((8 * factor), 0, (8 * factor), (8 * factor)).scale(2, Jimp.RESIZE_NEAREST_NEIGHBOR), (15 * factor), factor);

0 commit comments

Comments
 (0)