Add shared economy sync and slot unlocks

Author: 54895y

README.md

@@ -4,6 +4,7 @@
 
 - 玩家邮箱
 - 个人仓库
+- 仓库/邮箱格子解锁
 - 位置型实体仓库
 - MatrixShop 外部仓库投递对接
 - CraftEngine / ItemsAdder / Nexo 自定义方块与家具接入
@@ -16,3 +17,9 @@
 
 当前代码库默认支持 `sqlite / mysql / redis / yaml` 四种后端，并接入统一的 Matrix 文档站。
 
+当前新增重点：
+
+- 共享货币定义来自 `MatrixLib`
+- `MatrixLib / MatrixShop / MatrixStorage` 三端同步 `Economy/currency.yml`
+- 仓库与邮箱支持多条件、多价格、多货币解锁格子
+- 玩家总览页可直接执行容量扩容

gradle.properties

@@ -1,8 +1,7 @@
 group=com.y54895.matrixstorage
 version=1.0.0
-matrixlibApiVersion=1.0.1
+matrixlibApiVersion=1.1.0
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true
 kotlin.parallel.tasks.in.project=true
-

src/main/kotlin/com/y54895/matrixstorage/MatrixStorage.kt

@@ -7,6 +7,7 @@ import com.y54895.matrixstorage.command.MatrixStorageCommands
 import com.y54895.matrixstorage.integration.ExternalPlacementSupport
 import com.y54895.matrixstorage.service.BlockWarehouseService
 import com.y54895.matrixstorage.service.MailboxService
+import com.y54895.matrixstorage.service.SlotUnlockConfig
 import com.y54895.matrixstorage.service.StorageConfig
 import com.y54895.matrixstorage.service.StoragePersistenceService
 import com.y54895.matrixstorage.service.StorageStateService
@@ -31,6 +32,7 @@ object MatrixStorage : Plugin() {
     override fun onEnable() {
         try {
             StorageConfig.reload()
+            SlotUnlockConfig.reload()
             StoragePersistenceService.reload()
             StorageStateService.pruneInvalidBlockWarehouses()
             BlockWarehouseService.reload()
@@ -69,4 +71,3 @@ object MatrixStorage : Plugin() {
         )
     }
 }
-

src/main/kotlin/com/y54895/matrixstorage/command/MatrixStorageCommands.kt

@@ -1,9 +1,13 @@
 package com.y54895.matrixstorage.command
 
+import com.y54895.matrixlib.api.economy.MatrixEconomy
 import com.y54895.matrixstorage.MatrixStorageMessages
 import com.y54895.matrixstorage.MatrixStoragePlatform
+import com.y54895.matrixstorage.model.UnlockTarget
 import com.y54895.matrixstorage.service.BlockWarehouseService
 import com.y54895.matrixstorage.service.MailboxService
+import com.y54895.matrixstorage.service.SlotUnlockConfig
+import com.y54895.matrixstorage.service.SlotUnlockService
 import com.y54895.matrixstorage.service.StorageConfig
 import com.y54895.matrixstorage.service.StoragePersistenceService
 import com.y54895.matrixstorage.service.StorageStateService
@@ -44,6 +48,7 @@ object MatrixStorageCommands {
     private fun handleMain(sender: CommandSender, args: Array<out String>): Boolean {
         if (args.isNotEmpty() && args[0].equals("reload", true) && sender.hasPermission("matrixstorage.admin")) {
             StorageConfig.reload()
+            SlotUnlockConfig.reload()
             StoragePersistenceService.reload()
             MatrixStorageMessages.send(sender, "general.reloaded")
             return true
@@ -68,6 +73,7 @@ object MatrixStorageCommands {
         when (args[0].lowercase(Locale.ROOT)) {
             "reload" -> {
                 StorageConfig.reload()
+                SlotUnlockConfig.reload()
                 StoragePersistenceService.reload()
                 MatrixStorageMessages.send(sender, "general.reloaded")
             }
@@ -137,7 +143,10 @@ object MatrixStorageCommands {
                     MatrixStorageMessages.send(player, "general.unknown-player")
                     return true
                 }
-                MailboxService.sendText(player, target, text)
+                if (!MailboxService.sendText(player, target, text)) {
+                    MatrixStorageMessages.send(player, "mailbox.full")
+                    return true
+                }
                 MatrixStorageMessages.send(player, "mailbox.sent", mapOf("target" to target.name))
             }
             "senditem" -> {
@@ -148,7 +157,7 @@ object MatrixStorageCommands {
                     return true
                 }
                 if (!MailboxService.sendItem(player, target, text)) {
-                    MatrixStorageMessages.send(player, "mailbox.empty-hand")
+                    MatrixStorageMessages.send(player, if (player.inventory.itemInMainHand.type == org.bukkit.Material.AIR) "mailbox.empty-hand" else "mailbox.full")
                     return true
                 }
                 MatrixStorageMessages.send(player, "mailbox.sent", mapOf("target" to target.name))
@@ -165,12 +174,28 @@ object MatrixStorageCommands {
                     MatrixStorageMessages.send(player, "general.invalid-number")
                     return true
                 }
+                if (!SlotUnlockService.canReceivePlayerMail(target.uniqueId, target.name)) {
+                    MatrixStorageMessages.send(player, "mailbox.full")
+                    return true
+                }
+                if (!MatrixEconomy.isAvailable("vault")) {
+                    MatrixStorageMessages.send(player, "mailbox.vault-missing")
+                    return true
+                }
+                if (!MatrixEconomy.has(player, "vault", amount)) {
+                    val shortage = MatrixEconomy.shortage(player, "vault", amount, mapOf("target" to target.name))
+                    if (!shortage.denyHandled) {
+                        MatrixStorageMessages.send(player, "mailbox.not-enough-money")
+                    }
+                    return true
+                }
                 if (!MailboxService.sendMoney(player, target, amount, text)) {
                     MatrixStorageMessages.send(player, "mailbox.vault-missing")
                     return true
                 }
                 MatrixStorageMessages.send(player, "mailbox.sent", mapOf("target" to target.name))
             }
+            "unlock" -> StorageMenus.openUnlockMenu(player, UnlockTarget.MAILBOX)
             else -> StorageMenus.openMailbox(player)
         }
         return true
@@ -188,6 +213,7 @@ object MatrixStorageCommands {
         when (args[0].lowercase(Locale.ROOT)) {
             "personal" -> StorageMenus.openWarehouseInventory(player, player.uniqueId, player.name, pending = false)
             "pending" -> StorageMenus.openWarehouseInventory(player, player.uniqueId, player.name, pending = true)
+            "unlock" -> StorageMenus.openUnlockMenu(player, UnlockTarget.WAREHOUSE)
             "open" -> {
                 val record = BlockWarehouseService.block(args.getOrNull(1).orEmpty())
                 if (record == null) {
@@ -273,6 +299,7 @@ internal object BukkitCommandRegistrar {
 
     fun register(command: Command) {
         commandMap()?.register(command.name.lowercase(), command)
+        syncCommands()
     }
 
     private fun commandMap(): CommandMap? {
@@ -295,6 +322,15 @@ internal object BukkitCommandRegistrar {
         }
         throw NoSuchFieldException("commandMap")
     }
+
+    private fun syncCommands() {
+        runCatching {
+            val method = Bukkit.getServer().javaClass.methods.firstOrNull {
+                it.name == "syncCommands" && it.parameterCount == 0
+            } ?: return
+            method.invoke(Bukkit.getServer())
+        }
+    }
 }
 
 internal class MatrixRoutingCommand(
@@ -320,4 +356,3 @@ internal class MatrixRoutingCommand(
         return tabHandler(sender, alias, args).toMutableList()
     }
 }
-

src/main/kotlin/com/y54895/matrixstorage/model/StorageModels.kt

@@ -12,6 +12,7 @@ import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.util.Base64
 import java.util.UUID
+import com.y54895.matrixlib.api.economy.MatrixCurrencyPrice
 
 enum class PlacementSource {
     MINECRAFT,
@@ -80,7 +81,22 @@ data class PlayerWarehouseProfile(
     val ownerId: UUID,
     var ownerName: String,
     var warehouseContents: Array<ItemStack?>,
-    var pendingContents: Array<ItemStack?>
+    var pendingContents: Array<ItemStack?>,
+    var unlockedWarehouseSlots: Int = 0,
+    var unlockedMailboxSlots: Int = 0
+)
+
+enum class UnlockTarget {
+    WAREHOUSE,
+    MAILBOX
+}
+
+data class SlotUnlockRule(
+    val id: String,
+    val target: UnlockTarget,
+    val slots: Int,
+    val conditions: List<String> = emptyList(),
+    val prices: List<MatrixCurrencyPrice> = emptyList()
 )
 
 data class BlockWarehouseRecord(
@@ -153,7 +169,9 @@ data class SnapshotWarehouseProfile(
     val ownerId: String,
     val ownerName: String,
     val warehouseContents: String,
-    val pendingContents: String
+    val pendingContents: String,
+    val unlockedWarehouseSlots: Int = 0,
+    val unlockedMailboxSlots: Int = 0
 )
 
 data class SnapshotBlockWarehouse(
@@ -179,7 +197,7 @@ data class SnapshotBlockWarehouse(
 )
 
 data class StorageSnapshot(
-    val version: Int = 1,
+    val version: Int = 2,
     val mailbox: List<SnapshotMailboxMessage> = emptyList(),
     val warehouseProfiles: List<SnapshotWarehouseProfile> = emptyList(),
     val blockWarehouses: List<SnapshotBlockWarehouse> = emptyList()
@@ -234,4 +252,3 @@ object InventoryCodec {
         }
     }
 }
-