feat: 适配 DisplayDamage

RuoChen688 · Aug 14, 2024 · 493eaee · 493eaee
1 parent b34eb61
commit 493eaee
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/lib/DisplayDamage_v1.0.3-clean.jar b/lib/DisplayDamage_v1.0.3-clean.jar
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>RcRPG.RcRPGMain</groupId>
     <artifactId>RcRPG</artifactId>
-    <version>1.1.0-MOT</version>
+    <version>1.1.1-MOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -167,6 +167,14 @@
             <systemPath>${pom.basedir}/lib/FakeInventories-1.1.5.jar</systemPath>
         </dependency>
 
+        <dependency>
+            <groupId>org.sobadfish.displaydamage.PluginMain</groupId>
+            <artifactId>DisplayDamage</artifactId>
+            <version>1.0.3</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/DisplayDamage_v1.0.3-clean.jar</systemPath>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

diff --git a/src/main/java/RcRPG/Events.java b/src/main/java/RcRPG/Events.java
@@ -5,13 +5,13 @@
 import RcRPG.AttrManager.Manager;
 import RcRPG.AttrManager.PlayerAttr;
 import RcRPG.AttrManager.RcNPCAttr;
-import RcRPG.config.MainConfig;
-import RcRPG.panel.form.guildForm;
 import RcRPG.RPG.*;
 import RcRPG.Society.Money;
 import RcRPG.Society.Prefix;
+import RcRPG.config.MainConfig;
 import RcRPG.floatingtext.TextEntity;
 import RcRPG.guild.Guild;
+import RcRPG.panel.form.guildForm;
 import cn.nukkit.Player;
 import cn.nukkit.Server;
 import cn.nukkit.block.Block;
@@ -33,27 +33,28 @@
 import com.smallaswater.littlemonster.entity.IEntity;
 import com.smallaswater.npc.entitys.EntityRsNPC;
 import healthapi.PlayerHealth;
+import org.sobadfish.displaydamage.DamageApi;
+import org.sobadfish.displaydamage.dto.DamageTextDTO;
 
 import java.io.File;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 import static RcRPG.Handle.getProbabilisticResults;
 
 public class Events implements Listener {
 
-    public static LinkedHashMap<Player,String> playerShop = new LinkedHashMap<>();
-
     public static final boolean hasEconomyAPI = Server.getInstance().getPluginManager().getPlugin("EconomyAPI") != null;
     public static final boolean hasPlayerPoints = Server.getInstance().getPluginManager().getPlugin("playerPoints") != null;
     public static final boolean hasHealthAPI = Server.getInstance().getPluginManager().getPlugin("HealthAPI") != null;
     public static final boolean hasRsNPC = Server.getInstance().getPluginManager().getPlugin("RsNPC") != null;
     public static final boolean hasLittleMonster = Server.getInstance().getPluginManager().getPlugin("LittleMonster") != null;
     public static final boolean hasRcEntity = Server.getInstance().getPluginManager().getPlugin("RcEntity") != null;
     public static final boolean hasRcNPC = Server.getInstance().getPluginManager().getPlugin("RcNPC") != null;
+    public static final boolean hasDisplayDamage = Server.getInstance().getPluginManager().getPlugin("DisplayDamage") != null;
+
     public static final List<String> ProjectileWeapons = Arrays.asList("minecraft:bow", "minecraft:crossbow", "minecraft:trident");
 
     public Events(){
@@ -512,6 +513,7 @@ public void damageEvent(EntityDamageByEntityEvent event){
                 if (damagerIsPlayer) {
                     ((Player) damager).sendMessage(RcRPGMain.getI18n().tr(((Player) damager).getLanguageCode(), "rcrpg.events.life_steal_message", lifeSteal));
                 }
+                if (hasDisplayDamage) DamageApi.displayAsParticle(new DamageTextDTO(finalDamage, wounded, "damage:ph"));
             }
         }
 
@@ -531,6 +533,7 @@ public void damageEvent(EntityDamageByEntityEvent event){
             Damage.onDamage((Player) damager, wounded);
 
             if (crtDamage > 0) {
+                if (hasDisplayDamage) DamageApi.displayAsParticle(new DamageTextDTO(finalDamage, wounded, "damage:ed"));
                 ((Player) damager).sendMessage(RcRPGMain.getI18n().tr(((Player) damager).getLanguageCode(), "rcrpg.events.critical_damage_message", woundedName, crtDamage));
             }
 
@@ -551,7 +554,11 @@ public void damageEvent(EntityDamageByEntityEvent event){
             }
 
             // 伤害 浮空字
-            TextEntity.send(wounded, "§c-"+finalDamage);
+            if (hasDisplayDamage) {
+                DamageApi.displayAsParticle(new DamageTextDTO(finalDamage, wounded, "damage:epd"));
+            } else {
+                TextEntity.send(wounded, "§c-" + finalDamage);
+            }
         }
     }
     @EventHandler

diff --git a/src/main/java/RcRPG/RcRPGMain.java b/src/main/java/RcRPG/RcRPGMain.java
@@ -66,8 +66,8 @@ public void onLoad() {
 
     public void onEnable() {
         if (Server.getInstance().getPluginManager().getPlugin("FakeInventories") == null) {
-            this.getLogger().error("未检测到 FakeInventories 插件，插件无法启动");
-            throw new RuntimeException("前置插件 FakeInventories 下载地址：https://github.com/JkqzDev/FakeInventories-MOT/releases");
+            this.getLogger().error(i18n.tr(serverLangCode, "rcrpg.missing.plugin", "FakeInventories", "https://github.com/JkqzDev/FakeInventories-MOT/releases"));
+            throw new RuntimeException("Missing required plugin FakeInventories!");
         }
 
         Entity.registerEntity("TextEntity", TextEntity.class);
@@ -100,9 +100,9 @@ public void onEnable() {
             this.getLogger().warning("未检测到 PlayerPoints 插件，将使用默认的点券核心");
         }
         if (Server.getInstance().getPluginManager().getPlugin("Tips") != null) {
-            Api.registerVariables("AyearTipsApi", TipsVariables.class);
+            Api.registerVariables("RcRPGTipsApi", TipsVariables.class);
         }
-        this.getLogger().info("插件加载成功，作者：若尘");
+        this.getLogger().info("插件加载成功，作者：若尘、Mcayear");
     }
 
     public void init() {

diff --git a/src/main/resources/Ornament/Ornament.yml b/src/main/resources/Ornament/Ornament.yml
@@ -24,4 +24,4 @@
   - 演示套装
 个人通知: ''
 全服通知: ''
-# 生效槽: 1 # 仅放置在饰品背包对应槽位上时生效，-1为不限制，0为第一个槽，1为第二个槽...
+生效槽: -1 # 仅放置在饰品背包对应槽位上时生效，-1为不限制，0为第一个槽，1为第二个槽...
diff --git a/src/main/resources/language/en_US.lang b/src/main/resources/language/en_US.lang
@@ -1,3 +1,5 @@
+rcrpg.missing.plugin={%0} plugin not detected, the plugin cannot be started! Download link: {%1}
+
 rcrpg.commands.message.noPermission=§cNo permissions!
 rcrpg.commands.message.noTarget=§cNo matching target found.
 rcrpg.commands.reloaded=§aConfiguration reload successful!

diff --git a/src/main/resources/language/zh_CN.lang b/src/main/resources/language/zh_CN.lang
@@ -1,3 +1,5 @@
+rcrpg.missing.plugin=未检测到 {%0} 插件，插件无法启动！下载地址：{%1}
+
 rcrpg.commands.message.noPermission=§c权限不足
 rcrpg.commands.message.noTarget=§c没有匹配的目标
 rcrpg.commands.reloaded=§a配置文件重载成功

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,13 +1,13 @@
 name: RcRPG
 main: RcRPG.RcRPGMain
-version: 1.1.0
+version: 1.1.1
 author: 若尘
 authors: ["若尘", "Mcayear"]
 api: 1.0.8
 load: POSTWORLD
 website: https://github.com/RuoChen688/RcRPG
 depend: []
-softdepend: ["FakeInventories", "EconomyAPI", "RcNPC", "RsNPC", "PlayerPoint", "LittleMonster", "HealthAPI", "Tips"]
+softdepend: ["FakeInventories", "EconomyAPI", "RcNPC", "RsNPC", "PlayerPoint", "LittleMonster", "HealthAPI", "Tips", "DisplayDamage"]
 permissions:
   rcrpg.command.check:
     description: "查询玩家信息"