feat: add edit-structure command

Author: leaftail1880

src/lib/form/new.ts

@@ -2,11 +2,10 @@ import { Player } from '@minecraft/server'
 import { ActionFormData, ActionFormResponse } from '@minecraft/server-ui'
 import { ActionForm } from 'lib/form/action'
 import { ask } from 'lib/form/message'
-import { showForm } from 'lib/form/utils'
-import { Message } from 'lib/i18n/message'
+import { FormCallback, showForm } from 'lib/form/utils'
 import { i18n, noI18n } from 'lib/i18n/text'
 import { Quest } from 'lib/quest'
-import { doNothing, util } from 'lib/util'
+import { doNothing } from 'lib/util'
 
 export type NewFormCallback = (player: Player, back?: NewFormCallback) => unknown
 
@@ -133,8 +132,6 @@ class Form {
   }
 
   show = async () => {
-    const callbackExecutor: (fn: VoidFunction) => void = __TEST__ ? f => f() : util.catch
-
     if (!this.buttons.length) this.button(noI18n`Empty`, undefined, this.show)
 
     const response = await showForm(this.form, this.player)
@@ -148,7 +145,17 @@ class Form {
       )
 
     if (typeof callback === 'function') {
-      return callbackExecutor(() => callback(this.player, this.show))
+      if (__TEST__) {
+        // Call right here to throw error
+        await callback(this.player, this.show)
+      } else {
+        try {
+          await callback(this.player, this.show)
+        } catch (e) {
+          new FormCallback(this.form, this.player, this.show).error(String(e))
+          console.error('Form error', e)
+        }
+      }
     }
   }
 }

src/lib/region/command.ts

@@ -54,6 +54,7 @@ const tpdb = table<{ type: string; i: number; enabled: boolean }>('regionTpTest'
 command
   .overload('tp')
   .setPermissions('techAdmin')
+  .setDescription('Входит в режим телепортации по группе регионов. Полезно для поиска данжа')
   .setGroup('test')
   .executes(ctx => {
     const db = tpdb.get(ctx.player.id)

src/lib/region/form.ts

@@ -1,5 +1,4 @@
 import { Player, world } from '@minecraft/server'
-import { ArrayForm, BUTTON, FormCallback, inspect, ModalForm, Region, Vec } from 'lib'
 import { parseArguments, parseLocationArguments } from 'lib/command/utils'
 import { form, NewFormCallback, NewFormCreator } from 'lib/form/new'
 import { i18n, noI18n, textTable } from 'lib/i18n/text'
@@ -10,6 +9,12 @@ import { FlattenedSphereArea } from './areas/flattened-sphere'
 import { RectangleArea } from './areas/rectangle'
 import { SphereArea } from './areas/sphere'
 import { regionTypes } from './command'
+import { Region } from './kinds/region'
+import { ArrayForm } from 'lib/form/array'
+import { BUTTON, FormCallback } from 'lib/form/utils'
+import { ModalForm } from 'lib/form/modal'
+import { Vec } from 'lib/vector'
+import { inspect } from 'lib/utils/inspect'
 
 export const regionForm = form((f, { player, self }) => {
   f.title(noI18n`Управление регионами`)

src/modules/test/edit-structure.ts

@@ -0,0 +1,69 @@
+import { BlockVolume, LocationInUnloadedChunkError, world } from '@minecraft/server'
+import { MinecraftBlockTypes } from '@minecraft/vanilla-data'
+import { Region, Vec } from 'lib'
+import { StructureDungeonsId } from 'lib/assets/structures'
+import { form } from 'lib/form/new'
+import { noI18n } from 'lib/i18n/text'
+
+const f = form((f, { player }) => {
+  for (const [name, id] of Object.entries(StructureDungeonsId)) {
+    let details = noI18n.error`Не удалось найти структуру`
+    const structure = world.structureManager.get(id)
+    if (structure) {
+      details = Vec.string(structure.size, true)
+    }
+
+    f.button(`${name}\n${details}`, () => {
+      if (!structure) return player.fail('Не удалось найти структуру')
+
+      const box = new BlockVolume(
+        Vec.floor(player.location),
+        Vec.add(player.location, structure.size).add(Vec.up).floor(),
+      )
+      const dimension = player.dimension
+
+      try {
+        for (const location of dimension
+          .getBlocks(box, { excludeTypes: [MinecraftBlockTypes.Air] })
+          .getBlockLocationIterator()) {
+          player.fail(
+            noI18n.error`Блок на ${location} (${dimension.getBlock(location)?.typeId}) не является воздухом. Невозможно установить структуру`,
+          )
+          return
+        }
+      } catch (e) {
+        if (e instanceof LocationInUnloadedChunkError) return player.fail(noI18n.error`Область не прогружена: ${e}`)
+        throw e
+      }
+
+      const structureBlock = dimension.getBlock(Vec.floor(player.location))
+      if (!structureBlock) return player.fail(noI18n.error`Не работает`)
+
+      structureBlock.setType(MinecraftBlockTypes.StructureBlock)
+
+      const start = Vec.floor(player.location).add(Vec.up)
+      for (const vector of Vec.forEach(start, Vec.add(start, structure.size).substract(Vec.one))) {
+        dimension.setBlockType(vector, MinecraftBlockTypes.StructureVoid)
+      }
+
+      world.structureManager.place(structure, dimension, start)
+
+      player.success(
+        'Установлено. Как закончите редактировать, сохраните вручную и удалите топориком пушто майн не дает автоматизировать это :(',
+      )
+    })
+  }
+})
+
+new Command('edit-structure')
+  .setDescription('Редактирует структуру для дальнейшего сохранения. Полезно для настройки лута данжей')
+  .setPermissions('techAdmin')
+  .executes(ctx => {
+    const region = Region.getAt(ctx.player)
+    if (region)
+      return ctx.player.fail(
+        noI18n.error`Невозможно установить структуру в регионе ${region.displayName ?? region.name}, найдите место без региона и других построек`,
+      )
+
+    f.command(ctx)
+  })

src/modules/test/test.ts

@@ -50,6 +50,7 @@ import { requestAirdrop } from 'modules/places/anarchy/airdrop'
 import { BaseRegion } from 'modules/places/base/region'
 import { skipForBlending } from 'modules/world-edit/utils/blending'
 import loot from '../quests/learning/airdrop'
+import './edit-structure'
 import './enchant'
 import './load-chunks'
 import './minimap'

src/modules/world-edit/commands/region/set/set-command.ts

@@ -11,7 +11,7 @@ const set = new Command('set')
 set
   .string('block')
   .array('mode', Object.keys(REPLACE_MODES), true)
-  .string('replaceBlock')
+  .string('replaceBlock', true)
   .executes((ctx, block, replaceMode = '', replaceBlock) => {
     const we = WorldEdit.forPlayer(ctx.player)
     if (!we.selection) return ctx.reply('§cЗона не выделена!')