mc-assets 0.2.30 → 0.2.32

package/dist/stores.d.ts

@@ -1,7 +1,8 @@
-import { BlockModel, BlockStates, ItemModel } from './types';
+import { BlockModel, BlockStates, ItemDefinition, ItemModel } from './types';
 import { VersionedStore } from './versionedStore';
 export type BlockStatesStore = VersionedStore<BlockStates>;
 export type BlockModelsStore = VersionedStore<BlockModel & ItemModel>;
+export type ItemDefinitionsStore = VersionedStore<ItemDefinition>;
 export declare const blockstatesStore: VersionedStore<BlockStates>;
 export declare const modelsStore: VersionedStore<BlockModel & {
     overrides?: Array<{
@@ -43,6 +44,10 @@ export declare const modelsStore: VersionedStore<BlockModel & {
         };
     };
 }>;
+export declare const itemDefinitionsStore: VersionedStore<{
+    model?: any;
+    disable_hand_animation?: boolean | undefined;
+}>;
 export declare const getLoadedBlockstatesStore: (data: {
     blockstates: any;
 }) => VersionedStore<BlockStates>;
@@ -88,3 +93,7 @@ export declare const getLoadedModelsStore: (data: {
         };
     };
 }>;
+export declare const getLoadedItemDefinitionsStore: (data: any) => VersionedStore<{
+    model?: any;
+    disable_hand_animation?: boolean | undefined;
+}>;

package/dist/stores.js

@@ -1,8 +1,10 @@
 import { VersionedStore } from './versionedStore';
 export const blockstatesStore = new VersionedStore();
 export const modelsStore = new VersionedStore();
+export const itemDefinitionsStore = new VersionedStore();
 blockstatesStore.inclusive = false;
 modelsStore.inclusive = false;
+itemDefinitionsStore.inclusive = false;
 export const getLoadedBlockstatesStore = (data) => {
     const blockstatesStore = new VersionedStore();
     blockstatesStore.inclusive = false;
@@ -15,3 +17,9 @@ export const getLoadedModelsStore = (data) => {
     modelsStore.loadData(data.models);
     return modelsStore;
 };
+export const getLoadedItemDefinitionsStore = (data) => {
+    const itemDefinitionsStore = new VersionedStore();
+    itemDefinitionsStore.inclusive = false;
+    itemDefinitionsStore.loadData(data);
+    return itemDefinitionsStore;
+};

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 type ModelBasic = {
     model: string;
     x?: number;
@@ -78,4 +79,91 @@ export type ItemModel = BlockModel & {
         fixed?: DisplayPresentation;
     };
 };
+export declare const DisplayContext: z.ZodEnum<["gui", "ground", "fixed", "head", "firstperson", "thirdperson"]>;
+export type DisplayContextType = z.infer<typeof DisplayContext>;
+export declare const ItemPropertyTypes: z.ZodObject<{
+    'minecraft:using_item': z.ZodBoolean;
+    'minecraft:use_duration': z.ZodNumber;
+    'minecraft:display_context': z.ZodEnum<["gui", "ground", "fixed", "head", "firstperson", "thirdperson"]>;
+    'minecraft:broken': z.ZodBoolean;
+    'minecraft:damage': z.ZodNumber;
+    'minecraft:cooldown': z.ZodNumber;
+    'minecraft:custom_model_data': z.ZodNumber;
+    'minecraft:bundle/has_selected_item': z.ZodBoolean;
+    'minecraft:trim_material': z.ZodString;
+    'minecraft:use_cycle': z.ZodNumber;
+    'minecraft:block_state': z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean]>>;
+    'minecraft:date': z.ZodOptional<z.ZodDate>;
+    'minecraft:local_time': z.ZodOptional<z.ZodDate>;
+    'minecraft:time': z.ZodOptional<z.ZodNumber>;
+    'minecraft:context_dimension': z.ZodOptional<z.ZodString>;
+    'minecraft:compass': z.ZodOptional<z.ZodNumber>;
+    'minecraft:has_component': z.ZodOptional<z.ZodBoolean>;
+    use_duration_ms: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    'minecraft:using_item': boolean;
+    'minecraft:use_duration': number;
+    'minecraft:display_context': "head" | "gui" | "ground" | "fixed" | "firstperson" | "thirdperson";
+    'minecraft:broken': boolean;
+    'minecraft:damage': number;
+    'minecraft:cooldown': number;
+    'minecraft:custom_model_data': number;
+    'minecraft:bundle/has_selected_item': boolean;
+    'minecraft:trim_material': string;
+    'minecraft:use_cycle': number;
+    'minecraft:block_state': Record<string, string | number | boolean>;
+    'minecraft:date'?: Date | undefined;
+    'minecraft:local_time'?: Date | undefined;
+    'minecraft:time'?: number | undefined;
+    'minecraft:context_dimension'?: string | undefined;
+    'minecraft:compass'?: number | undefined;
+    'minecraft:has_component'?: boolean | undefined;
+    use_duration_ms?: number | undefined;
+}, {
+    'minecraft:using_item': boolean;
+    'minecraft:use_duration': number;
+    'minecraft:display_context': "head" | "gui" | "ground" | "fixed" | "firstperson" | "thirdperson";
+    'minecraft:broken': boolean;
+    'minecraft:damage': number;
+    'minecraft:cooldown': number;
+    'minecraft:custom_model_data': number;
+    'minecraft:bundle/has_selected_item': boolean;
+    'minecraft:trim_material': string;
+    'minecraft:use_cycle': number;
+    'minecraft:block_state': Record<string, string | number | boolean>;
+    'minecraft:date'?: Date | undefined;
+    'minecraft:local_time'?: Date | undefined;
+    'minecraft:time'?: number | undefined;
+    'minecraft:context_dimension'?: string | undefined;
+    'minecraft:compass'?: number | undefined;
+    'minecraft:has_component'?: boolean | undefined;
+    use_duration_ms?: number | undefined;
+}>;
+export type ItemProperties = Partial<z.infer<typeof ItemPropertyTypes>>;
+export declare const ItemDefinitionSchema: z.ZodObject<{
+    model: any;
+    disable_hand_animation: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    model?: any;
+    disable_hand_animation?: boolean | undefined;
+}, {
+    model?: any;
+    disable_hand_animation?: boolean | undefined;
+}>;
+export type ItemDefinition = z.infer<typeof ItemDefinitionSchema>;
+export interface ResolvedItemModel {
+    model: string;
+    tints?: Array<{
+        type: 'minecraft:constant';
+        value: number;
+    }>;
+    special?: Record<string, any>;
+    watchProperties?: Array<{
+        property: keyof ItemProperties;
+        type: 'range' | 'condition' | 'select';
+        currentValue?: any;
+        source?: string;
+        target?: string;
+    }>;
+}
 export {};

package/dist/types.js

@@ -1 +1,117 @@
-export {};
+import { z } from 'zod';
+// ---
+// ItemDefinitionSchema
+export const DisplayContext = z.enum([
+    'gui',
+    'ground',
+    'fixed',
+    'head',
+    'firstperson',
+    'thirdperson'
+]);
+export const ItemPropertyTypes = z.object({
+    'minecraft:using_item': z.boolean(),
+    'minecraft:use_duration': z.number(), // number of ticks
+    'minecraft:display_context': DisplayContext,
+    'minecraft:broken': z.boolean(),
+    'minecraft:damage': z.number(),
+    'minecraft:cooldown': z.number(),
+    'minecraft:custom_model_data': z.number(),
+    'minecraft:bundle/has_selected_item': z.boolean(),
+    'minecraft:trim_material': z.string(),
+    'minecraft:use_cycle': z.number(),
+    'minecraft:block_state': z.record(z.string(), z.union([z.string(), z.number(), z.boolean()])),
+    'minecraft:date': z.date().optional(),
+    'minecraft:local_time': z.date().optional(),
+    'minecraft:time': z.number().optional(), // Used for clock and other time-based items
+    'minecraft:context_dimension': z.string().optional(), // Used for dimension-specific models
+    'minecraft:compass': z.number().optional(), // Used for compass direction
+    'minecraft:has_component': z.boolean().optional(), // Used for lodestone compass
+    // utils properties
+    use_duration_ms: z.number().optional(),
+});
+// Base model types
+const constantTint = z.object({
+    type: z.literal('minecraft:constant'),
+    value: z.number()
+});
+const baseModel = z.object({
+    type: z.literal('minecraft:model'),
+    model: z.string(),
+    tints: z.array(constantTint).optional()
+});
+const emptyModel = z.object({
+    type: z.literal('minecraft:empty')
+});
+const specialModel = z.object({
+    type: z.literal('minecraft:special'),
+    base: z.string(),
+    model: z.object({
+        type: z.union([
+            z.literal('minecraft:conduit'),
+            z.literal('minecraft:shield'),
+            z.literal('minecraft:head')
+        ]),
+        kind: z.string().optional() // For head models
+    })
+});
+const selectCase = z.object({
+    model: z.lazy(() => modelTypes),
+    when: z.array(z.string())
+});
+const selectModel = z.object({
+    type: z.literal('minecraft:select'),
+    cases: z.array(selectCase),
+    fallback: z.lazy(() => modelTypes).optional(),
+    property: z.string(),
+    pattern: z.string().optional()
+});
+const rangeEntry = z.object({
+    model: z.lazy(() => modelTypes),
+    threshold: z.number()
+});
+const rangeDispatchModel = z.object({
+    type: z.literal('minecraft:range_dispatch'),
+    entries: z.array(rangeEntry),
+    fallback: z.lazy(() => modelTypes),
+    property: z.string(),
+    scale: z.number().optional(),
+    source: z.string().optional(),
+    target: z.string().optional()
+});
+const conditionModel = z.object({
+    type: z.literal('minecraft:condition'),
+    property: z.string(),
+    on_true: z.lazy(() => modelTypes),
+    on_false: z.lazy(() => modelTypes)
+});
+const compositeModel = z.object({
+    type: z.literal('minecraft:composite'),
+    models: z.array(z.lazy(() => modelTypes))
+});
+const dateCondition = z.object({
+    month: z.number(),
+    days: z.array(z.number())
+});
+const dateModel = z.object({
+    type: z.literal('minecraft:date'),
+    conditions: z.array(dateCondition),
+    on_match: z.lazy(() => modelTypes),
+    fallback: z.lazy(() => modelTypes)
+});
+// Combined model types
+const modelTypes = z.discriminatedUnion('type', [
+    baseModel,
+    emptyModel,
+    specialModel,
+    selectModel,
+    rangeDispatchModel,
+    conditionModel,
+    compositeModel,
+    dateModel
+]);
+// Main schema
+export const ItemDefinitionSchema = z.object({
+    model: modelTypes,
+    disable_hand_animation: z.boolean().optional()
+});

package/dist/worldBlockProvider.d.ts

@@ -2,9 +2,6 @@ import { QueriedBlock } from './assetsParser';
 import { BlockModel } from './types';
 export default function worldBlockProvider(blockstatesModels: any, blocksAtlas: any, version: string): {
     getAllResolvedModels0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean): ({
-        parent?: string;
-        ambientocclusion?: boolean;
-        ao?: boolean;
         elements: {
             faces: {
                 [k: string]: {
@@ -31,83 +28,20 @@ export default function worldBlockProvider(blockstatesModels: any, blocksAtlas:
                 rescale?: boolean;
             };
         }[];
-    } | {
-        ao?: boolean;
+    } & Omit<Pick<BlockModel, "textures" | "ao" | "elements"> & {
         x?: number;
         y?: number;
         z?: number;
         uvlock?: boolean;
         weight?: number;
-        elements: {
-            faces: {
-                [k: string]: {
-                    texture: {
-                        u: number;
-                        v: number;
-                        su: number;
-                        sv: number;
-                        tileIndex: number;
-                        debugName: string;
-                    };
-                    uv?: number[];
-                    cullface?: string;
-                    rotation?: number;
-                    tintindex?: number;
-                };
-            };
-            from: import("./types").BlockElementPos;
-            to: import("./types").BlockElementPos;
-            rotation?: {
-                origin: [number, number, number];
-                axis: string;
-                angle: number;
-                rescale?: boolean;
-            };
-        }[];
-    })[][];
-    transformModel: (model: BlockModel | (Pick<BlockModel, "textures" | "ao" | "elements"> & {
-        x?: number;
-        y?: number;
-        z?: number;
-        uvlock?: boolean;
-        weight?: number;
-    }), block: Omit<QueriedBlock, "stateId">) => {
-        parent?: string;
-        ambientocclusion?: boolean;
-        ao?: boolean;
-        elements: {
-            faces: {
-                [k: string]: {
-                    texture: {
-                        u: number;
-                        v: number;
-                        su: number;
-                        sv: number;
-                        tileIndex: number;
-                        debugName: string;
-                    };
-                    uv?: number[];
-                    cullface?: string;
-                    rotation?: number;
-                    tintindex?: number;
-                };
-            };
-            from: import("./types").BlockElementPos;
-            to: import("./types").BlockElementPos;
-            rotation?: {
-                origin: [number, number, number];
-                axis: string;
-                angle: number;
-                rescale?: boolean;
-            };
-        }[];
-    } | {
-        ao?: boolean;
+    }, "textures" | "elements">)[][];
+    transformModel: <T extends BlockModel | (Pick<BlockModel, "textures" | "ao" | "elements"> & {
         x?: number;
         y?: number;
         z?: number;
         uvlock?: boolean;
         weight?: number;
+    })>(model: T, block: Omit<QueriedBlock, "stateId">) => {
         elements: {
             faces: {
                 [k: string]: {
@@ -134,7 +68,7 @@ export default function worldBlockProvider(blockstatesModels: any, blocksAtlas:
                 rescale?: boolean;
             };
         }[];
-    };
+    } & Omit<T, "textures" | "elements">;
     getTextureInfo: (textureName: string) => {
         su: number;
         sv: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-assets",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
@@ -52,9 +52,12 @@
     "minecraft block model parser",
     "minecraft block entity"
   ],
+  "dependencies": {
+    "zod": "^3.24.1"
+  },
   "repository": "https://github.com/zardoy/mc-assets",
   "scripts": {
-    "build": "tsx src/datapaths-builder.ts && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genItems.ts && tsx src/genParticles.ts && tsx src/genBlocks.ts && tsx src/copyOtherTextures.ts && tsx src/compressImages.ts && pnpm type-check && pnpm build-consumer && pnpm build-web && tsx src/buildEndChecks.ts && tsx src/changeReadme.ts",
+    "build": "tsx src/datapaths-builder.ts && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genItems.ts && tsx src/genParticles.ts && tsx src/genBlocks.ts && tsx src/itemDefinitionsBuilder.ts && tsx src/copyOtherTextures.ts && tsx src/compressImages.ts && pnpm type-check && pnpm build-consumer && pnpm build-web && tsx src/buildEndChecks.ts && tsx src/changeReadme.ts",
     "use-cached-datapaths": "mkdir ./data && git fetch origin && git --work-tree=./data checkout origin/gh-pages -- . && git reset",
     "type-check": "tsc --noEmit",
     "regen-blockentities": "rm -f dist/blockStatesModels.json && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genBlocks.ts",