[1.1.2]统一配置文件键名格式，更新CrypticLib版本

Author: ChiyodaXiaoYi

README.md

@@ -5,216 +5,32 @@
 
 ## 效果说明
 
-服主设置玩家的死亡消息、加入游戏和退出游戏消息，以及第一次进入服务器的消息，死亡消息支持颜色代码（无法为玩家名覆盖颜色代码，玩家名的显示和原版一致，这意味着用其他插件设置的具有颜色代码的玩家名能够正常显示）。
+服主设置玩家的死亡消息、加入游戏和退出游戏消息，以及第一次进入服务器的消息，死亡消息支持颜色代码。
 
 ## 效果展示
 
 ![a.png](a.png)
 
 ## 使用方法
 
-在配置文件中修改对应死亡类型的消息即可，`%1$s`代表死者，如果有杀手则`%2$s`代表杀手，如果杀手手持命名的物品则`%3$s`代表该物品。
+在配置文件中修改对应死亡类型的消息即可，`%1$s`代表死者，如果有杀手则`%2$s`代表击杀者，如果杀手手持命名的物品则`%3$s`代表该物品。
 
-如需重置某种类型的死亡消息，只需要把该键对应的值删除即可，双引号也要删。
+`first_join_msg`代表有玩家首次加入服务器向全服广播的消息
 
-`helloMessage`代表有玩家首次加入服务器向全服广播的消息，`%1$s`代表该玩家。
+`join_msg`代表玩家进入服务器的消息
 
-`joinMessage`代表玩家进入服务器的消息，其中`{}`代表该玩家。
-
-`quitMessage`代表玩家退出服务器的消息，其中`{}`代表该玩家。
+`quit_msg`代表玩家退出服务器的消息
 
 配置文件中设置的消息均支持颜色代码`&`，文末有具体的颜色代码使用方法。
 
-如果不小心搞乱了，把config.yml删了，reload一下服务器他会重新生成一个。
+### 指令：
+`/deathmessagereload`也可以简写`/dmrl`，作用是重新加载配置文件
 
-**指令：`/deathmessagereload`也可以简写`/dmrl`，作用是重新加载配置文件**
+权限节点`deathmessage.command.reload`
 
-## 配置文件：
+`/deathmessagefilter`也可以简写`/dmf`，作用是开启/关闭死亡消息屏蔽，参数`on/off`
 
-```yaml
-helloMessage:
-  - "&b新人&c&l来了奥！"
-joinMessage:
-  - "{}&b&l来了喵~"
-quitMessage:
-  - "{}&b&l走了喵~"
-death_attack_anvil:
-  - "%1$s被坠落的铁砧压扁了"
-death_attack_anvil_player:
-  - "%1$s在与%2$s战斗时被坠落的铁砧压扁了"
-death_attack_arrow:
-  - "%1$s被%2$s射杀"
-death_attack_arrow_item:
-  - "%1$s被%2$s用%3$s射杀"
-death_attack_badRespawnPoint_message:
-  - "%1$s被%2$s杀死了"
-bedRespawnPoint:
-  - "[刻意的游戏设计]"
-death_attack_cactus:
-  - "%1$s被戳死了"
-death_attack_cactus_player:
-  - "%1$s在试图逃离%2$s时撞上了仙人掌"
-death_attack_cramming:
-  - "%1$s因被过度挤压而死"
-death_attack_cramming_player:
-  - "%1$s被%2$s挤扁了"
-death_attack_dragonBreath:
-  - "%1$s被龙息烤熟了"
-death_attack_dragonBreath_player:
-  - "%1$s被%2$s的龙息烤熟了"
-death_attack_drown:
-  - "%1$s淹死了"
-death_attack_drown_player:
-  - "%1$s在试图逃离%2$s时淹死了"
-death_attack_dryout:
-  - "%1$s因脱水而死"
-death_attack_dryout_player:
-  - "%1$s在试图逃离%2$s时因脱水而死"
-death_attack_even_more_magic:
-  - "%1$s被不为人知的魔法杀死了"
-death_attack_explosion:
-  - "%1$s爆炸了"
-death_attack_explosion_player:
-  - "%1$s被%2$s炸死了"
-death_attack_explosion_player_item:
-  - "%1$s被%2$s用%3$s炸死了"
-death_attack_fall:
-  - "%1$s落地过猛"
-death_attack_fall_player:
-  - "%1$s在试图逃离%2$s时落地过猛"
-death_attack_fallingBlock:
-  - "%1$s被下落的方块压扁了"
-death_attack_fallingBlock_player:
-  - "%1$s在与%2$s战斗时被下落的方块压扁了"
-death_attack_fallingStalactite:
-  - "%1$s被坠落的钟乳石刺穿了"
-death_attack_fallingStalactite_player:
-  - "%1$s在与%2$s战斗时被坠落的钟乳石刺穿了"
-death_attack_fireball:
-  - "%1$s被%2$s用火球烧死了"
-death_attack_fireball_item:
-  - "%1$s被%2$s用%3$s发射的火球烧死了"
-death_attack_fireworks:
-  - "%1$s随着一声巨响消失了"
-death_attack_fireworks_item:
-  - "%1$s随着%2$s用%3$s发射的烟花发出的巨响消失了"
-death_attack_fireworks_player:
-  - "%1$s在与%2$s战斗时随着一声巨响中消失了"
-death_attack_flyIntoWall:
-  - "%1$s感受到了动能"
-death_attack_flyIntoWall_player:
-  - "%1$s在试图逃离%2$s时感受到了动能"
-death_attack_freeze:
-  - "%1$s被冻死了"
-death_attack_freeze_player:
-  - "%1$s被%2$s冻死了"
-death_attack_generic:
-  - "%1$s死了"
-death_attack_generic_player:
-  - "%1$s死于%2$s"
-death_attack_hotFloor:
-  - "%1$s发现了地板是熔岩做的"
-death_attack_hotFloor_player:
-  - "%1$s因%2$s而步入危险之地"
-death_attack_inFire:
-  - "%1$s浴火焚身"
-death_attack_inFire_player:
-  - "%1$s在与%2$s战斗时踏入了火中"
-death_attack_inWall:
-  - "%1$s在墙里窒息而亡"
-death_attack_inWall_player:
-  - "%1$s在与%2$s战斗时在墙里窒息而亡"
-death_attack_indirectMagic:
-  - "%1$s被%2$s使用的魔法杀死了"
-death_attack_indirectMagic_item:
-  - "%1$s被%2$s用%3$s杀死了"
-death_attack_lava:
-  - "%1$s试图在熔岩里游泳"
-death_attack_lava_player:
-  - "%1$s在逃离%2$s时试图在熔岩里游泳"
-death_attack_lightningBolt:
-  - "%1$s被闪电击中"
-death_attack_lightningBolt_player:
-  - "%1$s在与%2$s战斗时被闪电击中"
-death_attack_magic:
-  - "%1$s被魔法杀死了"
-death_attack_magic_player:
-  - "%1$s在试图逃离%2$s时被魔法杀死了"
-death_attack_mob:
-  - "%1$s被%2$s杀死了"
-death_attack_mob_item:
-  - "%1$s被%2$s用%3$s杀死了"
-death_attack_onFire:
-  - "%1$s被烧死了"
-death_attack_onFire_player:
-  - "%1$s在与%2$s战斗时被烤得酥脆"
-death_attack_outOfWorld:
-  - "%1$s掉出了这个世界"
-death_attack_outOfWorld_player:
-  - "%1$s与%2$s不共戴天"
-death_attack_player:
-  - "%1$s被%2$s杀死了"
-death_attack_player_item:
-  - "%1$s被%2$s用%3$s杀死了"
-death_attack_stalagmite:
-  - "%1$s被石笋刺穿了"
-death_attack_stalagmite_player:
-  - "%1$s在与%2$s战斗时被石笋刺穿了"
-death_attack_starve:
-  - "%1$s饿死了"
-death_attack_starve_player:
-  - "%1$s在与%2$s战斗时饿死了"
-death_attack_sting:
-  - "%1$s被蛰死了"
-death_attack_sting_player:
-  - "%1$s被%2$s蛰死了"
-death_attack_sweetBerryBush:
-  - "%1$s被甜浆果丛刺死了"
-death_attack_sweetBerryBush_player:
-  - "%1$s在试图逃离%2$s时被甜浆果丛刺死了"
-death_attack_thorns:
-  - "%1$s在试图伤害%2$s时被杀"
-death_attack_thorns_item:
-  - "%1$s在试图伤害%2$s时被%3$s杀死"
-death_attack_thrown:
-  - "%1$s被%2$s给砸死了"
-death_attack_thrown_item:
-  - "%1$s被%2$s用%3$s给砸死了"
-death_attack_trident:
-  - "%1$s被%2$s刺穿了"
-death_attack_trident_item:
-  - "%1$s被%2$s用%3$s刺穿了"
-death_attack_wither:
-  - "%1$s凋零了"
-death_attack_wither_player:
-  - "%1$s在与%2$s战斗时凋零了"
-death_attack_witherSkull:
-  - "%1$s被%2$s发射的头颅射杀"
-death_fell_accident_generic:
-  - "%1$s从高处摔了下来"
-death_fell_accident_ladder:
-  - "%1$s从梯子上摔了下来"
-death_fell_accident_other_climbable:
-  - "%1$s在攀爬时摔了下来"
-death_fell_accident_scaffolding:
-  - "%1$s从脚手架上摔了下来"
-death_fell_accident_twisting_vines:
-  - "%1$s从缠怨藤上摔了下来"
-death_fell_accident_vines:
-  - "%1$s从藤蔓上摔了下来"
-death_fell_accident_weeping_vines:
-  - "%1$s从垂泪藤上摔了下来"
-death_fell_assist:
-  - "%1$s因为%2$s注定要摔死"
-death_fell_assist_item:
-  - "%1$s因为%2$s使用了%3$s注定要摔死"
-death_fell_finish:
-  - "%1$s摔伤得太重并被%2$s完结了生命"
-death_fell_finish_item:
-  - "%1$s摔伤得太重并被%2$s用%3$s完结了生命"
-death_fell_killer:
-  - "%1$s注定要摔死"
-```
+无权限节点
 
 ### 死亡类型——消息对照表
 
@@ -308,12 +124,4 @@ death_fell_killer:
     "death.fell.finish.item": 				"%1$s摔伤得太重并被%2$s用%3$s完结了生命",
     "death.fell.killer": 					"%1$s注定要摔死"
 }
-```
-
-### 颜色代码
-
-![QQ截图20220615172616.png](https://pic.rmb.bdstatic.com/bjh/ad4369e66d63e4cd6a086a216c9b64fd.png)
-
-![QQ截图20220615172632.png](https://pic.rmb.bdstatic.com/bjh/aae99485d99a90e96f3246a866a57850.png)
-
-**注：具体使用时要用`&`代替上面的分节符`§`，这是为了方便输入。**
+```

build.gradle.kts

@@ -25,11 +25,11 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT")
     compileOnly("net.luckperms:api:5.4")
     compileOnly("me.clip:placeholderapi:2.11.1")
-    implementation("com.github.YufiriaMazenta:CrypticLib:1.0.1")
+    implementation("com.github.YufiriaMazenta:CrypticLib:1.0.9")
 }
 
 group = "com.github.yufiriamazenta"
-version = "1.1.1"
+version = "1.1.2"
 description = "DeathMessage"
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.sourceCompatibility = JavaVersion.VERSION_17

src/main/java/com/github/yufiriamazenta/deathmsg/data/DataContainer.java

@@ -33,8 +33,14 @@ public static boolean hasDeathCause(String deathCause) {
     }
 
     public static String getMessage(String deathCause) {
+        return getMessage(deathCause, deathCause);
+    }
+
+    public static String getMessage(String deathCause, String def) {
         if (hasDeathCause(deathCause)) {
             List<String> list = deathMessageMap.get(deathCause);
+            if (list == null || list.isEmpty())
+                return def;
             return list.get(DeathMessage.random.nextInt(list.size()));
         }
         return null;

src/main/java/com/github/yufiriamazenta/deathmsg/listener/DeathHandler.java

@@ -230,7 +230,7 @@ private BaseComponent getKillerComponent(Player deadPlayer, String displayNameFo
             UUID lastEntityUuid = entityHurtPlayerMap.get(deadPlayer.getUniqueId());
             if (lastEntityUuid == null || Bukkit.getEntity(lastEntityUuid) == null) {
                 //当不存在击杀实体时,说明玩家可能死于方块爆炸
-                String bedRespawnPoint = DataContainer.getMessage("bedRespawnPoint");
+                String bedRespawnPoint = DataContainer.getMessage("bed_respawn_point");
                 BaseComponent bedRespawnDisplayCompound = new TextComponent();
                 for (BaseComponent baseComponent : TextComponent.fromLegacyText(bedRespawnPoint)) {
                     bedRespawnDisplayCompound.addExtra(baseComponent);

src/main/java/com/github/yufiriamazenta/deathmsg/listener/JoinQuitHandler.java

@@ -3,6 +3,8 @@
 import com.github.yufiriamazenta.deathmsg.DeathMessage;
 import com.github.yufiriamazenta.deathmsg.data.DataContainer;
 import com.github.yufiriamazenta.deathmsg.util.LangUtil;
+import crypticlib.util.MsgUtil;
+import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -20,18 +22,16 @@ public enum JoinQuitHandler implements Listener {
     @EventHandler
     public void welcomeNewPlayer(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        String welcomeMessage = DataContainer.getMessage("helloMessage");
+        String welcomeMessage = DataContainer.getMessage("first_join_msg");
         if (!player.hasPlayedBefore()) {
-            welcomeMessage = welcomeMessage.replace("{}", player.getDisplayName());;
-            welcomeMessage = LangUtil.color(welcomeMessage);
+            welcomeMessage = LangUtil.color(LangUtil.placeholder(player, welcomeMessage));
             for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
                 onlinePlayer.sendMessage(welcomeMessage);
             }
         }
-        String joinMessageString = DataContainer.getMessage("joinMessage");
-        if (joinMessageString != null && !joinMessageString.equals("")) {
-            joinMessageString = joinMessageString.replace("{}", player.getDisplayName());
-            joinMessageString = LangUtil.color(joinMessageString);
+        String joinMessageString = DataContainer.getMessage("join_msg");
+        if (joinMessageString != null && !joinMessageString.isEmpty()) {
+            joinMessageString = LangUtil.color(LangUtil.placeholder(player, joinMessageString));
             event.setJoinMessage(null);
             for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
                 onlinePlayer.sendMessage(joinMessageString);
@@ -42,10 +42,9 @@ public void welcomeNewPlayer(PlayerJoinEvent event) {
     @EventHandler
     public void changeQuitMessage(PlayerQuitEvent event) {
         Player player = event.getPlayer();
-        String quitMessage = DataContainer.getMessage("quitMessage");
-        if (quitMessage != null && !quitMessage.equals("")) {
-            quitMessage = quitMessage.replace("{}", player.getDisplayName());
-            quitMessage = LangUtil.color(quitMessage);
+        String quitMessage = DataContainer.getMessage("quit_msg");
+        if (quitMessage != null && !quitMessage.isEmpty()) {
+            quitMessage = LangUtil.color(LangUtil.placeholder(player, quitMessage));
             event.setQuitMessage(quitMessage);
         }
     }

src/main/java/com/github/yufiriamazenta/deathmsg/util/LangUtil.java

@@ -1,8 +1,11 @@
 package com.github.yufiriamazenta.deathmsg.util;
 
 import com.github.yufiriamazenta.deathmsg.DeathMessage;
+import crypticlib.util.MsgUtil;
 import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -43,4 +46,11 @@ public static void msg(CommandSender sender, String msgKey, Map<String, String>
         sender.sendMessage(color(message));
     }
 
+    public static String placeholder(Player player, String msg) {
+        String replace = MsgUtil.placeholder(player, msg);
+        if (replace.equals(msg))
+            return msg.replace("%player_name%", player.getDisplayName());
+        return replace;
+    }
+
 }

src/main/resources/config.yml

@@ -1,9 +1,9 @@
-helloMessage:
-  - "&b新人&c&l来了奥！"
-joinMessage:
-  - "{}&b&l来了喵~"
-quitMessage:
-  - "{}&b&l走了喵~"
+first_join_msg:
+  - "&b新人%player_name%&c&l来了奥！"
+join_msg:
+  - "%player_name%&b&l来了喵~"
+quit_msg:
+  - "%player_name%&b&l走了喵~"
 death_attack_anvil:
   - "%1$s被坠落的铁砧压扁了"
 death_attack_anvil_player:
@@ -14,7 +14,7 @@ death_attack_arrow_item:
   - "%1$s被%2$s用%3$s射杀"
 death_attack_badRespawnPoint_message:
   - "%1$s被%2$s杀死了"
-bedRespawnPoint:
+bed_respawn_point:
   - "[刻意的游戏设计]"
 death_attack_cactus:
   - "%1$s被戳死了"

src/main/resources/plugin.yml

@@ -12,7 +12,7 @@ commands:
       - "dmrl"
     usage: "§4/dmrl"
     description: "reload death message"
-    permission: "op"
+    permission: "deathmessage.command.reload"
     permission-message: "§4you are not op !"
   deathmessagefilter:
     aliases: