@block_factory/lib 0.0.6 → 0.0.8

package/_module/BlockFactory.ts

@@ -1,21 +1,12 @@
+export { Command } from "./util/Command";
+export { Inventory } from "./util/Wrapper/_Container";
+export { IPlayer, ICustomPlayer } from "./util/Wrapper/IPlayer";
+export { iSystem, ISystem } from "./util/ISystem";
+export { IVector2, IVector3 } from "./util/IVector";
 export { MathUtils } from "./util/Math";
-export { Signal } from "./util/Signal";
-export { Vec2, Vec3 } from "./util/Vector";
+export { Navigation, OnNavPointReachedEvent, OnNavigatingEntityStuckEvent } from "./util/Navigation";
 export { RawText } from "./util/RawText";
-export { Command } from "./util/Command";
-export { System } from "./util/System";
-
-export { IForm, IFormValue } from "./util/Forms/Form";
-export { ActionFormCtor, type IButtonOptions, type IActionFormResponse, type IActionFormData } from "./util/Forms/FormAction";
-export { type IModalFormResponse, type ITextFieldOptions, type IDropdownOptions, type ISliderOptions, type IToggleOptions, type IModalFormData } from "./util/Forms/FormModal";
-export { type IMessageFormData, type IMessageFormResponse } from "./util/Forms/FormMessage";
-export { type IFormRegistration, RegisterForm } from "./util/Forms/FormRegistry";
-
-export { Inventory, ContainerWrapper } from "./util/Wrapper/Container";
-export { type IEntity, IEntityWrapper } from "./util/Wrapper/IEntity";
-export { type IPlayer, IPlayerWrapper } from "./util/Wrapper/IPlayer";
-
-export { Thread } from "./Framework/Threads";
-export { PlayerHandler } from "./Framework/PlayerTasks";
-export { EntityHandler,  type EntityEmissionEvent } from "./Framework/EntityTasks";
-export { ItemHandler, type ItemRegistration, type OnItemHeldEvent, type OnItemUnheldEvent, type WhileHoldingItemEvent } from "./Framework/ItemTasks";
+export { Signal } from "./util/Signal";
+export { type Ctor, type PropertyRecord, type PropertyValue } from "./util/Globals";
+export { type IEntity, ICustomEntity } from "./util/Wrapper/IEntity";
+export * as Form from "./util/Forms/Form";

package/_module/util/Command.ts

@@ -1,12 +1,4 @@
-import {
-    CustomCommand,
-    CommandPermissionLevel,
-    CustomCommandParameter,
-    CustomCommandOrigin,
-    CustomCommandResult,
-    system,
-    StartupEvent
-} from "@minecraft/server";
+import { CustomCommand, CommandPermissionLevel, CustomCommandParameter, CustomCommandOrigin, CustomCommandResult, system, StartupEvent } from "@minecraft/server";
 
 /**
  * Command utilities and base classes for defining and registering

package/_module/util/Forms/Form.ts

@@ -1,31 +1,5 @@
-import { Player, RawMessage, world } from "@minecraft/server";
-import { uiManager } from "@minecraft/server-ui";
-
-export declare type IFormValue = string | boolean | number | undefined;
-
-export abstract class IForm {
-    private static readonly occupiedPlayers: Set<string> = new Set();
-    public static returnText: RawMessage | string = "Back";
-
-    public static isOccupied(player: Player): boolean {
-        return IForm.occupiedPlayers.has(player.id);
-    }
-
-    public static closeForms(player: Player): void {
-        uiManager.closeAllForms(player);
-    }
-
-    public static closeOccupiedForms(): void {
-        for (const playerId of IForm.occupiedPlayers) {
-            const player = world.getEntity(playerId) as Player | undefined;
-            if (player) uiManager.closeAllForms(player);
-        }
-    }
-
-    protected setOccupied(player: Player, occupied: boolean): void {
-        if (occupied) IForm.occupiedPlayers.add(player.id);
-        else IForm.occupiedPlayers.delete(player.id);
-    }
-
-    protected abstract build(player: Player): void;
-}
+export { IForm, IFormValue } from "./IForm";
+export { type IFormRegistration, RegisterForm } from "./FormRegistry";
+export { type IMessageFormData, type IMessageFormResponse } from "./FormMessage";
+export { ActionFormCtor, type IButtonOptions, type IActionFormResponse, type IActionFormData } from "./FormAction";
+export { type IModalFormResponse, type ITextFieldOptions, type IDropdownOptions, type ISliderOptions, type IToggleOptions, type IModalFormData } from "./FormModal";

package/_module/util/Forms/FormAction.ts

@@ -1,6 +1,7 @@
-import { IForm } from "./Form";
+
 import { Player, RawMessage } from "@minecraft/server";
 import { ActionFormData, ActionFormResponse, FormCancelationReason } from "@minecraft/server-ui";
+import { IForm } from "./IForm";
 
 const RETURN_ID = "d7213196-4cb6-4199-a40b-22fbf2d944ef";
 

package/_module/util/Forms/FormMessage.ts

@@ -1,9 +1,10 @@
-import { IForm } from "./Form";
+
 import { Player, RawMessage } from "@minecraft/server";
 import {
     MessageFormData,
     MessageFormResponse,
 } from "@minecraft/server-ui";
+import { IForm } from "./IForm";
 
 /**
  * Abstract base class for MessageFormData.

package/_module/util/Forms/FormModal.ts

@@ -1,4 +1,4 @@
-import { IForm } from "./Form";
+
 import { Player, RawMessage } from "@minecraft/server";
 import {
     ModalFormData,
@@ -9,8 +9,7 @@ import {
     ModalFormDataTextFieldOptions,
     ModalFormDataToggleOptions,
 } from "@minecraft/server-ui";
-
-export type FormValue = string | boolean | number | undefined;
+import { IForm, IFormValue } from "./IForm";
 
 /** Normalized response for Modal forms */
 export interface IModalFormResponse {
@@ -19,9 +18,9 @@ export interface IModalFormResponse {
     /** Whether the form was canceled by the player.*/
     readonly canceled: boolean;
     /** Raw values array from the form */
-    readonly formValues?: FormValue[];
+    readonly formValues?: IFormValue[];
     /** Mapped values by widget id */
-    readonly widget?: Map<string, FormValue>;
+    readonly widget?: Map<string, IFormValue>;
 }
 
 /** Options for each widget type */
@@ -139,19 +138,19 @@ export abstract class IModalFormData extends IForm {
         }
     }
 
-    private _wrapResponse(res: ModalFormResponse, values?: Map<string, FormValue>): IModalFormResponse {
+    private _wrapResponse(res: ModalFormResponse, values?: Map<string, IFormValue>): IModalFormResponse {
         return {
             canceled: res.canceled,
             cancelationReason: res.cancelationReason,
-            formValues: res.formValues as FormValue[] | undefined,
+            formValues: res.formValues as IFormValue[] | undefined,
             widget: values,
         };
     }
 
-    private _mapValues(formValues: FormValue[] | undefined): Map<string, FormValue> | undefined {
+    private _mapValues(formValues: IFormValue[] | undefined): Map<string, IFormValue> | undefined {
         if (!formValues) return undefined;
 
-        const out = new Map<string, FormValue>();
+        const out = new Map<string, IFormValue>();
         for (let i = 0; i < formValues.length; i++) {
             const meta = this._widgetMeta[i];
             if (!meta) continue;
@@ -174,7 +173,7 @@ export abstract class IModalFormData extends IForm {
             return wrapped;
         }
 
-        const values = this._mapValues(res.formValues as FormValue[] | undefined);
+        const values = this._mapValues(res.formValues as IFormValue[] | undefined);
         const wrapped = this._wrapResponse(res, values);
 
         this.onSubmit(player, wrapped);

package/_module/util/Forms/FormRegistry.ts

@@ -3,41 +3,38 @@ import { IActionFormData } from "./FormAction";
 import { IModalFormData } from "./FormModal";
 import { IMessageFormData } from "./FormMessage";
 
-type AnyShowableForm = IActionFormData | IModalFormData | IMessageFormData;
-type AnyShowableCtor = new () => AnyShowableForm;
+export type AnyShowableForm = IActionFormData | IModalFormData | IMessageFormData;
+export type AnyShowableCtor = new () => AnyShowableForm;
 
 export interface IFormRegistration {
-    itemId: string;
+    formId: string;
     formCtor: AnyShowableCtor;
 }
 
-const registeredForms: IFormRegistration[] = [];
+const registeredForms = new Map<string, AnyShowableCtor>();
 
-export function RegisterForm(itemId: string) {
-    return function <T extends AnyShowableCtor>(formCtor: T): void {
-        const i = registeredForms.findIndex(r => r.itemId === itemId);
-        if (i !== -1) registeredForms[i] = { itemId, formCtor };
-        else registeredForms.push({ itemId, formCtor });
-    };
+export function RegisterForm(formId: string) {
+  return function <T extends AnyShowableCtor>(formCtor: T): void {
+    registeredForms.set(formId, formCtor); // replaces or inserts
+  };
 }
 
-function getFormForItem(itemId: string): AnyShowableCtor | undefined {
-    return registeredForms.find(r => r.itemId === itemId)?.formCtor;
+function getForm(formId: string): AnyShowableCtor | undefined {
+  return registeredForms.get(formId);
 }
 
 world.afterEvents.itemUse.subscribe((event: ItemUseAfterEvent) => {
-    const player = event.source;
-    if (!(player instanceof Player)) return;
+  const player = event.source;
+  if (!(player instanceof Player)) return;
 
-    const item = event.itemStack;
-    if (!item) return;
+  const item = event.itemStack;
+  if (!item) return;
 
-    const formCtor = getFormForItem(item.typeId);
-    if (!formCtor) return;
+  const formCtor = getForm(item.typeId);
+  if (!formCtor) return;
 
-    const form = new formCtor();
-
-    form.show(player).catch((e) => {
-        player.sendMessage(`§cForm error: ${String(e)}`);
-    });
+  const form = new formCtor();
+  form.show(player).catch((e) => {
+    player.sendMessage(`§cForm error: ${String(e)}`);
+  });
 });

package/_module/util/Forms/IForm.ts

@@ -0,0 +1,31 @@
+import { Player, RawMessage, world } from "@minecraft/server";
+import { uiManager } from "@minecraft/server-ui";
+
+export declare type IFormValue = string | boolean | number | undefined;
+
+export abstract class IForm {
+    private static readonly occupiedPlayers: Set<string> = new Set();
+    public static returnText: RawMessage | string = "Back";
+
+    public static isOccupied(player: Player): boolean {
+        return IForm.occupiedPlayers.has(player.id);
+    }
+
+    public static closeForms(player: Player): void {
+        uiManager.closeAllForms(player);
+    }
+
+    public static closeOccupiedForms(): void {
+        for (const playerId of IForm.occupiedPlayers) {
+            const player = world.getEntity(playerId) as Player | undefined;
+            if (player) uiManager.closeAllForms(player);
+        }
+    }
+
+    protected setOccupied(player: Player, occupied: boolean): void {
+        if (occupied) IForm.occupiedPlayers.add(player.id);
+        else IForm.occupiedPlayers.delete(player.id);
+    }
+
+    protected abstract build(player: Player): void;
+}

package/_module/util/Globals.ts

@@ -0,0 +1,26 @@
+import { Vector3 } from "@minecraft/server";
+
+/**
+ * Constructor type for wrapper-style classes.
+ *
+ * Used when you want to pass a class into a factory like `wrap(source, Ctor)`.
+ *
+ * @template T Instance type created by the constructor
+ */
+export type Ctor<T extends any> = new (source: any) => T;
+
+/**
+ * Allowed value types for Minecraft dynamic properties.
+ *
+ * Dynamic properties support a limited set of primitives plus `Vector3`,
+ * and may be `undefined` when a property is absent or cleared.
+ */
+export type PropertyValue = string | number | boolean | Vector3 | undefined;
+
+/**
+ * Key/value record representing a bundle of dynamic properties.
+ *
+ * Typically returned from a `save()` method and then written back via
+ * `setDynamicProperty(key, value)`.
+ */
+export type PropertyRecord = Record<string, PropertyValue>;

package/_module/util/ISystem.ts

@@ -0,0 +1,58 @@
+import { Ctor } from "./Globals";
+import { system, System } from "@minecraft/server";
+
+export type ISystem = _ISystem & System;
+
+class _ISystem {
+    public static wrap(): ISystem { return new _ISystem() as ISystem; }
+    private constructor() { return this.ProxyConstructor(this, system); }
+
+    private _packId: string = "undefined";
+    public get packId(): string { return this._packId; }
+    public set packId(value: string) { this._packId = value; }
+
+    private _iClassRegistry = new Map<string, Ctor<any>>();
+    public get iClassRegistry(): Map<string, Ctor<any>> { return this._iClassRegistry; }
+
+    /**
+    * Registers a wrapper class so it can be reconstructed after reload.
+    *
+    * The constructor name is used as the runtime key when restoring
+    * entities from their saved dynamic property (e.g. "CLASS_ID").
+    *
+    * @template T Wrapper type
+    * @param Ctor The class constructor to register.
+    */
+    public registerIClass<T extends any>(Ctor: Ctor<T>): void {
+        this._iClassRegistry.set(Ctor.name, Ctor);
+    }
+    
+    /**
+    * Proxy helper: reads/writes prefer the wrapper instance, otherwise fall back to `source`.
+    * @param _instance Wrapper object to proxy (your class instance).
+    * @param source Backing object to forward unknown properties/methods to.
+    */
+    public ProxyConstructor = ((_instance: any, source: any) => {
+        return new Proxy(_instance, {
+            get: (target, prop) => {
+                if (prop in target) return (target as any)[prop];
+                const v = (source as any)[prop];
+                return typeof v === "function" ? v.bind(source) : v;
+            },
+
+            set: (target, prop, value) => {
+                if (prop in target) { (target as any)[prop] = value; return true; }
+                (source as any)[prop] = value;
+                return true;
+            },
+
+            has: (target, prop) => prop in target || prop in source,
+            ownKeys: () => [...Reflect.ownKeys(source), ...Reflect.ownKeys(_instance)],
+            getOwnPropertyDescriptor: (_t, prop) => Object.getOwnPropertyDescriptor((prop in _instance ? _instance : source) as any, prop)
+        }) as any;
+    })
+}
+
+
+
+export const iSystem: ISystem = _ISystem.wrap();