diff --git a/package.json b/package.json index 9f4528072..4ed5a4494 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ "http-browserify": "^1.7.0", "http-server": "^14.1.1", "https-browserify": "^1.0.0", - "mc-assets": "^0.2.12", + "mc-assets": "^0.2.23", "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next", "mineflayer": "github:zardoy/mineflayer", "mineflayer-pathfinder": "^2.4.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5a9cd7cd3..7a89eb6df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -346,8 +346,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 mc-assets: - specifier: ^0.2.12 - version: 0.2.12 + specifier: ^0.2.23 + version: 0.2.23 minecraft-inventory-gui: specifier: github:zardoy/minecraft-inventory-gui#next version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0) @@ -6582,8 +6582,8 @@ packages: peerDependencies: react: ^18.2.0 - mc-assets@0.2.12: - resolution: {integrity: sha512-ZbiodI0vgcwGT0M3AGc+0N2h7JsnrfjzhlA5AzpSQfkGbNp3wp/VeFmI4/lGm0JPJi9+LgXGDUuspRQzQwhobg==} + mc-assets@0.2.23: + resolution: {integrity: sha512-sLbPhsSOYdW8nYllIyPZbVPnLu7V3bZTgIO4mI4nlG525q17NIbUNEjItHKtdi60u0vI6qLgHKjf0CoNRqa/Nw==} engines: {node: '>=18.0.0'} md5-file@4.0.0: @@ -17453,7 +17453,7 @@ snapshots: dependencies: react: 18.2.0 - mc-assets@0.2.12: {} + mc-assets@0.2.23: {} md5-file@4.0.0: {} diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts index 954f43545..51a00a448 100644 --- a/prismarine-viewer/viewer/lib/mesher/models.ts +++ b/prismarine-viewer/viewer/lib/mesher/models.ts @@ -619,8 +619,8 @@ export function getSectionGeometry (sx, sy, sz, world: World) { return attr } -export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true) => { - blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, 'latest') +export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true, version = 'latest') => { + blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, version) globalThis.blockProvider = blockProvider if (useUnknownBlockModel) { unknownBlockModel = blockProvider.getAllResolvedModels0_1({ name: 'unknown', properties: {} }) diff --git a/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts b/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts index ef91b1919..e75d803de 100644 --- a/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts +++ b/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts @@ -33,7 +33,7 @@ export const setup = (version, initialBlocks: Array<[number[], string]>) => { } } - setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false) + setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false, version) const reload = () => { mesherWorld.removeColumn(0, 0) mesherWorld.addColumn(0, 0, chunk1.toJson())