wed150/DeathMessages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add damage cause

Browse Source
This commit is contained in:
Tsubasa6848
2024-02-16 18:57:47 +08:00
Unverified
parent 94d4384e75
commit 264edaff6a
3 changed files with 269 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDK-GMLIB
+1 -1
Submodule SDK-GMLIB updated: 72e596afb1...1a7e0ba55d
src/DeathMessage.cpp
+29 -10
View File
@@ -1,32 +1,51 @@
#include "Global.h" #include "Global.h"
void RegisterDamageDefinition() { void RegisterDamageDefinition() {
// GMLIB::Mod::DamageCause::registerDamageCause() GMLIB::Mod::DamageCause::setCustomDamageCauseEnabled();
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Anvil, "anvil");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::EntityAttack, "mob");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Drowning, "drown");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::FallingBlock, "fallingBlock");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Fire, "inFire");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::FireTick, "onFire");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Fireworks, "fireworks");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::FlyIntoWall, "flyIntoWall");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Freezing, "freeze");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Lava, "lava");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Lightning, "lightningBolt");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Wither, "wither");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Magic, "indirectMagic");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Magma, "hotFloor");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Stalactite, "stalactite");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Stalagmite, "stalagmite");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Starve, "starve");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Suffocation, "inWall");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::SonicBoom, "sonicBoom");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Void, "outOfWorld");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::SelfDestruct, "genericKill");
GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Projectile, "thrown");
} }
void ListenEvents() { void ListenEvents() {
auto& eventBus = ll::event::EventBus::getInstance(); auto& eventBus = ll::event::EventBus::getInstance();
if (ConfigData::mJoinMessage) { if (ConfigData::mJoinMessage) {
eventBus.emplaceListener<ll::event::player::PlayerConnectEvent>([](ll::event::player::PlayerConnectEvent& ev) { eventBus.emplaceListener<ll::event::player::PlayerConnectEvent>([](ll::event::player::PlayerConnectEvent& ev) {
infoLogger.info( infoLogger.info(fmt::format(fg(fmt::color::yellow), tr("multiplayer.player.joined", {ev.self().getName()}))
"{}",
fmt::format(fg(fmt::color::yellow), tr("multiplayer.player.joined", {ev.self().getName()}))
); );
}); });
} }
if (ConfigData::mLeftMessage) { if (ConfigData::mLeftMessage) {
eventBus.emplaceListener<ll::event::player::PlayerLeaveEvent>([](ll::event::player::PlayerLeaveEvent& ev) { eventBus.emplaceListener<ll::event::player::PlayerLeaveEvent>([](ll::event::player::PlayerLeaveEvent& ev) {
infoLogger.info( infoLogger.info(fmt::format(fg(fmt::color::yellow), tr("multiplayer.player.left", {ev.self().getName()})));
"{}",
fmt::format(fg(fmt::color::yellow), tr("multiplayer.player.left", {ev.self().getName()}))
);
}); });
} }
if (ConfigData::mDeathMessage) { if (ConfigData::mDeathMessage) {
eventBus.emplaceListener<GMLIB::Event::EntityEvent::DeathMessageAfterEvent>( eventBus.emplaceListener<GMLIB::Event::EntityEvent::DeathMessageAfterEvent>(
[](GMLIB::Event::EntityEvent::DeathMessageAfterEvent& ev) { [](GMLIB::Event::EntityEvent::DeathMessageAfterEvent& ev) {
auto msg = ev.getDeathMessage(); auto msg = ev.getDeathMessage();
deathLogger.info(tr(msg.first, msg.second)); auto info = tr(msg.first, msg.second);
deathLogger.info(info);
ev.setDeathMessage({info, msg.second});
} }
); );
} }
src/Language.h
+239 -241
View File
@@ -140,250 +140,248 @@ entity.chest_raft.name=Raft with Chest
)"; )";
std::string zh_CN = R"( std::string zh_CN = R"(
death.attack.anvil=%1$s被坠落的铁砧压扁了 # death.attack.anvil=%1$s被坠落的铁砧压扁了
death.attack.anvil.player=%1$sz在与%2$s战斗时被坠落的铁砧压扁了 # death.attack.anvil.player=%1$sz在与%2$s战斗时被坠落的铁砧压扁了
death.attack.anvil.item=%1$s在与持有%3$s的%2$s战斗时被坠落的铁砧压扁了 # death.attack.anvil.item=%1$s在与持有%3$s的%2$s战斗时被坠落的铁砧压扁了
death.attack.arrow=%1$s被%2$s射杀 # death.attack.arrow=%1$s被%2$s射杀
death.attack.arrow.item=%1$s被%2$s用%3$s射杀 # death.attack.arrow.item=%1$s被%2$s用%3$s射杀
death.attack.bullet=%1$s被%2$s狙击了 # death.attack.bullet=%1$s被%2$s狙击了
death.attack.cactus=%1$s被戳死了 # death.attack.cactus=%1$s被戳死了
death.attack.cactus.player=%1$s在试图逃离%2$s时撞上了仙人掌 # death.attack.cactus.player=%1$s在试图逃离%2$s时撞上了仙人掌
death.attack.cactus.item=%1$s在试图逃离持有%3$s的%2$s时撞上了仙人掌 # death.attack.cactus.item=%1$s在试图逃离持有%3$s的%2$s时撞上了仙人掌
death.attack.drown=%1$s淹死了 # death.attack.drown=%1$s淹死了
death.attack.drown.player=%1$s在试图逃离%2$s时淹死了 # death.attack.drown.player=%1$s在试图逃离%2$s时淹死了
death.attack.drown.item=%1$s在试图逃离持有%3$s的%2$s时淹死了 # death.attack.drown.item=%1$s在试图逃离持有%3$s的%2$s时淹死了
death.attack.explosion=%1$s爆炸了 # death.attack.explosion=%1$s爆炸了
death.attack.explosion.player=%1$s被%2$s炸死了 # death.attack.explosion.player=%1$s被%2$s炸死了
death.attack.explosion.item=%1$s被%2$s使用%3$s炸死了 # death.attack.explosion.item=%1$s被%2$s使用%3$s炸死了
death.attack.badRespawnPoint.message=%1$s被[刻意的游戏设计]杀死了 # death.attack.badRespawnPoint.message=%1$s被[刻意的游戏设计]杀死了
death.attack.fall=%1$s落地过猛 # death.attack.fall=%1$s落地过猛
death.attack.fall.player=%1$s在试图逃离%2$s时落地过猛 # death.attack.fall.player=%1$s在试图逃离%2$s时落地过猛
death.attack.fall.item=%1$s在试图逃离持有%3$s的%2$s时落地过猛 # death.attack.fall.item=%1$s在试图逃离持有%3$s的%2$s时落地过猛
death.attack.fallingBlock=%1$s被坠落的方块压扁了 # death.attack.fallingBlock=%1$s被坠落的方块压扁了
death.attack.fallingBlock.player=%1$sz在与%2$s战斗时被坠落的方块压扁了 # death.attack.fallingBlock.player=%1$sz在与%2$s战斗时被坠落的方块压扁了
death.attack.fallingBlock.item=%1$s在与持有%3$s的%2$s战斗时被坠落的方块压扁了 # death.attack.fallingBlock.item=%1$s在与持有%3$s的%2$s战斗时被坠落的方块压扁了
death.attack.fireball=%1$s被%2$s用火球烧死了 # death.attack.fireball=%1$s被%2$s用火球烧死了
death.attack.fireball.item=%1$s被%2$s用%3$s发射的火球烧死了 # death.attack.fireball.item=%1$s被%2$s用%3$s发射的火球烧死了
death.attack.fireworks=%1$s随着一声巨响消失了 # death.attack.fireworks=%1$s随着一声巨响消失了
death.attack.fireworks.player=%1$s在与%2$s战斗时随着一声巨响消失了 # death.attack.fireworks.player=%1$s在与%2$s战斗时随着一声巨响消失了
death.attack.fireworks.item=%1$s随着%2$s用%3$s发射的烟花发出的巨响消失了 # death.attack.fireworks.item=%1$s随着%2$s用%3$s发射的烟花发出的巨响消失了
death.attack.flyIntoWall=%1$s感受到了动能 # death.attack.flyIntoWall=%1$s感受到了动能
death.attack.flyIntoWall.player=%1$s在试图逃离%2$s时感受到了动能 # death.attack.flyIntoWall.player=%1$s在试图逃离%2$s时感受到了动能
death.attack.flyIntoWall.item=%1$s在试图逃离持有%3$s的%2$s时感受到了动能 # death.attack.flyIntoWall.item=%1$s在试图逃离持有%3$s的%2$s时感受到了动能
death.attack.generic=%1$s死了 # death.attack.generic=%1$s死了
death.attack.generic.player=%1$s死于%2$s # death.attack.generic.player=%1$s死于%2$s
death.attack.indirectMagic=%1$s被%2$s使用的魔法杀死了 # death.attack.indirectMagic=%1$s被%2$s使用的魔法杀死了
death.attack.indirectMagic.item=%1$s被%2$s用%3$s杀死了 # death.attack.indirectMagic.item=%1$s被%2$s用%3$s杀死了
death.attack.inFire=%1$s浴火焚身 # death.attack.inFire=%1$s浴火焚身
death.attack.inFire.player=%1$s在与%2$s战斗时不慎走入了火中 # death.attack.inFire.player=%1$s在与%2$s战斗时不慎走入了火中
death.attack.inFire.item=%1$s在与持有%3$s的%2$s战斗时不慎走入了火中 # death.attack.inFire.item=%1$s在与持有%3$s的%2$s战斗时不慎走入了火中
death.attack.inWall=%1$s在墙里窒息而亡 # death.attack.inWall=%1$s在墙里窒息而亡
death.attack.inWall.player=%1$s在与%2$s战斗时在墙里窒息而亡 # death.attack.inWall.player=%1$s在与%2$s战斗时在墙里窒息而亡
death.attack.inWall.item=%1$s在与持有%3$s的%2$s战斗时在墙里窒息而亡 # death.attack.inWall.item=%1$s在与持有%3$s的%2$s战斗时在墙里窒息而亡
death.attack.lava=%1$s试图在熔岩里游泳 # death.attack.lava=%1$s试图在熔岩里游泳
death.attack.lava.player=%1$s在试图逃离%2$s时试图在熔岩里游泳 # death.attack.lava.player=%1$s在试图逃离%2$s时试图在熔岩里游泳
death.attack.lava.item=%1$s在试图逃离持有%3$s的%2$s时试图在熔岩里游泳 # death.attack.lava.item=%1$s在试图逃离持有%3$s的%2$s时试图在熔岩里游泳
death.attack.lightningBolt=%1$s被闪电击中 # death.attack.lightningBolt=%1$s被闪电击中
death.attack.lightningBolt.player=%1$s在与%2$s战斗时被闪电击中 # death.attack.lightningBolt.player=%1$s在与%2$s战斗时被闪电击中
death.attack.lightningBolt.item=%1$s在与持有%3$s的%2$s战斗时被闪电击中 # death.attack.lightningBolt.item=%1$s在与持有%3$s的%2$s战斗时被闪电击中
death.attack.magic=%1$s被魔法杀死了 # death.attack.magic=%1$s被魔法杀死了
death.attack.hotFloor=%1$s发现地板是熔岩做的 # death.attack.hotFloor=%1$s发现地板是熔岩做的
death.attack.hotFloor.player=%1$s因%2$s而步入危险之地 # death.attack.hotFloor.player=%1$s因%2$s而步入危险之地
death.attack.hotFloor.item=%1$s因持有%3$s的%2$s而步入危险之地 # death.attack.hotFloor.item=%1$s因持有%3$s的%2$s而步入危险之地
death.attack.mob=%1$s被%2$s杀死了 # death.attack.mob=%1$s被%2$s杀死了
death.attack.mob.item=%1$s被%2$s用%3$s杀死了 # death.attack.mob.item=%1$s被%2$s用%3$s杀死了
death.attack.sting=%1$s被%2$s蛰死了 # death.attack.sting=%1$s被%2$s蛰死了
death.attack.sting.item=%1$s被%2$s用%3$s蛰死了 # death.attack.sting.item=%1$s被%2$s用%3$s蛰死了
death.attack.onFire=%1$s被烧死了 # death.attack.onFire=%1$s被烧死了
death.attack.onFire.player=%1$s在与%2$s战斗时被烤的酥脆 # death.attack.onFire.player=%1$s在与%2$s战斗时被烤的酥脆
death.attack.onFire.item=%1$s在与持有%3$s的%2$s战斗时被烤的酥脆 # death.attack.onFire.item=%1$s在与持有%3$s的%2$s战斗时被烤的酥脆
death.attack.outOfWorld=%1$s掉出了这个世界 # death.attack.outOfWorld=%1$s掉出了这个世界
death.attack.outOfWorld.player=%1$s与%2$s不共戴天 # death.attack.outOfWorld.player=%1$s与%2$s不共戴天
death.attack.outOfWorld.item=%1$s与持有%3$s的%2$s不共戴天 # death.attack.outOfWorld.item=%1$s与持有%3$s的%2$s不共戴天
death.attack.player=%1$s被%2$s杀死了 # death.attack.player=%1$s被%2$s杀死了
death.attack.player.item=%1$s被%2$s用%3$s杀死了 # death.attack.player.item=%1$s被%2$s用%3$s杀死了
death.attack.spit=%1$s被%2$s的口水淹死了 # death.attack.spit=%1$s被%2$s的口水淹死了
death.attack.starve=%1$s饿死了 # death.attack.starve=%1$s饿死了
death.attack.starve.player=%1$s在与%2$s战斗时饿死了 # death.attack.starve.player=%1$s在与%2$s战斗时饿死了
death.attack.starve.item=%1$s在与持有%3$s的%2$s战斗时饿死了 # death.attack.starve.item=%1$s在与持有%3$s的%2$s战斗时饿死了
death.attack.sweetBerry=%1$s被甜浆果丛刺死了 # death.attack.sweetBerry=%1$s被甜浆果丛刺死了
death.attack.sweetBerry.player=%1$s在试图逃离%2$s时被甜浆果丛刺死了 # death.attack.sweetBerry.player=%1$s在试图逃离%2$s时被甜浆果丛刺死了
death.attack.sweetBerry.item=%1$s在试图逃离持有%3$s的%2$s时被甜浆果丛刺死了 # death.attack.sweetBerry.item=%1$s在试图逃离持有%3$s的%2$s时被甜浆果丛刺死了
death.attack.thorns=%1$s在试图伤害%2$s时被杀 # death.attack.thorns=%1$s在试图伤害%2$s时被杀
death.attack.thorns.item=%1$s在试图伤害%2$s时被%3$s杀死 # death.attack.thorns.item=%1$s在试图伤害%2$s时被%3$s杀死
death.attack.thrown=%1$s被%2$s给砸死了 # death.attack.thrown=%1$s被%2$s给砸死了
death.attack.thrown.item=%1$s被%2$s用%3$s给砸死了 # death.attack.thrown.item=%1$s被%2$s用%3$s给砸死了
death.attack.trident=%1$s被%2$s刺穿了 # death.attack.trident=%1$s被%2$s刺穿了
death.attack.trident.item=%1$s被%2$s使用%3$s刺穿了 # death.attack.trident.item=%1$s被%2$s使用%3$s刺穿了
death.attack.wither=%1$s凋零了 # death.attack.wither=%1$s凋零了
death.attack.wither.player=%1$s在与%2$s战斗时凋零了 # death.attack.wither.player=%1$s在与%2$s战斗时凋零了
death.attack.wither.item=%1$s在与持有%3$s的%2$s战斗时凋零了 # death.attack.wither.item=%1$s在与持有%3$s的%2$s战斗时凋零了
death.attack.freeze=%1$s被冻死了 # death.attack.freeze=%1$s被冻死了
death.attack.freeze.player=%1$s被%2$s冻死了 # death.attack.freeze.player=%1$s被%2$s冻死了
death.attack.freeze.item=%1$s被持有%3$s的%2$s冻死了 # death.attack.freeze.item=%1$s被持有%3$s的%2$s冻死了
death.attack.sonicBoom=%1$s被一道音波尖啸抹除了 # death.attack.sonicBoom=%1$s被一道音波尖啸抹除了
death.attack.sonicBoom.player=%1$s在试图逃离%2$s时被一道音波尖啸抹除了 # death.attack.sonicBoom.player=%1$s在试图逃离%2$s时被一道音波尖啸抹除了
death.attack.stalactite=%1$s被坠落的钟乳石刺穿了 # death.attack.stalactite=%1$s被坠落的钟乳石刺穿了
death.attack.stalactite.player=%1$s在与%2$s战斗时被坠落的钟乳石刺穿了 # death.attack.stalactite.player=%1$s在与%2$s战斗时被坠落的钟乳石刺穿了
death.attack.stalactite.item=%1$s在与持有%3$s的%2$s战斗时被坠落的钟乳石刺穿了 # death.attack.stalactite.item=%1$s在与持有%3$s的%2$s战斗时被坠落的钟乳石刺穿了
death.attack.stalagmite=%1$s被石笋刺穿了 # death.attack.stalagmite=%1$s被石笋刺穿了
death.attack.stalagmite.player=%1$s在与%2$s战斗时被石笋刺穿了 # death.attack.stalagmite.player=%1$s在与%2$s战斗时被石笋刺穿了
death.attack.stalagmite.item=%1$s在与持有%3$s的%2$s战斗时被石笋刺穿了 # death.attack.stalagmite.item=%1$s在与持有%3$s的%2$s战斗时被石笋刺穿了
death.attack.witherSkull=%1$s被%2$s发射的头颅射杀 # death.attack.witherSkull=%1$s被%2$s发射的头颅射杀
death.attack.witherSkull.item=%1$s被%2$s用%3$s发射的头颅射杀 # death.attack.witherSkull.item=%1$s被%2$s用%3$s发射的头颅射杀
death.attack.even_more_magic=%1$s被不为人知的魔法杀死了 # death.attack.even_more_magic=%1$s被不为人知的魔法杀死了
death.attack.genericKill=%1$s被杀死了 # death.attack.genericKill=%1$s被杀死了
death.attack.genericKill.player=%1$s在与%2$s战斗时被杀死了 # death.attack.genericKill.player=%1$s在与%2$s战斗时被杀死了
death.attack.genericKill.item=%1$s在与持有%3$s的%2$s战斗时被杀死了 # death.attack.genericKill.item=%1$s在与持有%3$s的%2$s战斗时被杀死了
death.attack.dragonBreath=%1$s被龙息烤熟了 # death.attack.dragonBreath=%1$s被龙息烤熟了
death.attack.dragonBreath.player=%1$s被%2$s的龙息烤熟了 # death.attack.dragonBreath.player=%1$s被%2$s的龙息烤熟了
death.attack.dryout=%1$s因脱水而死 death.attack.dryout=%1$s因脱水而死
death.attack.dryout.player=%1$s在试图逃离%2$s时因脱水而死 death.attack.dryout.player=%1$s在试图逃离%2$s时因脱水而死
death.attack.outsideBorder=%1$s脱离了这个世界 death.attack.outsideBorder=%1$s脱离了这个世界
death.attack.outsideBorder.player=%1$s在与%2$s战斗时脱离了这个世界 death.attack.outsideBorder.player=%1$s在与%2$s战斗时脱离了这个世界
death.fell.accident.generic=%1$s从高处摔了下来 # death.fell.accident.generic=%1$s从高处摔了下来
death.fell.assist=%1$s因为%2$s注定要摔死 # death.fell.assist=%1$s因为%2$s注定要摔死
death.fell.assist.item=%1$s因为%2$s使用了%3$s注定要摔死 # death.fell.assist.item=%1$s因为%2$s使用了%3$s注定要摔死
death.fell.finish=%1$s摔伤得太重并被%2$s完结了生命 # death.fell.finish=%1$s摔伤得太重并被%2$s完结了生命
death.fell.finish.item=%1$s摔伤得太重并被%2$s用%3$s完结了生命 # death.fell.finish.item=%1$s摔伤得太重并被%2$s用%3$s完结了生命
death.fell.killer=%1$s注定要摔死 death.fell.killer=%1$s注定要摔死
entity.area_effect_cloud.name=区域效果云
multiplayer.player.joined=%s加入了游戏 # entity.armor_stand.name=盔甲架
multiplayer.player.left=%s退出了游戏 # entity.arrow.name=箭
entity.bat.name=蝙蝠
entity.area_effect_cloud.name=区域效果云 # entity.bee.name=蜜蜂
entity.armor_stand.name=盔甲架 # entity.blaze.name=烈焰人
entity.arrow.name=箭 # entity.boat.name=船
entity.bat.name=蝙蝠 # entity.cat.name=猫
entity.bee.name=蜜蜂 # entity.cave_spider.name=洞穴蜘蛛
entity.blaze.name=烈焰人 # entity.chicken.name=鸡
entity.boat.name=船 # entity.cow.name=牛
entity.cat.name=猫 # entity.creeper.name=苦力怕
entity.cave_spider.name=洞穴蜘蛛 # entity.dolphin.name=海豚
entity.chicken.name=鸡 # entity.goat.name=山羊
entity.cow.name=牛 # entity.panda.name=熊猫
entity.creeper.name=苦力怕 # entity.donkey.name=驴
entity.dolphin.name=海豚 # entity.dragon_fireball.name=末影龙火球
entity.goat.name=山羊 # entity.drowned.name=溺尸
entity.panda.name=熊猫 # entity.egg.name=鸡蛋
entity.donkey.name=驴 # entity.elder_guardian.name=远古守卫者
entity.dragon_fireball.name=末影龙火球 # entity.ender_crystal.name=末地水晶
entity.drowned.name=溺尸 # entity.ender_dragon.name=末影龙
entity.egg.name=鸡蛋 # entity.enderman.name=末影人
entity.elder_guardian.name=远古守卫者 # entity.endermite.name=末影螨
entity.ender_crystal.name=末地水晶 # entity.ender_pearl.name=末影珍珠
entity.ender_dragon.name=末影龙 # entity.evocation_illager.name=唤魔者
entity.enderman.name=末影人 # entity.evocation_fang.name=唤魔者尖牙
entity.endermite.name=末影螨 # entity.eye_of_ender_signal.name=末影之眼
entity.ender_pearl.name=末影珍珠 # entity.falling_block.name=下落的方块
entity.evocation_illager.name=唤魔者 # entity.fireball.name=火球
entity.evocation_fang.name=唤魔者尖牙 # entity.fireworks_rocket.name=烟花火箭
entity.eye_of_ender_signal.name=末影之眼 # entity.fishing_hook.name=鱼钩
entity.falling_block.name=下落的方块 # entity.fish.clownfish.name=小丑鱼
entity.fireball.name=火球 # entity.fox.name=狐狸
entity.fireworks_rocket.name=烟花火箭 # entity.cod.name=鳕鱼
entity.fishing_hook.name=鱼钩 # entity.pufferfish.name=河豚
entity.fish.clownfish.name=小丑鱼 # entity.salmon.name=鲑鱼
entity.fox.name=狐狸 # entity.tropicalfish.name=热带鱼
entity.cod.name=鳕鱼 # entity.axolotl.name=美西螈
entity.pufferfish.name=河豚 # entity.ghast.name=恶魂
entity.salmon.name=鲑鱼 # entity.glow_squid.name=发光鱿鱼
entity.tropicalfish.name=热带鱼 # entity.piglin_brute.name=猪灵蛮兵
entity.axolotl.name=美西螈 # entity.guardian.name=守卫者
entity.ghast.name=恶魂 # entity.hoglin.name=疣猪兽
entity.glow_squid.name=发光鱿鱼 # entity.horse.name=马
entity.piglin_brute.name=猪灵蛮兵 # entity.husk.name=尸壳
entity.guardian.name=守卫者 # entity.ravager.name=劫掠兽
entity.hoglin.name=疣猪兽 # entity.iron_golem.name=铁傀儡
entity.horse.name=马 # entity.item.name=物品
entity.husk.name=尸壳 # entity.leash_knot.name=拴绳结
entity.ravager.name=劫掠兽 # entity.lightning_bolt.name=闪电束
entity.iron_golem.name=铁傀儡 # entity.lingering_potion.name=滞留药水
entity.item.name=物品 # entity.llama.name=羊驼
entity.leash_knot.name=拴绳结 # entity.trader_llama.name=行商羊驼
entity.lightning_bolt.name=闪电束 # entity.llama_spit.name=羊驼唾沫
entity.lingering_potion.name=滞留药水 # entity.magma_cube.name=岩浆怪
entity.llama.name=羊驼 # entity.minecart.name=矿车
entity.trader_llama.name=行商羊驼 # entity.chest_minecart.name=运输矿车
entity.llama_spit.name=羊驼唾沫 # entity.command_block_minecart.name=命令方块矿车
entity.magma_cube.name=岩浆怪 # entity.furnace_minecart.name=动力矿车
entity.minecart.name=矿车 # entity.hopper_minecart.name=漏斗矿车
entity.chest_minecart.name=运输矿车 # entity.tnt_minecart.name=TNT矿车
entity.command_block_minecart.name=命令方块矿车 # entity.mule.name=骡
entity.furnace_minecart.name=动力矿车 # entity.mooshroom.name=哞菇
entity.hopper_minecart.name=漏斗矿车 # entity.moving_block.name=移动中的方块
entity.tnt_minecart.name=TNT矿车 # entity.ocelot.name=豹猫
entity.mule.name=骡 # entity.painting.name=画
entity.mooshroom.name=哞菇 # entity.parrot.name=鹦鹉
entity.moving_block.name=移动中的方块 # entity.phantom.name=幻翼
entity.ocelot.name=豹猫 # entity.pig.name=猪
entity.painting.name=画 # entity.piglin.name=猪灵
entity.parrot.name=鹦鹉 # entity.pillager.name=掠夺者
entity.phantom.name=幻翼 # entity.polar_bear.name=北极熊
entity.pig.name=猪 # entity.rabbit.name=兔子
entity.piglin.name=猪灵 # entity.sheep.name=绵羊
entity.pillager.name=掠夺者 # entity.shulker.name=潜影贝
entity.polar_bear.name=北极熊 # entity.shulker_bullet.name=潜影弹
entity.rabbit.name=兔子 # entity.silverfish.name=蠹虫
entity.sheep.name=绵羊 # entity.skeleton.name=骷髅
entity.shulker.name=潜影贝 # entity.skeleton_horse.name=骷髅马
entity.shulker_bullet.name=潜影弹 # entity.stray.name=流浪者
entity.silverfish.name=蠹虫 # entity.slime.name=史莱姆
entity.skeleton.name=骷髅 # entity.small_fireball.name=小火球
entity.skeleton_horse.name=骷髅马 # entity.sniffer.name=嗅探兽
entity.stray.name=流浪者 # entity.snowball.name=雪球
entity.slime.name=史莱姆 # entity.snow_golem.name=雪傀儡
entity.small_fireball.name=小火球 # entity.spider.name=蜘蛛
entity.sniffer.name=嗅探兽 # entity.splash_potion.name=药水
entity.snowball.name=雪球 # entity.squid.name=鱿鱼
entity.snow_golem.name=雪傀儡 # entity.strider.name=炽足兽
entity.spider.name=蜘蛛 # entity.tnt.name=TNT
entity.splash_potion.name=药水 # entity.thrown_trident.name=三叉戟
entity.squid.name=鱿鱼 # entity.tripod_camera.name=相机
entity.strider.name=炽足兽 # entity.turtle.name=海龟
entity.tnt.name=TNT # entity.unknown.name=未知
entity.thrown_trident.name=三叉戟 # entity.vex.name=恼鬼
entity.tripod_camera.name=相机 # entity.villager.name=村民
entity.turtle.name=海龟 # entity.villager.armor=盔甲匠
entity.unknown.name=未知 # entity.villager.butcher=屠夫
entity.vex.name=恼鬼 # entity.villager.cartographer=制图师
entity.villager.name=村民 # entity.villager.cleric=牧师
entity.villager.armor=盔甲匠 # entity.villager.farmer=农民
entity.villager.butcher=屠夫 # entity.villager.fisherman=渔夫
entity.villager.cartographer=制图师 # entity.villager.fletcher=制箭师
entity.villager.cleric=牧师 # entity.villager.leather=皮匠
entity.villager.farmer=农民 # entity.villager.librarian=图书管理员
entity.villager.fisherman=渔夫 # entity.villager.shepherd=牧羊人
entity.villager.fletcher=制箭师 # entity.villager.tool=工具匠
entity.villager.leather=皮匠 # entity.villager.weapon=武器匠
entity.villager.librarian=图书管理员 # entity.villager.mason=石匠
entity.villager.shepherd=牧羊人 # entity.villager.unskilled=傻子
entity.villager.tool=工具匠 # entity.villager_v2.name=村民
entity.villager.weapon=武器匠 # entity.vindicator.name=卫道士
entity.villager.mason=石匠 # entity.wandering_trader.name=流浪商人
entity.villager.unskilled=傻子 # entity.witch.name=女巫
entity.villager_v2.name=村民 # entity.wither.name=凋灵
entity.vindicator.name=卫道士 # entity.wither_skeleton.name=凋灵骷髅
entity.wandering_trader.name=流浪商人 # entity.wither_skull.name=凋灵之首
entity.witch.name=女巫 # entity.wither_skull_dangerous.name=凋灵之首
entity.wither.name=凋灵 # entity.wolf.name=狼
entity.wither_skeleton.name=凋灵骷髅 # entity.xp_orb.name=经验球
entity.wither_skull.name=凋灵之首 # entity.xp_bottle.name=附魔之瓶
entity.wither_skull_dangerous.name=凋灵之首 # entity.zoglin.name=僵尸疣猪兽
entity.wolf.name=狼 # entity.zombie.name=僵尸
entity.xp_orb.name=经验球 # entity.zombie_horse.name=僵尸马
entity.xp_bottle.name=附魔之瓶 # entity.zombie_pigman.name=僵尸猪灵
entity.zoglin.name=僵尸疣猪兽 # entity.zombie_villager.name=僵尸村民
entity.zombie.name=僵尸 # entity.zombie_villager_v2.name=僵尸村民
entity.zombie_horse.name=僵尸马 # entity.sniffer.name=嗅探兽
entity.zombie_pigman.name=僵尸猪灵 # entity.frog.name=青蛙
entity.zombie_villager.name=僵尸村民 # entity.tadpole.name=蝌蚪
entity.zombie_villager_v2.name=僵尸村民 # entity.warden.name=监守者
entity.sniffer.name=嗅探兽 # entity.allay.name=悦灵
entity.frog.name=青蛙 # entity.camel.name=骆驼
entity.tadpole.name=蝌蚪 # entity.chest_raft.name=带宝箱的的竹筏
entity.warden.name=监守者 # multiplayer.player.joined=%s加入了游戏
entity.allay.name=悦灵 # multiplayer.player.left=%s退出了游戏
entity.camel.name=骆驼 #
entity.chest_raft.name=带宝箱的的竹筏 #
)"; )";