Skip to content

Commit b88b1d3

Browse files
author
ozelot379
committed
Fix conduit textures
1 parent 9a09cdc commit b88b1d3

5 files changed

Lines changed: 15 additions & 48 deletions

File tree

‎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.5.1]
4+
- Fix conduit textures
5+
36
## [3.5.0]
47
- Convert dolphin texture
58

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-api",
33
"type": "module",
44
"productName": "ConvertJavaTextureToBedrockApi",
5-
"version": "3.5.0",
5+
"version": "3.5.1",
66
"description": "API for convert Minecraft Java texture packs to Bedrock texture packs",
77
"keywords": [
88
"Minecraft",

‎src/converter/CropConverter.mjs‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/converter/PlaceholderConverter.mjs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {AbstractConverter} from "./AbstractConverter.mjs";
2+
import {MetadataConverter} from "./MetadataConverter.mjs";
23

34
/**
45
* Class PlaceholderConverter
@@ -8,7 +9,11 @@ class PlaceholderConverter extends AbstractConverter {
89
* @inheritDoc
910
*/
1011
async convert() {
11-
const [from, x, y, width, height, factor_detect, to, not_center] = this.data;
12+
const [from, x, y, width, height, factor_detect, to, not_center, min_pack_format] = this.data;
13+
14+
if (min_pack_format && MetadataConverter.mcmeta.pack.pack_format < min_pack_format) {
15+
return [];
16+
}
1217

1318
if (!await this.output.exists(from)) {
1419
return [];
@@ -70,6 +75,11 @@ class PlaceholderConverter extends AbstractConverter {
7075
["textures/entity/chest/normal.png", 14, 0, 14, 14, 64, "textures/blocks/chest_top.png"],
7176
["textures/entity/chest/ender.png", 14, 0, 14, 14, 64, "textures/blocks/ender_chest_top.png"],
7277

78+
// Conduit
79+
["textures/blocks/conduit_base.png", 0, 0, 24, 12, 32, "textures/blocks/conduit_base.png", true],
80+
["textures/blocks/conduit_closed.png", 0, 0, 8, 8, 16, "textures/blocks/conduit_closed.png", true, 5],
81+
["textures/blocks/conduit_open.png", 0, 0, 8, 8, 16, "textures/blocks/conduit_open.png", true, 5],
82+
7383
// Command block
7484
["textures/blocks/chain_command_block_back.png", 0, 0, 16, 16, 16, "textures/blocks/chain_command_block_back_mipmap.png"],
7585
["textures/blocks/chain_command_block_conditional.png", 0, 0, 16, 16, 16, "textures/blocks/chain_command_block_conditional_mipmap.png"],

‎src/converter/converters.mjs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {ChestNormalConverter} from "./ChestNormalConverter.mjs";
1111
import {ChestSideConverter} from "./ChestSideConverter.mjs";
1212
import {ColorizeOverlayConverter} from "./ColorizeOverlayConverter.mjs";
1313
import {CopyConverter} from "./CopyConverter.mjs";
14-
import {CropConverter} from "./CropConverter.mjs";
1514
import {DeleteConverter} from "./DeleteConverter.mjs";
1615
import {DespriteConverter} from "./DespriteConverter.mjs";
1716
import {DespriteExperimentalConverter} from "./DespriteExperimentalConverter.mjs";
@@ -92,7 +91,6 @@ const converters = [
9291
EnchantedItemGlintConverter,
9392
PngToTgaConverter,
9493
CopyConverter,
95-
CropConverter,
9694
DeleteConverter
9795
].reduce((converters, converter) => {
9896
converters.push(...converter.getDefaultConverters());

0 commit comments

Comments
 (0)