Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
Fix turtles

See merge request minecraft/convert-minecraft-java-texture-to-bedrock!5
  • Loading branch information
ozelot379 committed Nov 15, 2019
2 parents 3ec2a31 + 7bf8583 commit f6fdab8
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [1.13.2]
- Fix turtles

## [1.13.1]
- Fix destroy stage

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
"productName": "ConvertMinecraftJavaTextureToBedrock",
"version": "1.13.1",
"version": "1.13.2",
"description": "Convert Minecraft Java texture packs to Minecraft Bedrock texture packs",
"keywords": [
"Minecraft",
Expand Down
40 changes: 40 additions & 0 deletions src/converter/TurtleConverter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import {AbstractConverter} from "./AbstractConverter";

/**
* Class TurtleConverter
*/
class TurtleConverter extends AbstractConverter {
/**
* @inheritDoc
*/
async convert() {
for await (const from of this.getData()) {
if (await this.output.exists(from)) {
this.log.log(`Convert turtle ${from}`);

const from_image = await this.readImage(from);

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

const image = await this.createImage(from_image.getWidth(), from_image.getHeight());

image.composite(from_image.crop(factor, 0, (from_image.getWidth() - factor), from_image.getHeight()), 0, 0);

await this.writeImage(from, image);
}
}

return [];
}

/**
* @inheritDoc
*/
static get DATA() {
return [
"textures/entity/sea_turtle.png"
];
}
}

export {TurtleConverter};
2 changes: 2 additions & 0 deletions src/converter/converters.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {SheepConverter} from "./SheepConverter";
import {SideRotateConverter} from "./SideRotateConverter";
import {SpriteConverter} from "./SpriteConverter";
import {TitleConverter} from "./TitleConverter";
import {TurtleConverter} from "./TurtleConverter";
import {VillagerConverter} from "./VillagerConverter";
import {WaterConverter} from "./WaterConverter";
import {WeatherConverter} from "./WeatherConverter";
Expand All @@ -52,6 +53,7 @@ const converters = [
new RedstoneDustConverter(),
new SheepConverter(),
new VillagerConverter(),
new TurtleConverter(),
new WeatherConverter(),
new OpaqueConverter(),
new WaterConverter(),
Expand Down

0 comments on commit f6fdab8

Please sign in to comment.