diff --git a/prismarine-viewer/viewer/prepare/generateTextures.ts b/prismarine-viewer/viewer/prepare/generateTextures.ts index 2eaa64e5..b9a5e3e5 100644 --- a/prismarine-viewer/viewer/prepare/generateTextures.ts +++ b/prismarine-viewer/viewer/prepare/generateTextures.ts @@ -22,7 +22,7 @@ const warnings = new Set() Promise.resolve().then(async () => { generateItemsAtlases() console.time('generateTextures') - for (const version of ['1.14.4'] as typeof mcAssets['versions']) { + for (const version of mcAssets.versions as typeof mcAssets['versions']) { // for debugging (e.g. when above is overridden) if (!mcAssets.versions.includes(version)) { throw new Error(`Version ${version} is not supported by minecraft-assets`) diff --git a/prismarine-viewer/viewer/prepare/modelsBuilder.ts b/prismarine-viewer/viewer/prepare/modelsBuilder.ts index e32903fe..8a68b9f0 100644 --- a/prismarine-viewer/viewer/prepare/modelsBuilder.ts +++ b/prismarine-viewer/viewer/prepare/modelsBuilder.ts @@ -162,7 +162,7 @@ function prepareModel (model: BlockModel, texturesJson) { const getFinalTexture = (originalBlockName) => { // texture name e.g. blocks/anvil_base const cleanBlockName = cleanupBlockName(originalBlockName); - return { ...texturesJson[cleanBlockName], __debugName: cleanBlockName } + return { ...texturesJson[cleanBlockName], /* __debugName: cleanBlockName */ } } const finalTextures = [] diff --git a/scripts/build.js b/scripts/build.js index f73a2a60..547bc811 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -5,8 +5,10 @@ const glob = require('glob') const fs = require('fs') const crypto = require('crypto') const path = require('path') +const McAssets = require('minecraft-assets') const prismarineViewerBase = "./node_modules/prismarine-viewer" +const entityMcAssets = McAssets('1.16.4') // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config so we copy them there, alternative we could inline it in esbuild config const filesToCopy = [ @@ -14,7 +16,7 @@ const filesToCopy = [ { from: `${prismarineViewerBase}/public/worker.js`, to: 'dist/worker.js' }, { from: './assets/', to: './dist/' }, { from: './config.json', to: 'dist/config.json' }, - { from: `${prismarineViewerBase}/public/textures/1.16.4/entity`, to: 'dist/textures/1.16.4/entity' }, + { from: path.join(entityMcAssets.directory, 'entity'), to: 'dist/textures/1.16.4/entity' }, ] exports.filesToCopy = filesToCopy exports.copyFiles = (dev = false) => {