Merge pull request #116 from xBoyMinemc/每个玩家享受单独的假人额度（目前5）

每个玩家享受单独的假人额度（目前5）

Author: xBoyMinemc

README.md

@@ -110,11 +110,6 @@
 
 ## 开发者信息 (Developer Info)
 
-### TODO List
-- [ ] 编写测试用例
-- [ ] 开发一个基础的 UI 界面
-- [ ] 重构构建系统https://github.com/xBoyMinemc/FlashFakePlayerPack/pull/110
-
 ### 打包与发布流程
 1. 创建并推送一个新 tag，tag 名称以 `v` 开头（如 `v1.0.0`），这会通过 GitHub Actions 自动触发发布流程。
 2. 流程会执行以下步骤：

pack_icon.png

@@ -64,7 +64,7 @@ const archive = archiver('zip', {
 
 // 如果你想要在ZIP文件中添加多个文件，可以多次调用append方法
 archive.append(fs.createReadStream('manifest.json'), { name: 'manifest.json' });
-archive.append(fs.createReadStream('pack_icon.png'), { name: 'pack_icon.png' });
+// archive.append(fs.createReadStream('pack_icon.png'), { name: 'pack_icon.png' });
 // 使用directory方法添加整个目录到ZIP文件中
 ['structures','entities','scripts/main'].forEach(_=>archive.directory(_, true)); // 第二个参数设置为false表示不包含目录本身
 

packer.js

@@ -5,7 +5,7 @@ import type {
     spawnedEvent,
     spawnedEventSignal,
 } from '../@types/globalThis'
-import {Dimension, LocationOutOfWorldBoundariesError, system, Vector3} from '@minecraft/server'
+import { Dimension, LocationOutOfWorldBoundariesError, Player, system, Vector3 } from '@minecraft/server'
 
 import { register } from '@minecraft/server-gametest'
 
@@ -30,23 +30,23 @@ import './plugins/task'
 import './plugins/gui'
 import './plugins/autoFishing'
 import './plugins/killedBySimPlayer'
-import './plugins/setting'
+// import './plugins/setting'
 import './plugins/showCommandsList'
-import {playerMove} from "../lib/xboyEvents/move";
+import { playerMove } from "../lib/xboyEvents/move";
 import { cannotHandledExceptionWarningText, CommandError, commandManager, getLocationFromEntityLike } from '../lib/yumeCommand/CommandRegistry';
 import '../lib/yumeCommand/scriptEventHandler'
 
 const overworld = world.getDimension('overworld')
-const tickWaitTimes = 20*60*60*24*365
+const tickWaitTimes = 20 * 60 * 60 * 24 * 365
+const max_simulatedPlayerCount = 5
 // all of SimulatedPlayer List
-export const simulatedPlayers  = {}
+export const simulatedPlayers = {}
 
 // simulatedPlayers[PID] = simulatedPlayer;
 // simulatedPlayers[simulatedPlayer.id] = PID;
 
 export let initSucceed = false
 
-
 let randomTickSpeed = 1
 let doDayLightCycle = true
 let doMobSpawning = true
@@ -55,51 +55,119 @@ let doMobSpawning = true
 
     randomTickSpeed = world.gameRules.randomTickSpeed
     doDayLightCycle = world.gameRules.doDayLightCycle
-    doMobSpawning   = world.gameRules.doMobSpawning
+    doMobSpawning = world.gameRules.doMobSpawning
 
-    world.sendMessage('[模拟玩家] 随机刻->'+randomTickSpeed+'时间->'+doDayLightCycle+'生物生成->'+doMobSpawning)
+    world.sendMessage('[模拟玩家] 随机刻->' + randomTickSpeed + '时间->' + doDayLightCycle + '生物生成->' + doMobSpawning)
 }
 //  ?
 
-let spawnSimulatedPlayer : (location:Vector3, dimension:Dimension, pid: number  )=>SimulatedPlayer
-let spawnSimulatedPlayerByNameTag : (location:Vector3, dimension:Dimension, nameTag: string  )=>SimulatedPlayer
-let testWorldLocation : Vector3
-let testWorldDimension : Dimension
+let spawnSimulatedPlayerByNameTag: (location: Vector3, dimension: Dimension, nameTag: string) => SimulatedPlayer
+let testWorldLocation: Vector3
+let testWorldDimension: Dimension
+
+
+if (!world.structureManager.get('xboyMinemcSIM:void'))
+    world.structureManager.createEmpty('xboyMinemcSIM:void', { x: 1, y: 1, z: 1 }).saveToWorld()
+
+const GetGlobalPID = () => world.scoreboard.getObjective('##FlashPlayer##').addScore('##currentPID', 1)
+
+// 新增每个玩家的个人假人控制ID
+// 使用一个动态属性来管理每个玩家的个人假人控制ID
+// 为了一致所以暂不全部迁移到动态属性
+const currentPID4EveryPlayer = new Map<string, number>()
+const GetCurrentPID4Player = (playerId: string): number | null => {
+    const _max_simulatedPlayerCount = GetPlayerSimulatedPlayerCount(playerId)
+    if (_max_simulatedPlayerCount <= 0) return null
+    const value = currentPID4EveryPlayer.get(playerId) ?? 0
+
+    // 获取此玩家当前可用假人数量
+    const valid_CurrentPID_List = []
+    for (let i = 1; i <= _max_simulatedPlayerCount; i++) {
+        const PID = GetPlayerPID2GlobalPID(playerId, i)
+        if (!PID) { valid_CurrentPID_List.push(i); continue }
+        if (!simulatedPlayers[PID]?.isValid) { valid_CurrentPID_List.push(i); continue }
+    }
+
+
+    if (valid_CurrentPID_List.length <= 0) return null
+    return currentPID4EveryPlayer.set(playerId, value + 1).get(playerId)
+}
+// 将这个这个每次重启游戏重置为1的玩家假人PID和全局递增PID挂钩并且存储在动态属性以供持久化假人信息
+// 每次玩家请求一个假人都会分配一个玩家个人假人PID
+// 如果查询到这个玩家的个人假人PID和全局挂钩则将此个人假人PID指向此全局PID以关联持久化信息
+// 否则获取一个新的全局PID关联到此假人并且存储到动态属性
+// simulatedPlayers中依旧使用全局PID
+function SetPlayerPID2GlobalPID(playerId: string, CurrentPID4Player: number, GlobalPID: number) {
+    // const ex = {
+    //     "-56789": {
+    //         "GlobalPID": 1234567890
+    //     }
+    // }
+    // 苦一苦存储，骂名我来担
+    let data = <string>world.getDynamicProperty("info4EveryPlayer_" + playerId) ?? "{}"
+    const dataObject = JSON.parse(data)
+    if (!dataObject[CurrentPID4Player])
+        dataObject[CurrentPID4Player] = {}
+    dataObject[CurrentPID4Player]["GlobalPID"] = GlobalPID
+    data = JSON.stringify(dataObject)
+    world.setDynamicProperty("info4EveryPlayer_" + playerId, data)
+}
+const GetPlayerPID2GlobalPID = (playerId: string, CurrentPID4Player: number): number => {
+    const data = <string>world.getDynamicProperty("info4EveryPlayer_" + playerId) ?? "{}"
+    const dataObject = JSON.parse(data)
+    let GlobalPID = dataObject?.[CurrentPID4Player]?.GlobalPID
+    if (!GlobalPID)
+        SetPlayerPID2GlobalPID(playerId, CurrentPID4Player, GlobalPID = GetGlobalPID())
+    return GlobalPID as number
+}
 
+// 每个玩家享受单独的假人限额
+const GetPlayerSimulatedPlayerCount = (playerId: string): number => {
+    const data = <string>world.getDynamicProperty("info4EveryPlayer_" + playerId) ?? "{}"
+    const dataObject = JSON.parse(data)
+    let _max_simulatedPlayerCount = dataObject?._max_simulatedPlayerCount
+    if (!_max_simulatedPlayerCount) {
+        _max_simulatedPlayerCount = max_simulatedPlayerCount
+        SetPlayerSimulatedPlayerCount(playerId, _max_simulatedPlayerCount)
+        world.sendMessage('[模拟玩家] 每个玩家享受单独的假人限额: ' + _max_simulatedPlayerCount)
+    }
+    return _max_simulatedPlayerCount as number
+}
 
-if(!world.structureManager.get('xboyMinemcSIM:void'))
-    world.structureManager.createEmpty('xboyMinemcSIM:void', { x:1, y:1, z:1 }).saveToWorld()
+const SetPlayerSimulatedPlayerCount = (playerId: string, count: number) => {
+    let data = <string>world.getDynamicProperty("info4EveryPlayer_" + playerId) ?? "{}"
+    const dataObject = JSON.parse(data)
+    dataObject._max_simulatedPlayerCount = count
+    data = JSON.stringify(dataObject)
+    world.setDynamicProperty("info4EveryPlayer_" + playerId, data)
+}
 
-let currentPID = 0
-const GetPID = ()=> ++currentPID
 
 
-export const initialized : initializedEventSignal = new EventSignal<initializedEvent>()
-export const spawned : spawnedEventSignal = new EventSignal<spawnedEvent>()
+export const initialized: initializedEventSignal = new EventSignal<initializedEvent>()
+export const spawned: spawnedEventSignal = new EventSignal<spawnedEvent>()
 
-register('我是云梦', '假人', (test:Test) => {
-    testWorldLocation = test.worldBlockLocation({ x:0, y:0, z:0 })
-    testWorldLocation["worldBlockLocation"] = (v3:Vector3)=> test.worldBlockLocation(v3)
+register('我是云梦', '假人', (test: Test) => {
+    testWorldLocation = test.worldBlockLocation({ x: 0, y: 0, z: 0 })
+    testWorldLocation["worldBlockLocation"] = (v3: Vector3) => test.worldBlockLocation(v3)
 
 
     world.gameRules.randomTickSpeed = randomTickSpeed
     world.gameRules.doDayLightCycle = doDayLightCycle
     world.gameRules.doMobSpawning = doMobSpawning
 
-    spawnSimulatedPlayer = (location:Vector3, dimension:Dimension, pid: number ):SimulatedPlayer=>{
-        return spawnSimulatedPlayerByNameTag(location, dimension, `工具人-${pid}`)
-    }
-    spawnSimulatedPlayerByNameTag = (location:Vector3, dimension:Dimension, nameTag: string ):SimulatedPlayer=>{
+    spawnSimulatedPlayerByNameTag = (location: Vector3, dimension: Dimension, nameTag: string): SimulatedPlayer => {
 
-        const simulatedPlayer = test.spawnSimulatedPlayer({ x:0, y:8, z:0 }, nameTag)
+        // 是的，这个nameTag在这里实际先被作为name
+        const simulatedPlayer = test.spawnSimulatedPlayer({ x: 0, y: 8, z: 0 }, nameTag)
         simulatedPlayer.addTag('Backpack2Barrel_init')
         simulatedPlayer.addTag(SIGN.YUME_SIM_SIGN)
         simulatedPlayer.addTag(SIGN.AUTO_RESPAWN_SIGN)
         try {
             //@ts-ignore
-            simulatedPlayer.setSpawnPoint({...location, dimension})
+            simulatedPlayer.setSpawnPoint({ ...location, dimension })
             //@ts-ignore
-            simulatedPlayer.teleport(location, {dimension})
+            simulatedPlayer.teleport(location, { dimension })
         } catch (e) {
             if (e instanceof LocationOutOfWorldBoundariesError) {
                 console.warn('[模拟玩家] 有东西尝试在非法位置生成假人，已阻止');
@@ -116,59 +184,40 @@ register('我是云梦', '假人', (test:Test) => {
     initSucceed = true
     console.log('[模拟玩家] 初始化完成，输入“假人创建”或“ffpp”')
 })
-.maxTicks(tickWaitTimes)
-.structureName('xboyMinemcSIM:void');
+    .maxTicks(tickWaitTimes)
+    .structureName('xboyMinemcSIM:void');
 // .maxTicks(2)
 // .maxAttempts(tickWaitTimes)
 // .requiredSuccessfulAttempts(tickWaitTimes)
 // .padding(0)
 
-    // 记分板PID初始化 写的烂 执行两次
-    verify()
-    verify()
-
-    let z = 11451400 +  Math.floor(Math.random() * 114514 * 19 )
-    z -= z%16
-    system.run(()=>{
-        try {
-            overworld.runCommand('execute positioned 15000000 256 ' + z + ' run gametest run 我是云梦:假人');
-            testWorldDimension = overworld
-        } catch (e) {
-            world.sendMessage('[模拟玩家] 报错了，我也不知道为什么' + e);
-        }
-    });
+// 记分板PID初始化 写的烂 执行两次
+verify()
+verify()
+
+let z = 11451400 + Math.floor(Math.random() * 114514 * 19)
+z -= z % 16
+system.run(() => {
+    try {
+        overworld.runCommand('execute positioned 15000000 256 ' + z + ' run gametest run 我是云梦:假人');
+        testWorldDimension = overworld
+    } catch (e) {
+        world.sendMessage('[模拟玩家] 报错了，我也不知道为什么' + e);
+    }
+});
 
 
 let say = false
-playerMove.subscribe(()=>{
+playerMove.subscribe(() => {
     if (say) return
     say = true
     world.sendMessage('[模拟玩家] 初始化完成，输入“假人创建”或“ffpp”')
     //添加第二行提示
     world.sendMessage('[模拟玩家] 输入“假人帮助”以获取使用说明')
 })
 
-    // initialized.subscribe(()=> console.error('[模拟玩家]初始化完毕，加载内置插件') )
-    // initialized.subscribe(()=>
-    // {
-    // }
-    //     // 'test',
-    //     // 'chatSpawn',
-    //     // 'command',
-    //     // 'breakBlock',
-    //     // 'youAreMine',
-    //     // 'help',
-    //     // 'task',
-    //     // 'gui',
-    //     // 'autoFishing',
-    //     // 'killedBySimPlayer',
-    //     // 'setting',
-    //     // 'Deja Vu Yan Returns',
-    //     // '鱼肉 ‭‭‭⁧⁧⁧~咕噜咕噜',
-    //
-    // )
-
-world.beforeEvents.chatSend.subscribe(({message, sender}) => {
+
+world.beforeEvents.chatSend.subscribe(({ message, sender }) => {
     system.run(() => {
         try {
             commandManager.execute(message, {
@@ -185,5 +234,5 @@ world.beforeEvents.chatSend.subscribe(({message, sender}) => {
     });
 });
 
-export { spawnSimulatedPlayer,spawnSimulatedPlayerByNameTag,testWorldLocation,testWorldDimension,GetPID }
+export { spawnSimulatedPlayerByNameTag, testWorldLocation, testWorldDimension, GetGlobalPID, GetCurrentPID4Player, GetPlayerPID2GlobalPID }
 

tscripts/xTerrain/main.ts

@@ -117,7 +117,7 @@ async function saveAllFakePlayerBackpack() {
         if (!_SimulatedPlayer.isValid) return
         const index = Number(PID) * 3
         if (index < 0) return
-        let void_count = 0
+        let void_count = 0 // 空缺的存储木桶数量
 
         const location0 = addVector3(structure_location, indexToVector3(index + 0))
         const block_backpack = testWorldDimension.getBlock(location0)
@@ -163,7 +163,7 @@ async function saveAllFakePlayerBackpack() {
             })
 
             _SimulatedPlayer.removeTag("Backpack2Barrel_init")
-            world.sendMessage(`${_SimulatedPlayer.name} 背包还原成功`)
+            world.sendMessage(`${_SimulatedPlayer.name} 背包还原->正常`)
             return
         }
 
@@ -204,6 +204,18 @@ async function saveAllFakePlayerBackpack() {
 
 }
 
+export function getFakePlayerNameTag(PID: number):string | null {
+    const index = Number(PID) * 3 + 1
+    if (index < 0) return
+    const location = addVector3(structure_location, indexToVector3(index))
+    const block = testWorldDimension.getBlock(location)
+    if (block.type.id !== VoidBarrel.id) {
+        return null
+    }
+    const inv = block.getComponent("minecraft:inventory")
+    const con = inv.container
+    return con.getItem(15).nameTag
+}
 
 
 system.runInterval(async () => {

tscripts/xTerrain/plugins/Backpack2Barrel.ts

@@ -1,3 +1,3 @@
 // 似曾相识燕归来
 
-
+// 实际上这个空文件是当时为了实现保存和恢复假人信息而存在的

tscripts/xTerrain/plugins/Deja Vu Yan Returns.ts

@@ -1,15 +1,16 @@
 import type {SimulatedPlayer} from '@minecraft/server-gametest'
 
 import {
-    GetPID, initSucceed,
+    GetCurrentPID4Player,
+    GetGlobalPID, GetPlayerPID2GlobalPID, initSucceed,
     simulatedPlayers,
     spawned as spawnedEvent,
-    spawnSimulatedPlayer,
     spawnSimulatedPlayerByNameTag
 } from '../main'
 import { type CommandInfo, commandManager, Command } from '../../lib/yumeCommand/CommandRegistry'
 import { Dimension, Vector3, world, type Player } from '@minecraft/server'
 import {xyz_dododo} from "../../lib/xboyPackage/xyz_dododo";
+import { getFakePlayerNameTag } from './Backpack2Barrel';
 
 const overworld = world.getDimension("overworld");
 
@@ -19,18 +20,22 @@ const spawnAndRegisterSimulatedPlayer = (entity: Player | undefined, location: V
         return;
     }
 
-    const PID = GetPID();
+    const PlayerPID = GetCurrentPID4Player(entity.id);
+    if (!PlayerPID) {
+        entity?.sendMessage('[模拟玩家] 假人数量已达上限，请删除假人后再试');
+        return;
+    }
+    const GlobalPID = GetPlayerPID2GlobalPID(entity.id, PlayerPID);
+    const name = getFakePlayerNameTag(GlobalPID) ?? nameTag ?? ((entity?.name ?? 'flash') + PlayerPID)
     const __FlashPlayer__ = world.scoreboard.getObjective('##FlashPlayer##');
-    const simulatedPlayer: SimulatedPlayer = nameTag
-        ? spawnSimulatedPlayerByNameTag(location, dimension, nameTag)
-        : spawnSimulatedPlayer(location, dimension, PID);
+    const simulatedPlayer: SimulatedPlayer = spawnSimulatedPlayerByNameTag(location, dimension, name)
 
 
-    simulatedPlayers[PID] = simulatedPlayer;
-    simulatedPlayers[simulatedPlayer.id] = PID;
+    simulatedPlayers[GlobalPID] = simulatedPlayer;
+    simulatedPlayers[simulatedPlayer.id] = GlobalPID;
 
-    spawnedEvent.trigger({ spawnedSimulatedPlayer: simulatedPlayer, PID });
-    __FlashPlayer__.setScore(simulatedPlayer.id, PID);
+    spawnedEvent.trigger({ spawnedSimulatedPlayer: simulatedPlayer, PID:GlobalPID });
+    __FlashPlayer__.setScore(simulatedPlayer.id, GlobalPID);
 };
 
 const chatSpawnCommand = new Command();

tscripts/xTerrain/plugins/chatSpawn.ts

@@ -0,0 +1 @@
+// 但是这个真的忘记是准备写什么了。