fix: fix regression with item renderer

chore: fix building on windows

package.json

@@ -10,7 +10,7 @@
         "regen-blockentities": "rm -f dist/blockStatesModels.json && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genBlocks.ts",
         "build-consumer": "tsc -p tsconfig.consumer.json",
         "watch-dist": "tsc -p tsconfig.consumer.json -w",
-        "build-web": "cd web-demo/ && pnpm build"
+        "build-web": "pnpm --dir web-demo build"
     },
     "files": [
         "dist",

src/arrangeLatestBlockEntities.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import path from 'path'
+import path from 'path/posix'
 
 const dataPaths = JSON.parse(fs.readFileSync('./data/data-paths.json', 'utf8'))
 

src/atlasNode.ts

@@ -1,5 +1,4 @@
 import fs from 'fs'
-import path from 'path'
 import { Canvas, Image } from 'canvas'
 import { AtlasCreatorOptions, JsonAtlas, makeTextureAtlas as makeAtlas } from './consumer/atlasCreator'
 

src/blockEntities.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import path from 'path'
+import path from 'path/posix'
 
 const dataPaths = JSON.parse(fs.readFileSync('./data/data-paths.json', 'utf8'))
 

src/consumer/assetsParser.ts

@@ -156,9 +156,11 @@ export class AssetsParser {
             if (model.textures) {
                 this.resolvedModel.textures ??= {}
                 for (let [key, value] of Object.entries(model.textures)) {
-                    value = value.replace('blocks/', 'block/').replace('block/', '')
-                    if (value.startsWith('#') && this.resolvedModel.textures[value.slice(1)]) {
-                        value = this.resolvedModel.textures[value.slice(1)]!
+                    if (value.includes('#')) {
+                        const key = value.split('/').at(-1)!.slice(1)
+                        if (this.resolvedModel.textures[key]) {
+                            value = this.resolvedModel.textures[key]!
+                        }
                     }
                     this.resolvedModel.textures[key] = value
                 }

src/consumer/itemsRenderer.ts

@@ -67,9 +67,12 @@ export class ItemsRenderer {
             }
         }
         if (!model) return
-        const layer0 = model.textures?.layer0
-        if (!layer0) return
-        return this.resolveTexture(layer0)
+        const texture = itemName.startsWith('block/') ?
+            // first defined block texture
+            Object.values(model.textures ?? {})[0] :
+            model.textures?.layer0 // classic item texture
+        if (!texture) return
+        return this.resolveTexture(texture)
         // const {resolvedModel} = this.assetsParser.getResolvedModelByModelName('item/' + itemName, itemName) ?? {}
         // resolvedModel?.textures['layer0']
     }

src/copyOtherTextures.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { join, dirname } from 'path'
+import { join, dirname } from 'path/posix'
 
 const handledTextureKeys = [
     'blocks/',

src/examples/getItem.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { join } from 'path'
+import { join } from 'path/posix'
 import { BlockModel, BlockStates, ItemModel } from '../consumer/types'
 import { VersionedStore } from '../consumer/versionedStore'
 import { AtlasParser } from '../consumer'
@@ -15,5 +15,5 @@ const blockstatesModels = JSON.parse(fs.readFileSync('./dist/blockStatesModels.j
 const itemsAtlasParser = new AtlasParser(itemsAtlases, '')
 const blocksAtlasParser = new AtlasParser(blocksAtlases, '')
 
-console.log(blocksAtlasParser.getTextureInfo("entity/decorated_pot/decorated_pot_base"))
-// console.log(new ItemsRenderer('latest', blockstatesModels, itemsAtlasParser, blocksAtlasParser).getItemTexture('oak_sapling'))
+// console.log(blocksAtlasParser.getTextureInfo("entity/decorated_pot/decorated_pot_base"))
+console.log(new ItemsRenderer('latest', blockstatesModels, itemsAtlasParser, blocksAtlasParser).getItemTexture('block/errored'))

src/genBlocks.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { makeTextureAtlas } from './atlasNode'
-import { join } from 'path'
+import { join } from 'path/posix'
 
 const rawData = JSON.parse(fs.readFileSync('./data/data-paths.json', 'utf8'))
 const blockstatesModels = JSON.parse(

src/genItems.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { join } from 'path'
+import { join } from 'path/posix'
 import { filesize } from 'filesize'
 
 // todo remove

src/genParticles.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { makeTextureAtlas } from './atlasNode'
-import { join } from 'path'
+import { join } from 'path/posix'
 
 const rawData = JSON.parse(fs.readFileSync('./data/data-paths.json', 'utf8'))
 

src/newAssetsBuilder.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import { VersionedStore } from './consumer/versionedStore'
 import { versionToNumber } from './consumer/utils'
-import path from 'path'
+import path from 'path/posix'
 import { BlockModel, BlockStates, ItemModel } from './consumer/types'
 
 

src/newInvsprite.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import path from 'path'
+import path from 'path/posix'
 import { createCanvas, Image } from 'canvas'
 import { makeTextureAtlas } from './atlasNode'
 

src/versionedImages.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import looksSame from 'looks-same'
-import { join } from 'path'
+import { join } from 'path/posix'
 
 export const makeVersionedImages = async (rootDir: string, versions: string[], filterFiles = (file: string) => file.endsWith('.png')) => {
     let saving = 0