sapdon 3.0.2 → 3.1.0

package/dist/oc/index.d.ts

@@ -0,0 +1,142 @@
+import * as _minecraft_server from '@minecraft/server';
+import { Entity, Player, InputButton } from '@minecraft/server';
+
+declare class Optional<T = any> {
+    private value;
+    static none<T>(): Optional<T>;
+    static some<T>(value?: T): Optional<T>;
+    constructor(value: T);
+    unwrap(): T;
+    isEmpty(): boolean;
+    orElse(other: T): T;
+    use(fn: (v: T) => void, self?: any): boolean;
+}
+
+interface Component {
+    onTick(manager: ComponentManager, en: Optional<Entity>): void;
+    detach(manager: ComponentManager): void;
+    getManager(): ComponentManager;
+    getEntity(): Optional<Entity>;
+}
+interface BasicComponent extends Component {
+    onAttach(manager: ComponentManager): boolean | void | Promise<boolean | void>;
+    onDetach(manager: ComponentManager): void | Promise<void>;
+}
+declare const REFLECT_MANAGER: unique symbol;
+declare const REFLECT_ENTITY: unique symbol;
+declare class CustomComponent implements Component {
+    [REFLECT_MANAGER]?: ComponentManager;
+    [REFLECT_ENTITY]: Optional<Entity>;
+    onTick(manager: ComponentManager, en: Optional<Entity>): void;
+    detach(manager: ComponentManager): Promise<boolean>;
+    getManager(): ComponentManager;
+    getEntity(): Optional<Entity>;
+}
+declare class BaseComponent extends CustomComponent implements BasicComponent {
+    onAttach(manager: ComponentManager): boolean | void | Promise<boolean | void>;
+    onDetach(manager: ComponentManager): void | Promise<void>;
+}
+interface ComponentCtor<T extends Component | BasicComponent = Component> {
+    new (...args: any[]): T;
+}
+declare class ComponentManager {
+    #private;
+    static profilerEnable: boolean;
+    static readonly global: ComponentManager;
+    getComponentUnsafe(ctor: ComponentCtor): Component | undefined;
+    getComponent<T extends Component>(ctor: ComponentCtor<T>): Optional<T>;
+    getComponents(...ctor: ComponentCtor[]): (Component | undefined)[];
+    attachComponent(...component: Component[]): Promise<Optional<Component>[]>;
+    getOrCreate<T extends Component>(ctor: ComponentCtor<T>, ...args: any[]): Promise<Optional<T>>;
+    detachComponent(ctor: ComponentCtor): Promise<boolean>;
+    clear(): void;
+    getComponentKeys(): MapIterator<ComponentCtor<Component>>;
+    has(ctor: ComponentCtor): boolean;
+    afterTick(fn: (en: Optional<Entity>) => void): void;
+    beforeTick(fn: (en: Optional<Entity>) => void): void;
+    handleTicks(en: Entity): void;
+    update<T extends Component>(ctor: ComponentCtor<T>, fn: (component: T) => void): boolean;
+    profiler(fn: Function, component?: Component, name?: string): any;
+}
+type RequireComponentsParam = ComponentCtor | [ComponentCtor, ...any[]];
+declare const REQUIRED_COMPONENTS: unique symbol;
+interface RequiredComponent extends BasicComponent {
+    getComponent<T extends Component>(ctor: ComponentCtor): T;
+}
+declare function RequireComponents(...params: RequireComponentsParam[]): {
+    new (): {
+        getComponent<T extends Component>(ctor: ComponentCtor): T;
+        [REQUIRED_COMPONENTS]: Map<ComponentCtor<Component>, Component>;
+        onAttach(manager: ComponentManager): boolean | void | Promise<boolean | void>;
+        onDetach(manager: ComponentManager): void | Promise<void>;
+        onTick(manager: ComponentManager, en: Optional<Entity>): void;
+        detach(manager: ComponentManager): Promise<boolean>;
+        getManager(): ComponentManager;
+        getEntity(): Optional<Entity>;
+        [REFLECT_MANAGER]?: ComponentManager;
+        [REFLECT_ENTITY]: Optional<Entity>;
+    };
+};
+declare namespace oc {
+    function addEntity(entityId: string): ComponentManager;
+    function removeEntity(entityId: string): void;
+    function getManager(entityId: string): ComponentManager;
+    function tick(): void;
+    function start(): void;
+    function toPlayer(entity: Entity): Optional<Player>;
+}
+
+type ComponentDescriptor = string | ComponentCtor;
+declare class Actor {
+    readonly target: Entity;
+    readonly manager: ComponentManager;
+    constructor(target: Entity);
+    static from(target: Entity): Actor;
+    /**
+     * 优先使用 `Actor.getComponent`
+     * @param ctors
+     * @returns
+     */
+    getMinecraftComponent(...ids: string[]): (_minecraft_server.EntityComponent | undefined)[];
+    /**
+     * 优先使用 `Actor.getComponent`
+     * @param ctors
+     * @returns
+     */
+    getCustomComponent(...ctors: ComponentCtor[]): (Component | undefined)[];
+    getComponent<T extends readonly ComponentDescriptor[] | []>(...descs: T): {
+        -readonly [K in keyof T]: Component;
+    };
+    addComponent(...components: Component[]): Promise<Optional<Component>[]>;
+    removeComponent(ctor: ComponentCtor): Promise<boolean>;
+    updateComponent<T extends Component>(ctor: ComponentCtor<T>, fn: (component: T) => void): boolean;
+}
+
+declare enum InputChangeState {
+    Press = 0,
+    Release = 1,
+    None = 2
+}
+/**
+ * `@minecraft/server` version 2.0.0-beta
+ * 低于此版本请不要使用此组件
+ */
+declare class PlayerInputComponent extends BaseComponent {
+    [InputButton.Jump]: InputChangeState;
+    [InputButton.Sneak]: InputChangeState;
+    static setup(): void;
+}
+/**
+ * `@minecraft/server` version 1.17.0-beta
+ * 有 1tick 延迟
+ * 条件允许请使用 `PlayerInputComponent`
+ */
+declare class PlayerInputCompatibilityComponent extends BaseComponent {
+    [InputButton.Jump]: InputChangeState;
+    [InputButton.Sneak]: InputChangeState;
+    private _lastJump;
+    private _lastSneak;
+    onTick(manager: ComponentManager, en: Optional<Entity>): void;
+}
+
+export { Actor, BaseComponent, type BasicComponent, type Component, type ComponentCtor, type ComponentDescriptor, ComponentManager, CustomComponent, InputChangeState, Optional, PlayerInputCompatibilityComponent, PlayerInputComponent, RequireComponents, type RequiredComponent, oc };

package/dist/oc/index.js

@@ -0,0 +1 @@
+import{world as t,system as e,InputButton as n,ButtonState as s}from"@minecraft/server";class o{value;static none(){return new o(null)}static some(t){return new o(t)}constructor(t){this.value=t}unwrap(){if(!this.isEmpty())return this.value;throw new Error("Optional is empty")}isEmpty(){return void 0===this.value||null===this.value}orElse(t){return this.value??t}use(t,e){return!this.isEmpty()&&(t.call(e,this.value),!0)}}const r=Symbol("reflect-manager"),a=Symbol("reflect-entity");class i{[r];[a]=o.none();onTick(t,e){}detach(t){const e=Object.getPrototypeOf(this).constructor;return t.detachComponent(e)}getManager(){return this[r]}getEntity(){return this[a]}}class c extends i{onAttach(t){}onDetach(t){}}class p{static profilerEnable=!1;static global=new p;#t=new Map;#e=[];#n=[];getComponentUnsafe(t){return this.#t.get(t)}getComponent(t){return o.some(this.#t.get(t))}getComponents(...t){return t.map((t=>this.#t.get(t)))}async#s(t,e,n=!0){let s=!this.#t.get(t);if(!s&&n&&(await this.detachComponent(t),s=!0),u in e)for(const[t,n]of e[u])this.#s(t,n,!1);return s&&"onAttach"in e&&await e.onAttach(this),this.#t.set(t,e),o.some(e)}async attachComponent(...t){const e=[];for(const n of t)e.push(await this.#s(Object.getPrototypeOf(n).constructor,n));return e}async getOrCreate(t,...e){let n=this.#t.get(t);return n?o.some(n):this.#s(t,new t(...e))}async detachComponent(t){const e=this.#t.get(t);return e&&"onDetach"in e&&await e.onDetach(this),this.#t.delete(t)}clear(){this.#t.clear()}getComponentKeys(){return this.#t.keys()}has(t){return this.#t.has(t)}afterTick(t){this.#n.push(t)}beforeTick(t){this.#e.unshift(t)}handleTicks(t){for(const e of this.#e)this.profiler((()=>e.call(null,o.some(t))));this.#e.length=0;for(const e of this.#t.values()){e[a]||(e[a]=o.some(t)),e[r]||(e[r]=this);const{onTick:n}=e;n&&this.profiler((()=>n.call(e,this,o.some(t))),e)}for(const e of this.#n)this.profiler((()=>e.call(null,o.some(t))));this.#n.length=0}update(t,e){const n=this.#t.get(t);return!!n&&(e(n),!0)}profiler(t,e,n){if(!p.profilerEnable)return t();const s=e?Object.getPrototypeOf(e).constructor.name:"",o=n||(s?`${s}.${t.name}`:t.name),r=performance.now(),a=t();return console.log(`[Profiler] ${o} took ${performance.now()-r}ms`),a}}const u=Symbol("REQUIRED_COMPONENTS");function l(...t){return class extends c{[u]=new Map;constructor(){super();for(const e of t)if(Array.isArray(e)){const[t,...n]=e;this[u].set(t,Reflect.construct(t,n))}else this[u].set(e,Reflect.construct(e,[]))}getComponent(t){return this[u].get(t)}}}var h,m;!function(n){const s=new Map;function r(t){const e=new p;return s.set(t,e),e}function a(){for(const[e,n]of s.entries()){const s=t.getEntity(e);s&&n.handleTicks(s)}}n.addEntity=r,n.removeEntity=function(t){const e=t,n=s.get(e);n?.clear(),s.delete(e)},n.getManager=function(t){return s.get(t)??r(t)},n.tick=a,n.start=function(){e.runInterval(a)},n.toPlayer=function(e){return o.some(t.getAllPlayers().find((t=>t.id===e.id)))}}(h||(h={}));class f{target;manager;constructor(t){this.target=t,this.manager=h.getManager(t.id)}static from(t){return new f(t)}getMinecraftComponent(...t){return t.map((t=>this.target.getComponent(t)))}getCustomComponent(...t){return this.manager.getComponents(...t)}getComponent(...t){return t.map((t=>"string"==typeof t?this.target.getComponent(t):this.manager.getComponentUnsafe(t)))}addComponent(...t){return this.manager.attachComponent(...t)}removeComponent(t){return this.manager.detachComponent(t)}updateComponent(t,e){return this.manager.update(t,e)}}!function(t){t[t.Press=0]="Press",t[t.Release=1]="Release",t[t.None=2]="None"}(m||(m={}));class g extends c{[n.Jump]=m.None;[n.Sneak]=m.None;static setup(){t.afterEvents.playerButtonInput.subscribe((t=>{const e=h.getManager(t.player.id);e.getComponent(g).use((n=>{n[t.button]=t.newButtonState===s.Pressed?m.Press:m.Release,e.afterTick((()=>{n[t.button]=m.None}))}))}))}}class d extends c{[n.Jump]=m.None;[n.Sneak]=m.None;_lastJump=s.Released;_lastSneak=s.Released;onTick(t,e){const o=h.toPlayer(e.unwrap()).unwrap(),r=o.inputInfo.getButtonState(n.Jump),a=o.inputInfo.getButtonState(n.Sneak);r===s.Pressed&&this._lastJump===s.Released?this[n.Jump]=m.Press:r===s.Released&&this._lastJump===s.Pressed?this[n.Jump]=m.Release:this[n.Jump]=m.None,a===s.Pressed&&this._lastSneak===s.Released?this[n.Sneak]=m.Press:a===s.Released&&this._lastSneak===s.Pressed?this[n.Sneak]=m.Release:this[n.Sneak]=m.None,this._lastJump=r,this._lastSneak=a}}export{f as Actor,c as BaseComponent,p as ComponentManager,i as CustomComponent,m as InputChangeState,o as Optional,d as PlayerInputCompatibilityComponent,g as PlayerInputComponent,l as RequireComponents,h as oc};

package/dist/oc/input.js

@@ -0,0 +1,67 @@
+import { ButtonState, InputButton, world } from "@minecraft/server";
+import { BaseComponent } from "./core.js";
+import { oc } from './core.js';
+export var InputChangeState;
+(function (InputChangeState) {
+    InputChangeState[InputChangeState["Press"] = 0] = "Press";
+    InputChangeState[InputChangeState["Release"] = 1] = "Release";
+    InputChangeState[InputChangeState["None"] = 2] = "None";
+})(InputChangeState || (InputChangeState = {}));
+/**
+ * `@minecraft/server` version 2.0.0-beta
+ * 低于此版本请不要使用此组件
+ */
+export class PlayerInputComponent extends BaseComponent {
+    ;
+    [InputButton.Jump] = InputChangeState.None;
+    [InputButton.Sneak] = InputChangeState.None;
+    static setup() {
+        world.afterEvents.playerButtonInput.subscribe(e => {
+            const manager = oc.getManager(e.player.id);
+            const playerInput = manager.getComponent(PlayerInputComponent);
+            playerInput.use(playerInput => {
+                playerInput[e.button] = e.newButtonState === ButtonState.Pressed ? InputChangeState.Press : InputChangeState.Release;
+                manager.afterTick(() => {
+                    playerInput[e.button] = InputChangeState.None;
+                });
+            });
+        });
+    }
+}
+/**
+ * `@minecraft/server` version 1.17.0-beta
+ * 有 1tick 延迟
+ * 条件允许请使用 `PlayerInputComponent`
+ */
+export class PlayerInputCompatibilityComponent extends BaseComponent {
+    ;
+    [InputButton.Jump] = InputChangeState.None;
+    [InputButton.Sneak] = InputChangeState.None;
+    _lastJump = ButtonState.Released;
+    _lastSneak = ButtonState.Released;
+    onTick(manager, en) {
+        const player = oc.toPlayer(en.unwrap()).unwrap();
+        const jump = player.inputInfo.getButtonState(InputButton.Jump);
+        const sneak = player.inputInfo.getButtonState(InputButton.Sneak);
+        if (jump === ButtonState.Pressed && this._lastJump === ButtonState.Released) {
+            this[InputButton.Jump] = InputChangeState.Press;
+        }
+        else if (jump === ButtonState.Released && this._lastJump === ButtonState.Pressed) {
+            this[InputButton.Jump] = InputChangeState.Release;
+        }
+        else {
+            this[InputButton.Jump] = InputChangeState.None;
+        }
+        if (sneak === ButtonState.Pressed && this._lastSneak === ButtonState.Released) {
+            this[InputButton.Sneak] = InputChangeState.Press;
+        }
+        else if (sneak === ButtonState.Released && this._lastSneak === ButtonState.Pressed) {
+            this[InputButton.Sneak] = InputChangeState.Release;
+        }
+        else {
+            this[InputButton.Sneak] = InputChangeState.None;
+        }
+        this._lastJump = jump;
+        this._lastSneak = sneak;
+    }
+}

package/dist/oc/optional.js

@@ -0,0 +1,31 @@
+export class Optional {
+    value;
+    static none() {
+        return new Optional(null);
+    }
+    static some(value) {
+        return new Optional(value);
+    }
+    constructor(value) {
+        this.value = value;
+    }
+    unwrap() {
+        if (!this.isEmpty()) {
+            return this.value;
+        }
+        throw new Error('Optional is empty');
+    }
+    isEmpty() {
+        return this.value === undefined || this.value === null;
+    }
+    orElse(other) {
+        return this.value ?? other;
+    }
+    use(fn, self) {
+        if (!this.isEmpty()) {
+            fn.call(self, this.value);
+            return true;
+        }
+        return false;
+    }
+}

package/doc/sapdon-ts.md

@@ -10,7 +10,7 @@ ts版本拥有更好的类型提示，更严格的类型检查，也可以直接
 比如我们需要注册一个物品，可能你会想去找它在哪，但在ts版本中，你只需要 `@sapdon/core` 就可以了
 
 ```ts
-import { ItemAPI } from '@sapdon/core.js'
+import { ItemAPI } from '@sapdon/core'
 ```
 
 如果你需要更高级的功能，比如你需要一个ts打包器，或者添加命令行的功能，你可以使用 `@sapdon/cli`
@@ -18,11 +18,47 @@ import { ItemAPI } from '@sapdon/core.js'
 ## 从js迁移到ts
 js 的 `main.mjs` 包含了一些预定义的代码：
 ```js
-import { startDevServer } from '@sapdon/cli'
-import { GRegistry, UISystemRegistry } from '@sapdon/core'
+import { registry } from '@sapdon/core'
 
-// 开启开发服务器, 不开启开发服务器无法使用文件同步和热更新
-startDevServer(GRegistry, UISystemRegistry)
+// 进行注册后需进行一次提交, 通知开发服务器更新文件
+registry.setup()
 ```
 如果需要从js迁移到ts，删除 `startDevServer` 那行即可（不删也没事）
 
+
+## OC (Object - Component)
+sapdon通过 `@sapdon/oc` 为sapi提供了一些高级功能, 比如:
+- 实体组件系统
+- 组件间通信
+
+传统的书写方式是通过事件和tick回调来实现功能, 而OC提供了更适合游戏的组件化开发方式
+
+```ts
+import { world, system } from '@minecraft/server'
+import { oc, CustomComponent } from '@sapdon/oc'
+
+world.afterEvents.worldInitialize.subscribe(oc.start)
+
+class MyComponent extends CustomComponent {
+    onTick() {
+        world.sendMessage('tick')
+    }
+}
+```
+
+是的, 我们得到了一个MyComponent, 它每刻都会给玩家发送 'tick'
+但是如果你进入游戏, 会发现它毫无作用, 没错! 因为我们还没有把它到绑定在实体身上!
+
+```ts
+const manager = oc.addEntity(id)
+manager.attachComponent(new MyComponent())
+```
+
+这样就可以了, 我们已经把MyComponent绑定到了entityId为id的实体身上
+
+你也可以动态增删改查组件! 这很方便!
+
+如果你想看它到底是怎么回事,可以从 `examples/oc-core` 开始了解
+
+## [Object - Component](./oc/index.md)
+关于 `@sapdon/oc` 的一切

package/package.json

@@ -1,13 +1,9 @@
 {
     "name": "sapdon",
-    "version": "3.0.2",
-    "main": "dist/core/index.js",
-    "types": "dist/core/index.d.ts",
+    "version": "3.1.0",
     "scripts": {
-        "sapdon": "node dist/cli/index.js",
-        "create": "node dist/cli/index.js create",
-        "build": "node dist/cli/index.js build",
-        "pub": "tsc && npm publish"
+        "build": "rollup -c",
+        "pub": "rollup -c && npm publish"
     },
     "keywords": [
         "bedrock",
@@ -22,15 +18,17 @@
     },
     "description": "Sapdon is a Node.js toolkit designed for building Bedrock Edition Minecraft addon packs.",
     "devDependencies": {
-        "@minecraft/server": "^1.17.0",
+        "@minecraft/server": "^2.0.0-beta.1.21.80-preview.20",
         "@minecraft/server-ui": "^1.3.0",
         "@rollup/plugin-commonjs": "^28.0.2",
         "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^16.0.0",
+        "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
         "@types/lodash": "^4.17.16",
         "@types/node": "^22.13.8",
         "rollup": "^4.30.1",
+        "rollup-plugin-dts": "^6.1.1",
         "rollup-plugin-typescript-paths": "^1.5.0",
         "rollup-plugin-typescript2": "^0.36.0",
         "rollup-plugin-visualizer": "^5.14.0",

package/doc/cli.md

@@ -1,24 +0,0 @@
-# `@sapdon/cli` 包
-
-## 自定义处理器
-```ts
-import { devServer } from '@sapdon/cli'
-devServer.handle('ping', () => {
-    console.log('pong')
-})
-```
-
-## 拦截cli处理器
-```ts
-import { devServer, ServerHandles } from '@sapdon/cli'
-
-devServer.interceptHandler(ServerHandles.WRITE_ADDON, handler => {
-    return (...args: any[]) => {
-        const now = peformance.now()
-        handler.apply(args)
-        const dt = peformance.now() - now
-        console.log(`执行耗时 ${dt}ms.`)
-    }
-})
-```
-