diff --git a/package-lock.json b/package-lock.json index 47124b9..3779399 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.22.3", "license": "MIT", "dependencies": { - "dayjs": "^1.11.13", "gl-matrix": "^3.3.0", "md5": "^2.3.0", "pako": "^2.0.3" @@ -1142,12 +1141,6 @@ "node": "*" } }, - "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", - "license": "MIT" - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4011,11 +4004,6 @@ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=" }, - "dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", diff --git a/package.json b/package.json index e4f33af..d583153 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "dayjs": "^1.11.13", "gl-matrix": "^3.3.0", "md5": "^2.3.0", "pako": "^2.0.3" diff --git a/src/render/ItemModel.ts b/src/render/ItemModel.ts index ce56ea4..fe66135 100644 --- a/src/render/ItemModel.ts +++ b/src/render/ItemModel.ts @@ -1,12 +1,9 @@ -import dayjs from "dayjs" -import tz from "dayjs/plugin/timezone.js" import { Identifier, ItemStack, } from "../core/index.js" import { clamp } from "../math/index.js" import { Color, Json } from "../util/index.js" import { ItemTint } from "./ItemTint.js" import { SpecialModel } from "./SpecialModel.js" import { Cull, ItemRenderer, ItemRendererResources, ItemRenderingContext, Mesh } from "./index.js" -tz // don't remove import export interface ItemModelProvider { getItemModel(id: Identifier): ItemModel | null @@ -212,16 +209,7 @@ export namespace ItemModel { } return tag.getString(block_state_property) }) ?? '' // TODO: verify default value - case 'local_time': - const time_zone = Json.readString(root.time_zone) - const pattern = Json.readString(root.pattern) ?? 'yyyy-MM-dd' - return (item, context) => { - let time = dayjs(context.local_time) - if (time_zone) { - time = time.tz(time_zone) - } - return time.format(pattern) - } + case 'local_time': return (item, context) => 'NOT IMPLEMENTED' case 'holder_type': return (item, context) => context.holder_type?.toString() ?? '' case 'custom_model_data': @@ -352,15 +340,11 @@ export namespace ItemModel { const selectedItemIndex = context['bundle/selected_item'] if (selectedItemIndex === undefined || selectedItemIndex < 0) return new Mesh() const selectedItem = item.getComponent('bundle_contents', tag => { - console.log(tag) if (!tag.isListOrArray()) return undefined const selectedItemTag = tag.get(selectedItemIndex) - console.log(selectedItemTag) if (selectedItemTag === undefined || !selectedItemTag.isCompound()) return undefined return ItemStack.fromNbt(selectedItemTag) }) - - console.log(selectedItem) return selectedItem !== undefined ? ItemRenderer.getItemMesh(selectedItem, resources, {...context, 'bundle/selected_item': undefined}) : new Mesh() } diff --git a/src/render/ItemRenderer.ts b/src/render/ItemRenderer.ts index e551f50..601c208 100644 --- a/src/render/ItemRenderer.ts +++ b/src/render/ItemRenderer.ts @@ -25,7 +25,6 @@ export type ItemRenderingContext = { keybind_down?: string[], main_hand?: 'left' | 'right', - local_time?: number, //milliseconds holder_type?: Identifier, cooldown_normalized?: number, diff --git a/src/render/SpecialModel.ts b/src/render/SpecialModel.ts index 70a198e..801a48f 100644 --- a/src/render/SpecialModel.ts +++ b/src/render/SpecialModel.ts @@ -105,7 +105,11 @@ export namespace SpecialModel { } public getMesh(item: ItemStack, resources: TextureAtlasProvider): Mesh { - return this.renderer(resources) + const t = mat4.create() + mat4.translate(t, t, [8, 8, 8]) + mat4.rotateY(t, t, Math.PI) + mat4.translate(t, t, [-8, -8, -8]) + return this.renderer(resources).transform(t) } }