From e3842905e868172f8986a4bd515fafedaa70059d Mon Sep 17 00:00:00 2001
From: Tsubasa6848 <116721335+Tsubasa6848@users.noreply.github.com>
Date: Mon, 29 Apr 2024 23:06:43 +0800
Subject: [PATCH] adapt: adapt to GMLIB v0.12.3

---
 SDK-GMLIB              |  2 +-
 src/DeathMessage.cpp   | 74 ++++++++++++++++++++++++++++++++++++++++++
 src/Initialization.cpp |  7 ++--
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/SDK-GMLIB b/SDK-GMLIB
index cecc827..68df499 160000
--- a/SDK-GMLIB
+++ b/SDK-GMLIB
@@ -1 +1 @@
-Subproject commit cecc827900f147de4c7aed916aeb4bca31b0682c
+Subproject commit 68df499fb59036e8cf8d4b743da4ec4751cd67a6
diff --git a/src/DeathMessage.cpp b/src/DeathMessage.cpp
index aca6023..850fb93 100644
--- a/src/DeathMessage.cpp
+++ b/src/DeathMessage.cpp
@@ -4,6 +4,7 @@ void RegisterDamageDefinition() {
     GMLIB::Mod::DamageCause::setCustomDamageCauseEnabled();
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Anvil, "anvil");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::EntityAttack, "mob");
+    GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::RamAttack, "mob");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Drowning, "drown");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::FallingBlock, "fallingBlock");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Fire, "inFire");
@@ -24,6 +25,79 @@ void RegisterDamageDefinition() {
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Void, "outOfWorld");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::SelfDestruct, "genericKill");
     GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Projectile, "thrown");
+    GMLIB::Mod::DamageCause::setVanillaCauseMessage(ActorDamageCause::Thorns, "thorns");
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.fireball.item",
+        "minecraft:small_fireball"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.trident.item",
+        "minecraft:thrown_trident"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.spit",
+        "minecraft:llama_spit"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.bullet",
+        "minecraft:shulker_bullet"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.arrow.item",
+        "minecraft:arrow"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.explosion.player",
+        "minecraft:fireball"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::Projectile,
+        "death.attack.mob",
+        "minecraft:breeze_wind_charge_projectile"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(ActorDamageCause::Magic, "death.attack.magic", "empty");
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::SonicBoom,
+        "death.attack.sonicBoom",
+        "minecraft:warden"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(ActorDamageCause::Thorns, "death.attack.generic", "empty");
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::EntityExplosion,
+        "death.attack.explosion.player",
+        "all"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::EntityExplosion,
+        "minecraft:wither_skull",
+        "death.attack.witherSkull.item"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::EntityExplosion,
+        "minecraft:wither_skull_dangerous",
+        "death.attack.witherSkull.item"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::EntityAttack,
+        "minecraft:player",
+        "death.attack.player.item"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::EntityAttack,
+        "minecraft:bee",
+        "death.attack.sting.item"
+    );
+    GMLIB::Mod::DamageCause::registerCustomDeathMessage(
+        ActorDamageCause::RamAttack,
+        "minecraft:player",
+        "death.attack.player.item"
+    );
 }
 
 void ListenEvents() {
diff --git a/src/Initialization.cpp b/src/Initialization.cpp
index 2247e71..d8de7ac 100644
--- a/src/Initialization.cpp
+++ b/src/Initialization.cpp
@@ -5,9 +5,8 @@
 ll::Logger deathLogger("Death");
 ll::Logger infoLogger("Server");
 
-GMLIB::Files::JsonConfig*     Config                 = nullptr;
-GMLIB::Files::I18n::LangI18n* Language               = nullptr;
-int                           commandPermissionLevel = 4;
+GMLIB::Files::JsonConfig*     Config   = nullptr;
+GMLIB::Files::I18n::LangI18n* Language = nullptr;
 
 namespace ConfigData {
 bool mServerSideLang = false;
@@ -44,7 +43,7 @@ std::string tr(std::string key, std::vector<std::string> data) {
         }
         return Language->translate(key, data);
     }
-    return I18n::get(key, data);
+    return I18nAPI::get(key, data);
 }
 
 void initConfig() {