@occultus/music-api 0.22.0-beta.1 → 0.22.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/music-api",
-  "version": "0.22.0-beta.1",
+  "version": "0.22.0-beta.3",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"

package/src/api/Bindings/ComponentParams.ts

@@ -2,7 +2,7 @@ export type MusicDiscComponentParams = {
   /**
    * 音轨名称
    */  
-  trackName: string;
+  track_name: string;
   /**
    * 音乐唱片名称
    */

package/src/api/Bindings/MusicDiscServerBindings.ts

@@ -1,74 +1,41 @@
 import { OccultusSDKError } from "@occultus/core";
 import { MusicDiscBindingConfig } from "./BindingConfig";
-import { ItemStack, system, Vector3, world } from "@minecraft/server";
+import {
+  ItemStack,
+  system,
+  Vector3,
+  world,
+  PlayerBreakBlockBeforeEvent,
+  PlayerInteractWithBlockBeforeEvent
+} from "@minecraft/server";
 import { Color } from "@occultus/format-api";
 import { MusicDiscComponentParams } from "./ComponentParams";
 
 export class MusicDiscServerBindings {
   private static instance: MusicDiscServerBindings;
-  private static getTrackName(itemStack: ItemStack) {
+  static getTrackName(itemStack: ItemStack) {
     const config = MusicDiscServerBindings.getInstance().config;
     const params = itemStack.getComponent(config.componentName)
       ?.customComponentParameters.params as MusicDiscComponentParams;
-    return params.trackName;
+    return params.track_name;
   }
   private registryComponent(config: MusicDiscBindingConfig) {
     system.beforeEvents.startup.subscribe((arg) => {
-      arg.itemComponentRegistry.registerCustomComponent(config.componentName, {
-        onUseOn(event, arg1) {
-          const { source, block } = event;
-          if (block?.typeId !== "minecraft:jukebox") return;
-          if (source?.isSneaking) return;
-          const params = arg1.params as MusicDiscComponentParams;
-          block.dimension.playSound(params.trackName, block.location);
-          block.dimension
-            .getPlayers({
-              location: block.location,
-              minDistance: 0,
-              maxDistance: 10
-            })
-            .forEach((player) => {
-              player.onScreenDisplay.setActionBar([
-                Color.lightPurple,
-                {
-                  translate: "record.nowPlaying",
-                  with: [`${params.artist} - ${params.name}`]
-                }
-              ]);
-            });
-          return;
-        }
-      });
+      arg.itemComponentRegistry.registerCustomComponent(
+        config.componentName,
+        {}
+      );
     });
   }
   private subscribeEvents(config: MusicDiscBindingConfig) {
-    world.beforeEvents.playerInteractWithBlock.subscribe((event) => {
-      const { block, player } = event;
-      if (block?.typeId !== "minecraft:jukebox") return;
-      if (player?.isSneaking) return;
-      const musicDisc = block?.getComponent("record_player")?.getRecord();
-      if (!musicDisc) return;
-      const sound = MusicDiscServerBindings.getTrackName(musicDisc);
-      if (sound) {
-        system.run(() => {
-          player.runCommand(`stopsound @a ${sound}`);
-        });
-      }
+    world.beforeEvents.playerInteractWithBlock.subscribe((arg) => {
+      inputListener(arg, config);
+    });
+    world.beforeEvents.playerInteractWithBlock.subscribe((arg) => {
+      removeListener(arg);
     });
-    world.beforeEvents.playerBreakBlock.subscribe((event) => {
-      const { block, player } = event;
-      if (block?.typeId !== "minecraft:jukebox") return;
-      if (player?.isSneaking) return;
-      const recordComponent = block.getComponent("record_player");
-      if (!recordComponent) return;
-      const record = recordComponent.getRecord();
-      if (!record) return;
-      const sound = MusicDiscServerBindings.getTrackName(record);
-      if (sound) {
-        system.run(() => {
-          player.runCommand(`stopsound @a ${sound}`);
-        });
-      }
+    world.beforeEvents.playerBreakBlock.subscribe((arg) => {
+      breakListener(arg);
     });
   }
   private constructor(public config: MusicDiscBindingConfig) {
@@ -77,7 +44,7 @@ export class MusicDiscServerBindings {
   }
   /**
    * 创建绑定实例
-   * @param config 
+   * @param config
    * @throws OccultusSDKError 倘若已创建绑定实例
    */
   static create(config: MusicDiscBindingConfig) {
@@ -88,7 +55,7 @@ export class MusicDiscServerBindings {
   }
   /**
    * 获取绑定实例
-   * @returns 
+   * @returns
    * @throws OccultusSDKError 倘若未创建绑定实例
    */
   static getInstance(): MusicDiscServerBindings {
@@ -98,3 +65,78 @@ export class MusicDiscServerBindings {
     return MusicDiscServerBindings.instance;
   }
 }
+
+export function breakListener(event: PlayerBreakBlockBeforeEvent) {
+  const block = event.block;
+  const player = event.player;
+  if (block?.typeId !== "minecraft:jukebox") return;
+  if (player?.isSneaking) return;
+  const recordComponent = block.getComponent("record_player");
+  if (!recordComponent) return;
+  const record = recordComponent.getRecord();
+  if (!record) return;
+  const sound = MusicDiscServerBindings.getTrackName(record);
+  if (sound) {
+    system.run(() => {
+      player.runCommand(`stopsound @a ${sound}`);
+    });
+  }
+}
+
+export function removeListener(event: PlayerInteractWithBlockBeforeEvent) {
+  const block = event.block;
+  const player = event.player;
+  if (block?.typeId !== "minecraft:jukebox") return;
+  if (player?.isSneaking) return;
+  const record = block?.getComponent("record_player")?.getRecord();
+  if (!record) return;
+  const sound = MusicDiscServerBindings.getTrackName(record);
+  if (sound) {
+    system.run(() => {
+      player.runCommand(`stopsound @a ${sound}`);
+    });
+  }
+}
+
+export function inputListener(
+  event: PlayerInteractWithBlockBeforeEvent,
+  config: MusicDiscBindingConfig
+) {
+  const { player, itemStack, block } = event;
+  if (!itemStack) return;
+  if (block?.typeId !== "minecraft:jukebox") return;
+  if (player?.isSneaking) return;
+  const component = itemStack.getComponent(config.componentName);
+  if (!component) return;
+  const { track_name, artist, name } = component.customComponentParameters
+    .params as MusicDiscComponentParams;
+  if (itemStack) {
+    if (track_name && !block?.getComponent("record_player")?.isPlaying()) {
+      system.run(() => {
+        block.dimension.playSound(track_name, block.location);
+        block.dimension
+          .getPlayers({
+            location: block.location,
+            minDistance: 0,
+            maxDistance: 10
+          })
+          .forEach((player) => {
+            player.onScreenDisplay.setActionBar([
+              Color.lightPurple,
+              {
+                translate: "record.nowPlaying",
+                with: [`${artist} - ${name}`]
+              }
+            ]);
+          });
+      });
+    } else if (
+      track_name &&
+      block?.getComponent("record_player")?.isPlaying()
+    ) {
+      system.run(() => {
+        player.runCommand(`stopsound @a ${track_name}`);
+      });
+    }
+  }
+}