From 9c3d4af9073a79f61eaf2321dfa0f4dfdb87f641 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 30 Oct 2024 12:58:07 +0300
Subject: [PATCH] feat: complete item 'model-name' support

---
 res/content/base/scripts/components/drop.lua            | 2 +-
 res/content/base/scripts/components/player_animator.lua | 2 +-
 src/graphics/render/WorldRenderer.cpp                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua
index 5c454538..dee4255c 100644
--- a/res/content/base/scripts/components/drop.lua
+++ b/res/content/base/scripts/components/drop.lua
@@ -25,7 +25,7 @@ end
 
 do -- setup visuals
     local matrix = mat4.idt()
-    rig:set_model(0, item.name(dropitem.id)..".model")
+    rig:set_model(0, item.get_model_name(dropitem.id))
     local bodysize = math.min(scale[1], scale[2], scale[3]) * DROP_SCALE
     body:set_size({scale[1] * DROP_SCALE, bodysize, scale[3] * DROP_SCALE})
     mat4.mul(matrix, rotation, matrix)
diff --git a/res/content/base/scripts/components/player_animator.lua b/res/content/base/scripts/components/player_animator.lua
index 144b9bb0..2c9517b4 100644
--- a/res/content/base/scripts/components/player_animator.lua
+++ b/res/content/base/scripts/components/player_animator.lua
@@ -7,7 +7,7 @@ local itemIndex = rig:index("item")
 
 local function refresh_model(id)
     itemid = id
-    rig:set_model(itemIndex, item.name(itemid)..".model")
+    rig:set_model(itemIndex, item.get_model_name(itemid))
     rig:set_matrix(itemIndex, mat4.rotate({0, 1, 0}, -80))
 end
 
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index d72e72ac..cec7e3a2 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -381,7 +381,7 @@ void WorldRenderer::renderHands(const Camera& camera, const Assets& assets) {
     modelBatch->draw(
         matrix,
         glm::vec3(1.0f),
-        assets.get<model::Model>(def.name + ".model"),
+        assets.get<model::Model>(def.modelName),
         &map
     );
     Window::clearDepth();