diff --git a/package.json b/package.json index 926fda69..922de4df 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "stream-browserify": "^3.0.0", "three": "0.154.0", "timers-browserify": "^2.0.12", - "typescript": "5.5.0-beta", + "typescript": "5.5.4", "vitest": "^0.34.6", "yaml": "^2.3.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c90a1ae3..ba6c10e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -213,7 +213,7 @@ importers: version: 1.0.37 use-typed-event-listener: specifier: ^4.0.2 - version: 4.0.2(react@18.2.0)(typescript@5.5.0-beta) + version: 4.0.2(react@18.2.0)(typescript@5.5.4) valtio: specifier: ^1.11.1 version: 1.11.2(@types/react@18.2.20)(react@18.2.0) @@ -242,10 +242,10 @@ importers: version: 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/react': specifier: ^7.4.6 - version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.0-beta) + version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4) '@storybook/react-vite': specifier: ^7.4.6 - version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) + version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) '@types/lodash-es': specifier: ^4.17.9 version: 4.17.9 @@ -281,7 +281,7 @@ importers: version: 1.0.0 contro-max: specifier: ^0.1.8 - version: 0.1.8(typescript@5.5.0-beta) + version: 0.1.8(typescript@5.5.4) crypto-browserify: specifier: ^3.12.0 version: 3.12.0 @@ -296,7 +296,7 @@ importers: version: 8.50.0 eslint-config-zardoy: specifier: ^0.2.17 - version: 0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.0-beta) + version: 0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.4) events: specifier: ^3.3.0 version: 3.3.0 @@ -355,8 +355,8 @@ importers: specifier: ^2.0.12 version: 2.0.12 typescript: - specifier: 5.5.0-beta - version: 5.5.0-beta + specifier: 5.5.4 + version: 5.5.4 vitest: specifier: ^0.34.6 version: 0.34.6(terser@5.19.2) @@ -8081,8 +8081,8 @@ packages: typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - typescript@5.5.0-beta: - resolution: {integrity: sha512-FRg3e/aQg3olEG3ff8YjHOERsO4IM0m4qGrsE4UMvILaq4TdDZ6gQX4+2Rq9SjTpfSe/ebwiHcsjm/7FfWWQ6Q==} + typescript@5.5.4: + resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} hasBin: true @@ -10318,15 +10318,15 @@ snapshots: core-js: 3.32.1 regenerator-runtime: 0.13.11 - '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': + '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': dependencies: glob: 7.2.3 glob-promise: 4.2.2(glob@7.2.3) magic-string: 0.27.0 - react-docgen-typescript: 2.2.2(typescript@5.5.0-beta) + react-docgen-typescript: 2.2.2(typescript@5.5.4) vite: 4.5.3(@types/node@20.8.0)(terser@5.19.2) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 '@jridgewell/gen-mapping@0.3.3': dependencies: @@ -11091,7 +11091,7 @@ snapshots: - encoding - supports-color - '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': + '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': dependencies: '@storybook/channels': 7.4.6 '@storybook/client-logger': 7.4.6 @@ -11114,7 +11114,7 @@ snapshots: rollup: 3.29.4 vite: 4.5.3(@types/node@20.8.0)(terser@5.19.2) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - encoding - supports-color @@ -11398,12 +11398,12 @@ snapshots: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': + '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2))': dependencies: - '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) + '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) '@rollup/pluginutils': 5.0.5(rollup@2.79.1) - '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.0-beta)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) - '@storybook/react': 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.0-beta) + '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) + '@storybook/react': 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4) '@vitejs/plugin-react': 3.1.0(vite@4.5.3(@types/node@20.8.0)(terser@5.19.2)) ast-types: 0.14.2 magic-string: 0.30.4 @@ -11419,7 +11419,7 @@ snapshots: - typescript - vite-plugin-glimmerx - '@storybook/react@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.0-beta)': + '@storybook/react@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)': dependencies: '@storybook/client-logger': 7.4.6 '@storybook/core-client': 7.4.6 @@ -11445,7 +11445,7 @@ snapshots: type-fest: 2.19.0 util-deprecate: 1.0.2 optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - encoding - supports-color @@ -11766,13 +11766,13 @@ snapshots: '@types/node': 20.12.8 optional: true - '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta)': + '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)': dependencies: '@eslint-community/regexpp': 4.8.0 - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4) '@typescript-eslint/scope-manager': 6.1.0 - '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.5.0-beta) - '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4) + '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4) '@typescript-eslint/visitor-keys': 6.1.0 debug: 4.3.4(supports-color@8.1.1) eslint: 8.50.0 @@ -11781,22 +11781,22 @@ snapshots: natural-compare: 1.4.0 natural-compare-lite: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.5.0-beta) + ts-api-utils: 1.0.3(typescript@5.5.4) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta)': + '@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4)': dependencies: '@typescript-eslint/scope-manager': 6.7.3 '@typescript-eslint/types': 6.7.3 - '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.5.0-beta) + '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.5.4) '@typescript-eslint/visitor-keys': 6.7.3 debug: 4.3.4(supports-color@8.1.1) eslint: 8.50.0 optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - supports-color @@ -11810,15 +11810,15 @@ snapshots: '@typescript-eslint/types': 6.7.3 '@typescript-eslint/visitor-keys': 6.7.3 - '@typescript-eslint/type-utils@6.1.0(eslint@8.50.0)(typescript@5.5.0-beta)': + '@typescript-eslint/type-utils@6.1.0(eslint@8.50.0)(typescript@5.5.4)': dependencies: - '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.0-beta) - '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4) + '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4) debug: 4.3.4(supports-color@8.1.1) eslint: 8.50.0 - ts-api-utils: 1.0.3(typescript@5.5.0-beta) + ts-api-utils: 1.0.3(typescript@5.5.4) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - supports-color @@ -11826,7 +11826,7 @@ snapshots: '@typescript-eslint/types@6.7.3': {} - '@typescript-eslint/typescript-estree@6.1.0(typescript@5.5.0-beta)': + '@typescript-eslint/typescript-estree@6.1.0(typescript@5.5.4)': dependencies: '@typescript-eslint/types': 6.1.0 '@typescript-eslint/visitor-keys': 6.1.0 @@ -11834,13 +11834,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.5.0-beta) + ts-api-utils: 1.0.3(typescript@5.5.4) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@6.7.3(typescript@5.5.0-beta)': + '@typescript-eslint/typescript-estree@6.7.3(typescript@5.5.4)': dependencies: '@typescript-eslint/types': 6.7.3 '@typescript-eslint/visitor-keys': 6.7.3 @@ -11848,20 +11848,20 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.5.0-beta) + ts-api-utils: 1.0.3(typescript@5.5.4) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@6.1.0(eslint@8.50.0)(typescript@5.5.0-beta)': + '@typescript-eslint/utils@6.1.0(eslint@8.50.0)(typescript@5.5.4)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) '@types/json-schema': 7.0.12 '@types/semver': 7.5.3 '@typescript-eslint/scope-manager': 6.1.0 '@typescript-eslint/types': 6.1.0 - '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.0-beta) + '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4) eslint: 8.50.0 semver: 7.6.0 transitivePeerDependencies: @@ -12905,14 +12905,14 @@ snapshots: content-type@1.0.5: {} - contro-max@0.1.8(typescript@5.5.0-beta): + contro-max@0.1.8(typescript@5.5.4): dependencies: events: 3.3.0 lodash-es: 4.17.21 typed-emitter: 2.1.0 optionalDependencies: react: 18.2.0 - use-typed-event-listener: 4.0.2(react@18.2.0)(typescript@5.5.0-beta) + use-typed-event-listener: 4.0.2(react@18.2.0)(typescript@5.5.4) transitivePeerDependencies: - typescript @@ -13769,34 +13769,34 @@ snapshots: eslint-plugin-react: 7.34.1(eslint@8.50.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.50.0) - eslint-config-xo-typescript@1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta): + eslint-config-xo-typescript@1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4): dependencies: - '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta) - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4) eslint: 8.50.0 - typescript: 5.5.0-beta + typescript: 5.5.4 eslint-config-xo@0.43.1(eslint@8.50.0): dependencies: confusing-browser-globals: 1.0.11 eslint: 8.50.0 - eslint-config-zardoy@0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.0-beta): + eslint-config-zardoy@0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.4): dependencies: '@rushstack/eslint-patch': 1.4.0 - '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta) - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4) eslint: 8.50.0 eslint-config-prettier: 8.10.0(eslint@8.50.0) eslint-config-xo: 0.43.1(eslint@8.50.0) eslint-config-xo-react: 0.27.0(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0) - eslint-config-xo-typescript: 1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0)(typescript@5.5.0-beta) + eslint-config-xo-typescript: 1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4) eslint-plugin-eslint-comments: 3.2.0(eslint@8.50.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0) eslint-plugin-node: 11.1.0(eslint@8.50.0) eslint-plugin-sonarjs: 0.19.0(eslint@8.50.0) eslint-plugin-unicorn: 48.0.0(eslint@8.50.0) - typescript: 5.5.0-beta + typescript: 5.5.4 transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -13812,11 +13812,11 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0): + eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0): dependencies: debug: 3.2.7(supports-color@8.1.1) optionalDependencies: - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4) eslint: 8.50.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: @@ -13834,7 +13834,7 @@ snapshots: eslint: 8.50.0 ignore: 5.2.4 - eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint@8.50.0): + eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0): dependencies: array-includes: 3.1.7 array.prototype.flat: 1.3.2 @@ -13843,7 +13843,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.50.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.0-beta))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0) has: 1.0.3 is-core-module: 2.13.0 is-glob: 4.0.3 @@ -13853,7 +13853,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.14.2 optionalDependencies: - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.0-beta) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -16937,9 +16937,9 @@ snapshots: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-docgen-typescript@2.2.2(typescript@5.5.0-beta): + react-docgen-typescript@2.2.2(typescript@5.5.4): dependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 react-docgen@6.0.0-alpha.3: dependencies: @@ -18118,9 +18118,9 @@ snapshots: dependencies: utf8-byte-length: 1.0.4 - ts-api-utils@1.0.3(typescript@5.5.0-beta): + ts-api-utils@1.0.3(typescript@5.5.4): dependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 ts-dedent@2.2.0: {} @@ -18242,7 +18242,7 @@ snapshots: typedarray@0.0.6: {} - typescript@5.5.0-beta: {} + typescript@5.5.4: {} ua-parser-js@1.0.37: {} @@ -18417,13 +18417,13 @@ snapshots: dependencies: react: 18.2.0 - use-typed-event-listener@4.0.2(react@18.2.0)(typescript@5.5.0-beta): + use-typed-event-listener@4.0.2(react@18.2.0)(typescript@5.5.4): dependencies: '@babel/runtime': 7.22.11 react: 18.2.0 use-deep-compare: 1.1.0(react@18.2.0) optionalDependencies: - typescript: 5.5.0-beta + typescript: 5.5.4 utf8-byte-length@1.0.4: {} diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js index 8f8812d0..358b0568 100644 --- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js +++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js @@ -1,4 +1,5 @@ //@ts-check +import * as THREE from 'three' import { OBJLoader } from 'three-stdlib' import entities from './entities.json' import { externalModels } from './objModels' @@ -87,11 +88,11 @@ const elemFaces = { } } -function dot (a, b) { +function dot(a, b) { return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] } -function addCube (attr, boneId, bone, cube, texWidth = 64, texHeight = 64) { +function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64) { const cubeRotation = new THREE.Euler(0, 0, 0) if (cube.rotation) { cubeRotation.x = -cube.rotation[0] * Math.PI / 180 @@ -131,7 +132,7 @@ function addCube (attr, boneId, bone, cube, texWidth = 64, texHeight = 64) { } } -function getMesh (texture, jsonModel, overrides = {}) { +function getMesh(texture, jsonModel, overrides = {}) { const bones = {} const geoData = { @@ -294,7 +295,7 @@ const getEntity = (name) => { // } export class EntityMesh { - constructor (version, type, scene, /** @type {{textures?, rotation?: Record}} */overrides = {}) { + constructor(version, type, scene, /** @type {{textures?, rotation?: Record}} */overrides = {}) { let originalType = type const mappedValue = temporaryMap[type] if (mappedValue) type = mappedValue @@ -367,7 +368,7 @@ export class EntityMesh { } } - static getStaticData (name) { + static getStaticData(name) { name = temporaryMap[name] || name if (externalModels[name]) { return { diff --git a/src/globals.d.ts b/src/globals.d.ts index 4abc0822..98bf19ca 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,6 +1,5 @@ /// -declare const THREE: typeof import('three') // todo make optional declare const bot: Omit & { world: Omit & { diff --git a/src/panorama.ts b/src/panorama.ts index 59df54e4..61bfc49c 100644 --- a/src/panorama.ts +++ b/src/panorama.ts @@ -2,6 +2,7 @@ import { join } from 'path' import fs from 'fs' +import * as THREE from 'three' import { subscribeKey } from 'valtio/utils' import { EntityMesh } from 'prismarine-viewer/viewer/lib/entity/EntityMesh' import { fromTexturePackPath, resourcePackState } from './texturePack' diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx index eecd1a97..778c4185 100644 --- a/src/react/DebugOverlay.tsx +++ b/src/react/DebugOverlay.tsx @@ -1,4 +1,5 @@ import { useEffect, useRef, useMemo, useState } from 'react' +import * as THREE from 'three' import { getFixedFilesize } from '../downloadAndOpenFile' import { options } from '../optionsStorage' import worldInteractions from '../worldInteractions' diff --git a/src/vr.ts b/src/vr.ts index af1e885a..f78cdb46 100644 --- a/src/vr.ts +++ b/src/vr.ts @@ -2,6 +2,7 @@ import { VRButton } from 'three/examples/jsm/webxr/VRButton.js' import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js' import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js' import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad' +import * as THREE from 'three' import { activeModalStack, hideModal } from './globalState' export async function initVR () { diff --git a/src/water.ts b/src/water.ts index d8b4b41c..2d3be46f 100644 --- a/src/water.ts +++ b/src/water.ts @@ -1,3 +1,4 @@ +import * as THREE from 'three' import { watchUnloadForCleanup } from './gameUnload' let inWater = false diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts index e523c74b..6d517ac2 100644 --- a/src/worldInteractions.ts +++ b/src/worldInteractions.ts @@ -1,5 +1,7 @@ //@ts-check +import * as THREE from 'three' + // wouldn't better to create atlas instead? import destroyStage0 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_0.png' import destroyStage1 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_1.png'