fix: fix missing language

src/DeathMessage.cpp

@@ -87,6 +87,8 @@ DeathMessageResult makeDeathMessage(
         }
         if (!DeathMessages::Entry::getInstance().isResourceI18nLoaded) {
             res.first=tr(res.first, res.second);
+            logger->info("原消息name为 {}", res.first);
+
             res.second = {};
         }
         return res;
@@ -131,7 +133,7 @@ DeathMessageResult tryTranslateHardCodedFallingDeathMessage(
     } else {
         deathMessage.first = "death.attack.generic";
     }
-    return makeDeathMessage((int)SharedTypes::Legacy::ActorDamageCause::Fall, deathMessage, name, killer, weaponName, isEscaping, true);
+    return makeDeathMessage((int)SharedTypes::Legacy::ActorDamageCause::Fall, deathMessage, name, killer, weaponName, false, true);
 }
 
 std::optional<DeathMessageResult> tryTranslateHardCodedDeathMessage(

src/Entry.cpp

@@ -92,7 +92,7 @@ void Entry::loadI18n() {
 
 
 void Entry::loadResourcePack() {
-    auto mResource = std::make_unique<gmlib::i18n::ResourceI18n>(getSelf().getModDir() / u8"lang", MOD_NAME, 0, 16, 0);
+    auto mResource = std::make_unique<gmlib::i18n::ResourceI18n>(getSelf().getModDir() / u8"lang", MOD_NAME, 0, 16, 1);
     mResource->addLanguage("en_US", en_US);
     mResource->addLanguage("zh_CN", zh_CN);
     mResource->loadAllLanguages();

src/Language.h

@@ -35,6 +35,7 @@ death.attack.flyIntoWall.item=%1 felt the force of kinetic energy while trying t
 death.attack.generic=%1$s died
 death.attack.generic.player=%1$s died from %2$s
 death.attack.indirectMagic=%1$s was killed by magic used by %2$s
+death.attack.indirectMagic.player=%1$s was killed by magic used by %2$s
 death.attack.indirectMagic.item=%1$s was killed by %2$s using %3$s
 death.attack.inFire=%1$s was consumed by fire
 death.attack.inFire.player=%1$s accidentally walked into fire while fighting %2$s
@@ -72,8 +73,10 @@ death.attack.sweetBerry=%1$s was pricked to death by sweet berry bushes
 death.attack.sweetBerry.player=%1$s was pricked to death by sweet berry bushes while trying to escape %2$s
 death.attack.sweetBerry.item=%1$s was pricked to death by sweet berry bushes while trying to escape %2$s holding %3$s
 death.attack.thorns=%1$s was killed trying to hurt %2$s
+death.attack.thorns.player=%1$s was killed trying to hurt %2$s
 death.attack.thorns.item=%1$s was killed by %3$s when trying to hurt %2$s
 death.attack.thrown=%1$s was pummeled by %2$s
+death.attack.thrown.player=%1$s was pummeled by %2$s
 death.attack.thrown.item=%1$s was pummeled by %2$s using %3$s
 death.attack.trident=%1$s was impaled by %2$s
 death.attack.trident.item=%1$s was impaled by %2$s using %3$s
@@ -84,6 +87,7 @@ death.attack.freeze=%1$s froze to death
 death.attack.freeze.player=%1$s was frozen to death by %2$s
 death.attack.freeze.item=%1$s was frozen to death by %2$s holding %3$s
 death.attack.sonicBoom=%1$s was obliterated by a sonic boom
+death.attack.sonicBoom.item=%1$s was obliterated by a sonic boom while trying to escape %2$s
 death.attack.sonicBoom.player=%1$s was obliterated by a sonic boom while trying to escape %2$s
 death.attack.stalactite=%1$s was impaled by a falling stalactite
 death.attack.stalactite.player=%1$s was impaled by a falling stalactite while battling %2$s
@@ -107,6 +111,7 @@ death.fell.accident.generic=%1$s fell from a high place
 death.fell.assist=%1$s was doomed to fall by %2$s
 death.fell.assist.item=%1$s was doomed to fall by %2$s using %3$s
 death.fell.finish=%1$s fell too far and was finished by %2$s
+death.fell.finish.player=%1$s fell too far and was finished by %2$s
 death.fell.finish.item=%1$s fell too far and was finished by %2$s using %3$s
 death.fell.killer=%1$s was doomed to fall
 entity.area_effect_cloud.name=Area Effect Cloud
@@ -274,7 +279,7 @@ death.attack.fall=%1$s 落地过猛
 death.attack.fall.player=%1$s 在试图逃离 %2$s 时落地过猛
 death.attack.fall.item=%1$s 在试图逃离持有 %3$s 的 %2$s 时落地过猛
 death.attack.fallingBlock=%1$s 被坠落的方块压扁了
-death.attack.fallingBlock.player=%1$sz 在与 %2$s 战斗时被坠落的方块压扁了
+death.attack.fallingBlock.player=%1$s 在与 %2$s 战斗时被坠落的方块压扁了
 death.attack.fallingBlock.item=%1$s 在与持有 %3$s 的 %2$s 战斗时被坠落的方块压扁了
 death.attack.fireball=%1$s被 %2$s 用火球烧死了
 death.attack.fireball.item=%1$s被 %2$s 用 %3$s 发射的火球烧死了
@@ -287,6 +292,7 @@ death.attack.flyIntoWall.item=%1$s 在试图逃离持有 %3$s 的 %2$s 时感受
 death.attack.generic=%1$s 死了
 death.attack.generic.player=%1$s 死于 %2$s
 death.attack.indirectMagic=%1$s 被 %2$s 使用的魔法杀死了
+death.attack.indirectMagic.player=%1$s 被 %2$s 使用的魔法杀死了
 death.attack.indirectMagic.item=%1$s 被 %2$s 用 %3$s 杀死了
 death.attack.inFire=%1$s 浴火焚身
 death.attack.inFire.player=%1$s 在与 %2$s 战斗时不慎走入了火中
@@ -305,6 +311,7 @@ death.attack.hotFloor=%1$s 发现地板是熔岩做的
 death.attack.hotFloor.player=%1$s 因 %2$s 而步入危险之地
 death.attack.hotFloor.item=%1$s 因持有 %3$s 的 %2$s 而步入危险之地
 death.attack.mob=%1$s 被 %2$s 杀死了
+death.attack.mob.player=%1$s 被 %2$s 杀死了
 death.attack.mob.item=%1$s 被 %2$s 用 %3$s 杀死了
 death.attack.sting=%1$s 被 %2$s 蛰死了
 death.attack.sting.item=%1$s 被 %2$s 用 %3$s 蛰死了
@@ -323,9 +330,11 @@ death.attack.starve.item=%1$s 在与持有 %3$s 的 %2$s 战斗时饿死了
 death.attack.sweetBerry=%1$s 被甜浆果丛刺死了
 death.attack.sweetBerry.player=%1$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.player=%1$s 在试图伤害 %2$s 时被杀
 death.attack.thorns.item=%1$s 在试图伤害 %2$s 时被 %3$s 杀死
 death.attack.thrown=%1$s 被 %2$s 给砸死了
+death.attack.thrown.player=%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 刺穿了
@@ -337,6 +346,7 @@ death.attack.freeze.player=%1$s 被 %2$s 冻死了
 death.attack.freeze.item=%1$s 被持有 %3$s 的 %2$s 冻死了
 death.attack.sonicBoom=%1$s 被一道音波尖啸抹除了
 death.attack.sonicBoom.player=%1$s 在试图逃离 %2$s 时被一道音波尖啸抹除了
+death.attack.sonicBoom.item=%1$s 在试图逃离 %2$s 时被一道音波尖啸抹除了
 death.attack.stalactite=%1$s 被坠落的钟乳石刺穿了
 death.attack.stalactite.player=%1$s 在与 %2$s 战斗时被坠落的钟乳石刺穿了
 death.attack.stalactite.item=%1$s 在与持有 %3$s 的 %2$s 战斗时被坠落的钟乳石刺穿了
@@ -359,6 +369,7 @@ death.fell.accident.generic=%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.player=%1$s 摔伤得太重并被 %2$s 完结了生命
 death.fell.finish.item=%1$s 摔伤得太重并被 %2$s 用 %3$s 完结了生命
 death.fell.killer=%1$s 注定要摔死