mc-assets 0.2.5 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,53 +11,53 @@ export declare class ItemsRenderer {
11
11
  constructor(version: string, blockstatesModels: any, itemsAtlasParser: AtlasParser, blocksAtlasParser?: AtlasParser | undefined);
12
12
  resolveTexture(texture: string): {
13
13
  slice: [number, number, number, number];
14
+ type: string;
14
15
  /** @deprecated */
15
16
  path: string;
16
- type: string;
17
17
  };
18
18
  tryGetFullBlock(blockName: string, properties?: Record<string, string | boolean>): {
19
19
  top: {
20
20
  slice: [number, number, number, number];
21
+ type: string;
21
22
  /** @deprecated */
22
23
  path: string;
23
- type: string;
24
24
  };
25
25
  left: {
26
26
  slice: [number, number, number, number];
27
+ type: string;
27
28
  /** @deprecated */
28
29
  path: string;
29
- type: string;
30
30
  };
31
31
  right: {
32
32
  slice: [number, number, number, number];
33
+ type: string;
33
34
  /** @deprecated */
34
35
  path: string;
35
- type: string;
36
36
  };
37
37
  } | undefined;
38
38
  getItemTexture(itemName: string, properties?: Record<string, string | boolean>): {
39
39
  slice: [number, number, number, number];
40
+ type: string;
40
41
  /** @deprecated */
41
42
  path: string;
42
- type: string;
43
43
  } | {
44
44
  top: {
45
45
  slice: [number, number, number, number];
46
+ type: string;
46
47
  /** @deprecated */
47
48
  path: string;
48
- type: string;
49
49
  };
50
50
  left: {
51
51
  slice: [number, number, number, number];
52
+ type: string;
52
53
  /** @deprecated */
53
54
  path: string;
54
- type: string;
55
55
  };
56
56
  right: {
57
57
  slice: [number, number, number, number];
58
+ type: string;
58
59
  /** @deprecated */
59
60
  path: string;
60
- type: string;
61
61
  };
62
62
  } | undefined;
63
63
  }
@@ -27,9 +27,9 @@ export class ItemsRenderer {
27
27
  textureInfo.su * atlas.width,
28
28
  textureInfo.sv * atlas.height
29
29
  ],
30
+ type,
30
31
  /** @deprecated */
31
- path: type,
32
- type: type
32
+ path: type
33
33
  };
34
34
  }
35
35
  tryGetFullBlock(blockName, properties = {}) {
@@ -50,6 +50,8 @@ export class ItemsRenderer {
50
50
  const topTexture = elem.faces.up?.texture ?? elem.faces.top?.texture;
51
51
  const leftTexture = elem.faces.east?.texture ?? elem.faces.left?.texture ?? elem.faces.side?.texture;
52
52
  const rightTexture = elem.faces.north?.texture ?? elem.faces.right?.texture ?? elem.faces.side?.texture;
53
+ if (!topTexture || !leftTexture || !rightTexture)
54
+ return;
53
55
  return {
54
56
  top: this.resolveTexture(topTexture),
55
57
  left: this.resolveTexture(leftTexture),
@@ -69,10 +71,13 @@ export class ItemsRenderer {
69
71
  }
70
72
  if (!model)
71
73
  return;
72
- const layer0 = model.textures?.layer0;
73
- if (!layer0)
74
+ const texture = itemName.startsWith('block/') ?
75
+ // first defined block texture
76
+ Object.values(model.textures ?? {})[0] :
77
+ model.textures?.layer0; // classic item texture
78
+ if (!texture)
74
79
  return;
75
- return this.resolveTexture(layer0);
80
+ return this.resolveTexture(texture);
76
81
  // const {resolvedModel} = this.assetsParser.getResolvedModelByModelName('item/' + itemName, itemName) ?? {}
77
82
  // resolvedModel?.textures['layer0']
78
83
  }
package/dist/types.d.ts CHANGED
@@ -24,6 +24,7 @@ export type BlockStates = {
24
24
  [name: string]: string | number;
25
25
  } & {
26
26
  OR?: BlockStateConditions[];
27
+ AND?: BlockStateConditions[];
27
28
  };
28
29
  apply: BlockApplyModel;
29
30
  }[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mc-assets",
3
- "version": "0.2.5",
3
+ "version": "0.2.7",
4
4
  "author": "Vitaly Turovsky <vital2580@icloud.com>",
5
5
  "license": "MIT",
6
6
  "files": [
@@ -60,6 +60,6 @@
60
60
  "regen-blockentities": "rm -f dist/blockStatesModels.json && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genBlocks.ts",
61
61
  "build-consumer": "tsc -p tsconfig.consumer.json",
62
62
  "watch-dist": "tsc -p tsconfig.consumer.json -w",
63
- "build-web": "cd web-demo/ && pnpm build"
63
+ "build-web": "pnpm --dir web-demo build"
64
64
  }
65
65
  }