Skip to content

Commit 199074f

Browse files
author
YufiriaMazenta
committed
因为暂时没有好的物品转HoverEvent方法,所以暂时去掉悬浮物品展示
1 parent b3d629e commit 199074f

File tree

6 files changed

+41
-53
lines changed

6 files changed

+41
-53
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group = "com.github.yufiriamazenta"
11-
version = "1.3.0"
11+
version = "1.3.1"
1212

1313
repositories {
1414
mavenLocal()
@@ -29,11 +29,11 @@ repositories {
2929

3030
dependencies {
3131
compileOnly("org.spigotmc:spigot:1.19-R0.1-SNAPSHOT")
32-
compileOnly("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT")
32+
compileOnly("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
3333
compileOnly("net.luckperms:api:5.4")
3434
compileOnly("me.clip:placeholderapi:2.11.1")
3535
compileOnly("io.lumine:Mythic-Dist:5.3.5")
36-
implementation("com.crypticlib:CrypticLib:0.10.23")
36+
implementation("com.crypticlib:common:0.18.10")
3737
implementation(kotlin("stdlib-jdk8"))
3838
}
3939

‎src/main/kotlin/com/github/yufiriamazenta/deathmsg/DeathMessage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.github.yufiriamazenta.deathmsg
22

33
import com.github.yufiriamazenta.deathmsg.data.DataManager
44
import crypticlib.BukkitPlugin
5-
import crypticlib.chat.MessageSender
5+
import crypticlib.chat.MsgSender
66
import org.bukkit.Bukkit
77
import org.bukkit.NamespacedKey
88
import org.bukkit.entity.Player
@@ -15,11 +15,11 @@ class DeathMessage: BukkitPlugin() {
1515
override fun enable() {
1616
saveDefaultConfig()
1717
initDataContainer()
18-
MessageSender.info("[DeathMessage] DeathMessage Enabled")
18+
MsgSender.info("[DeathMessage] DeathMessage Enabled")
1919
}
2020

2121
override fun disable() {
22-
MessageSender.info("[DeathMessage] DeathMessage Disabled")
22+
MsgSender.info("[DeathMessage] DeathMessage Disabled")
2323
}
2424

2525
private fun initDataContainer() {

‎src/main/kotlin/com/github/yufiriamazenta/deathmsg/commands/DeathMessageReloadCommand.kt‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@ package com.github.yufiriamazenta.deathmsg.commands
22

33
import com.github.yufiriamazenta.deathmsg.DEATH_MESSAGE
44
import com.github.yufiriamazenta.deathmsg.data.DataManager.reloadData
5-
import crypticlib.chat.MessageSender
6-
import crypticlib.command.BukkitCommand
7-
import crypticlib.command.RootCmdExecutor
8-
import org.bukkit.command.Command
5+
import crypticlib.chat.MsgSender
6+
import crypticlib.command.CommandHandler
7+
import crypticlib.command.CommandInfo
8+
import crypticlib.command.annotation.Command
9+
import crypticlib.perm.PermInfo
910
import org.bukkit.command.CommandSender
1011
import org.bukkit.entity.Player
1112

12-
@BukkitCommand(name = "deathmessagereload", permission = "deathmessage.command.reload", aliases = ["dmrl"])
13-
class DeathMessageReloadCommand : RootCmdExecutor() {
13+
@Command
14+
object DeathMessageReloadCommand : CommandHandler(CommandInfo("deathmessagereload", PermInfo("deathmessage.command.reload"), arrayOf("dmrl"))) {
1415

15-
override fun onCommand(
16-
commandSender: CommandSender,
17-
command: Command,
18-
label: String,
19-
args: Array<String>
20-
): Boolean {
16+
override fun execute(sender: CommandSender, args: MutableList<String>): Boolean {
2117
if (args.isNotEmpty()) {
2218
return false
2319
}
24-
if (commandSender is Player && !commandSender.isOp()) {
20+
if (sender is Player && !sender.isOp()) {
2521
return false
2622
}
2723
reloadData()
28-
val message: String = DEATH_MESSAGE.getConfig().getString("plugin_message.command_reload")?: "DeathMessage Reloaded"
29-
MessageSender.sendMsg(commandSender, message)
24+
val message: String = DEATH_MESSAGE.config.getString("plugin_message.command_reload")?: "DeathMessage Reloaded"
25+
MsgSender.sendMsg(sender, message)
3026
return true
3127
}
3228

‎src/main/kotlin/com/github/yufiriamazenta/deathmsg/commands/FilterDeathMessageCmd.kt‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,44 @@ package com.github.yufiriamazenta.deathmsg.commands
22

33
import com.github.yufiriamazenta.deathmsg.DEATH_MESSAGE
44
import com.github.yufiriamazenta.deathmsg.util.LangUtil
5-
import crypticlib.command.BukkitCommand
6-
import crypticlib.command.RootCmdExecutor
7-
import org.bukkit.command.Command
5+
import crypticlib.command.CommandHandler
6+
import crypticlib.command.CommandInfo
7+
import crypticlib.command.annotation.Command
8+
import crypticlib.perm.PermInfo
89
import org.bukkit.command.CommandSender
910
import org.bukkit.entity.Player
1011
import org.bukkit.persistence.PersistentDataType
1112

12-
@BukkitCommand(name = "deathmessagefilter", aliases = ["dmf"], permission = "deathmessage.command.filter")
13-
class FilterDeathMessageCmd : RootCmdExecutor() {
14-
override fun onCommand(commandSender: CommandSender, command: Command, label: String, args: Array<String>): Boolean {
15-
if (commandSender !is Player) {
16-
LangUtil.sendLang(commandSender, "plugin_message.only_player")
13+
@Command
14+
object FilterDeathMessageCmd : CommandHandler(CommandInfo("deathmessagefilter", PermInfo("deathmessage.command.filter"), arrayOf("dmf"))) {
15+
16+
override fun execute(sender: CommandSender, args: MutableList<String>): Boolean {
17+
if (sender !is Player) {
18+
LangUtil.sendLang(sender, "plugin_message.only_player")
1719
return true
1820
}
1921
if (args.isEmpty()) {
20-
toggleFilter(commandSender)
22+
toggleFilter(sender)
2123
} else {
2224
when (args[0]) {
23-
"on" -> setFilterOn(commandSender)
24-
"off" -> setFilterOff(commandSender)
25-
else -> toggleFilter(commandSender)
25+
"on" -> setFilterOn(sender)
26+
"off" -> setFilterOff(sender)
27+
else -> toggleFilter(sender)
2628
}
2729
}
2830
return true
2931
}
3032

31-
override fun onTabComplete(
32-
commandSender: CommandSender,
33-
command: Command,
34-
s: String,
35-
strings: Array<String>
36-
): List<String> {
37-
return when (strings.size) {
33+
override fun tab(sender: CommandSender, args: MutableList<String>): MutableList<String> {
34+
return when (args.size) {
3835
0, 1 -> {
3936
val list: MutableList<String> = mutableListOf("off", "on")
40-
list.removeIf { str: String -> !str.startsWith(strings[0]) }
37+
list.removeIf { str: String -> !str.startsWith(args[0]) }
4138
list
4239
}
4340

4441
else -> {
45-
listOf("")
42+
mutableListOf("")
4643
}
4744
}
4845
}

‎src/main/kotlin/com/github/yufiriamazenta/deathmsg/listener/DeathHandler.kt‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ package com.github.yufiriamazenta.deathmsg.listener
22

33
import com.github.yufiriamazenta.deathmsg.DEATH_MESSAGE
44
import com.github.yufiriamazenta.deathmsg.data.DataManager
5-
import crypticlib.chat.MessageSender
5+
import crypticlib.chat.MsgSender
66
import crypticlib.chat.TextProcessor
77
import crypticlib.listener.BukkitListener
8-
import crypticlib.nms.item.ItemFactory
98
import me.clip.placeholderapi.PlaceholderAPI
109
import net.md_5.bungee.api.ChatMessageType
1110
import net.md_5.bungee.api.chat.*
@@ -32,16 +31,12 @@ class DeathHandler: Listener {
3231

3332
private var deathCauseKeyField: Field? = null
3433
private var combatTrackerField: Field? = null
35-
private val entityHurtPlayerMap: MutableMap<UUID, UUID>
34+
private val entityHurtPlayerMap: MutableMap<UUID, UUID> = ConcurrentHashMap()
3635
private var entityGetHandleMethod: Method? = null
3736
private var toChatMethod: Method? = null
3837
private var getComponentContentsMethod: Method? = null
3938
private var getObjsMethod: Method? = null
4039

41-
init {
42-
entityHurtPlayerMap = ConcurrentHashMap()
43-
}
44-
4540
@EventHandler
4641
fun onPlayerDeathReplaceMessage(event: PlayerDeathEvent) {
4742
//以下获取死亡玩家的nms对象
@@ -61,7 +56,7 @@ class DeathHandler: Listener {
6156
deathCause = getNmsDeathCause(nmsDeathMsg)
6257
objArrLength = getMsgObjsLength(nmsDeathMsg)
6358
if (!DataManager.hasDeathCause(deathCause)) {
64-
MessageSender.sendMsg(Bukkit.getConsoleSender(), "Death Cause $deathCause is Missing")
59+
MsgSender.sendMsg(Bukkit.getConsoleSender(), "Death Cause $deathCause is Missing")
6560
DataManager.addDeathMessage(deathCause, mutableListOf(deathCause))
6661
return
6762
}
@@ -290,7 +285,7 @@ class DeathHandler: Listener {
290285
itemName = TextProcessor.color(itemName)
291286
val itemDisplayCompound: BaseComponent = TextComponent()
292287
itemDisplayCompound.extra = TextComponent.fromLegacyText(itemName).toMutableList()
293-
itemDisplayCompound.hoverEvent = ItemFactory.item(handItem).toHover();
288+
// itemDisplayCompound.hoverEvent = ItemFactory.item(handItem).toHover(); //TODO 寻找新的物品转HoverEvent方法
294289
return itemDisplayCompound
295290
}
296291

‎src/main/kotlin/com/github/yufiriamazenta/deathmsg/util/LangUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.yufiriamazenta.deathmsg.util
22

33
import com.github.yufiriamazenta.deathmsg.DEATH_MESSAGE
4-
import crypticlib.chat.MessageSender
4+
import crypticlib.chat.MsgSender
55
import org.bukkit.command.CommandSender
66

77
object LangUtil {
@@ -12,7 +12,7 @@ object LangUtil {
1212

1313
fun sendLang(receiver: CommandSender?, msgKey: String?, formatMap: Map<String, String>?) {
1414
val message = DEATH_MESSAGE.config.getString(msgKey!!, msgKey)
15-
MessageSender.sendMsg(receiver!!, message, formatMap?: HashMap<String, String>())
15+
MsgSender.sendMsg(receiver!!, message, formatMap?: HashMap<String, String>())
1616
}
1717

1818
}

0 commit comments

Comments
 (0)