Merge remote-tracking branch 'origin/v2' into v2

Author: ItsFlicker

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerAnvilChange.kt

@@ -5,7 +5,10 @@ import me.arasple.mc.trchat.module.adventure.toAdventure
 import me.arasple.mc.trchat.module.internal.TrChatBukkit
 import me.arasple.mc.trchat.util.color.MessageColors
 import me.arasple.mc.trchat.util.parseSimple
+import me.arasple.mc.trchat.util.data
+import me.arasple.mc.trchat.util.session
 import org.bukkit.entity.HumanEntity
+import org.bukkit.entity.Player
 import org.bukkit.event.inventory.InventoryType
 import org.bukkit.event.inventory.PrepareAnvilEvent
 import org.bukkit.inventory.meta.ItemMeta
@@ -18,6 +21,8 @@ import taboolib.library.reflex.Reflex.Companion.invokeMethod
 import taboolib.module.configuration.ConfigNode
 import taboolib.platform.util.isAir
 import taboolib.platform.util.modifyMeta
+import taboolib.platform.util.sendLang
+import me.arasple.mc.trchat.module.internal.data.PlayerData
 
 /**
  * @author ItsFlicker
@@ -38,17 +43,34 @@ object ListenerAnvilChange {
     var simple = false
         private set
 
+    @ConfigNode("Chat.Permission-Check.Anvil", "settings.yml")
+    var anvilPermissionCheck = false
+
     @Suppress("Deprecation")
     @SubscribeEvent(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     fun onAnvilCraft(e: PrepareAnvilEvent) {
         // e.view -> AnvilView
         // java.lang.IncompatibleClassChangeError: Found class org.bukkit.inventory.InventoryView, but interface was expected
-        val p = e.invokeMethod<Any>("getView")!!.invokeMethod<HumanEntity>("getPlayer")!!
+        val p = e.invokeMethod<Any>("getView")!!.invokeMethod<HumanEntity>("getPlayer")!! as? Player ?: return
         val result = e.result
 
         if (e.inventory.type != InventoryType.ANVIL || result.isAir()) {
             return
         }
+
+        val left = e.inventory.getItem(0)      // 左侧输入槽物品
+        val right = e.inventory.getItem(1)     // 右侧输入槽物品
+        val resultName = result.itemMeta?.displayName
+        val leftName = left?.itemMeta?.displayName
+        val rightName = right?.itemMeta?.displayName
+        val isRenaming = resultName != null && resultName != leftName && resultName != rightName
+
+        if (anvilPermissionCheck && isRenaming && !canSpeak(p)) {
+            e.result = null
+            p.sendLang("Anvil-Edit-No-Permission")
+            return
+        }
+
         result.modifyMeta<ItemMeta> {
             if (!hasDisplayName()) {
                 return@modifyMeta
@@ -64,4 +86,11 @@ object ListenerAnvilChange {
         }
         e.result = result
     }
+
+    private fun canSpeak(player: Player): Boolean {
+        if (TrChatBukkit.isGlobalMuting && !player.hasPermission("trchat.bypass.globalmute")) return false
+        if (player.data.isMuted) return false
+        val channel = player.session.getChannel()
+        return channel == null || channel.canSpeak(player)
+    }
 }

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerBookEdit.kt

@@ -1,12 +1,17 @@
 package me.arasple.mc.trchat.module.internal.listener
 
+import me.arasple.mc.trchat.module.internal.TrChatBukkit
 import me.arasple.mc.trchat.util.color.MessageColors
+import me.arasple.mc.trchat.util.data
+import me.arasple.mc.trchat.util.session
+import org.bukkit.entity.Player
 import org.bukkit.event.player.PlayerEditBookEvent
 import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.module.configuration.ConfigNode
+import taboolib.platform.util.sendLang
 
 /**
  * @author ItsFlicker
@@ -19,6 +24,9 @@ object ListenerBookEdit {
     var color = true
         private set
 
+    @ConfigNode("Chat.Permission-Check.Book", "settings.yml")
+    var bookEditPermissionCheck = false
+
     @Suppress("Deprecation")
     @SubscribeEvent(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     fun onBookEdit(e: PlayerEditBookEvent) {
@@ -29,4 +37,21 @@ object ListenerBookEdit {
         }
         e.newBookMeta = meta
     }
+
+    @SubscribeEvent(priority = EventPriority.LOW, ignoreCancelled = true)
+    fun onBookEditCheck(e: PlayerEditBookEvent) {
+        if (!bookEditPermissionCheck) return
+        val player = e.player
+        if (!player.hasPermission("trchat.bypass.bookedit") && !canSpeak(player)) {
+            e.isCancelled = true
+            player.sendLang("Book-Edit-No-Permission")
+        }
+    }
+
+    private fun canSpeak(player: Player): Boolean {
+        if (TrChatBukkit.isGlobalMuting && !player.hasPermission("trchat.bypass.globalmute")) return false
+        if (player.data.isMuted) return false
+        val channel = player.session.getChannel()
+        return channel == null || channel.canSpeak(player)
+    }
 }

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerSignChange.kt

@@ -29,7 +29,7 @@ object ListenerSignChange {
     var filter = true
         private set
 
-    @ConfigNode("Chat.Sign-Edit-Permission-Check", "settings.yml")
+    @ConfigNode("Chat.Permission-Check.Sign", "settings.yml")
     var signEditPermissionCheck = false
 
     @ConfigNode("Color.Sign", "settings.yml")

project/runtime-bukkit/src/main/resources/lang/en_US.yml

@@ -226,7 +226,21 @@ Channel-Bad-Language:
     pitch: 0
 Sign-Edit-No-Permission:
   - type: actionbar
-    text: '&cNo Edit Sign Permission'
+    text: '&cYou do not have permission to edit the bulletin board.'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
+Book-Edit-No-Permission:
+  - type: actionbar
+    text: '&cYou do not have permission to edit the book.'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
+Anvil-Edit-No-Permission:
+  - type: actionbar
+    text: '&cYou do not have permission to rename items in anvil.'
   - type: sound
     sound: 'ENTITY_ITEM_BREAK'
     volume: 1

project/runtime-bukkit/src/main/resources/lang/es_ES.yml

@@ -219,7 +219,21 @@ Channel-Bad-Language:
     pitch: 0
 Sign-Edit-No-Permission:
   - type: actionbar
-    text: '&cNo Edit Sign Permission'
+    text: '&cYou do not have permission to edit the bulletin board.'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
+Book-Edit-No-Permission:
+  - type: actionbar
+    text: '&cYou do not have permission to edit the book.'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
+Anvil-Edit-No-Permission:
+  - type: actionbar
+    text: '&cYou do not have permission to rename items in anvil.'
   - type: sound
     sound: 'ENTITY_ITEM_BREAK'
     volume: 1

project/runtime-bukkit/src/main/resources/lang/zh_CN.yml

@@ -234,6 +234,20 @@ Sign-Edit-No-Permission:
     sound: 'ENTITY_ITEM_BREAK'
     volume: 1
     pitch: 0
+Book-Edit-No-Permission:
+  - type: actionbar
+    text: '&c你没有权限编辑书与笔'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
+Anvil-Edit-No-Permission:
+  - type: actionbar
+    text: '&c你没有权限在铁砧中重命名物品。'
+  - type: sound
+    sound: 'ENTITY_ITEM_BREAK'
+    volume: 1
+    pitch: 0
 
 Mute-Muted-Player: '&8[&3Tr&bChat&8] &7你已禁言 {0} {1}.原因: {2}'
 Mute-Cancel-Muted-Player: '&8[&3Tr&bChat&8] &7你已取消禁言 {0}.'

project/runtime-bukkit/src/main/resources/settings.yml

@@ -38,7 +38,10 @@ Chat:
   Anti-Repeat: 0.85
   Cooldown: '2.0s'
   Length-Limit: 100
-  Sign-Edit-Permission-Check: false
+  Permission-Check:
+    Sign: false #无发言权限无法编辑告示牌 true 开启 false关闭
+    Book: false #无发言权限无法编辑书与笔 true 开启 false关闭
+    Anvil: false #无发言权限无法铁砧改名 true 开启 false关闭
 
 Color:
   Chat: true