From e0624b11d02be4617976bf87137e2760867c0749 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 31 Oct 2024 21:53:56 +0300
Subject: [PATCH] rename item.get_model_name and item.get_placing_block

---
 doc/en/scripting/builtins/libitem.md                    | 4 ++--
 doc/ru/scripting/builtins/libitem.md                    | 4 ++--
 res/content/base/scripts/components/drop.lua            | 2 +-
 res/content/base/scripts/components/player_animator.lua | 2 +-
 src/logic/scripting/lua/libs/libitem.cpp                | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/en/scripting/builtins/libitem.md b/doc/en/scripting/builtins/libitem.md
index 43440070..58dd7ba9 100644
--- a/doc/en/scripting/builtins/libitem.md
+++ b/doc/en/scripting/builtins/libitem.md
@@ -20,8 +20,8 @@ item.defs_count() -> int
 item.icon(itemid: int) -> str
 
 -- Returns the integer id 'placing-block' or 0
-item.get_placing_block(itemid: int) -> int
+item.placing_block(itemid: int) -> int
 
 -- Returns the value of the `model-name` property
-item.get_model_name(itemid: int) -> str
+item.model_name(itemid: int) -> str
 ```
diff --git a/doc/ru/scripting/builtins/libitem.md b/doc/ru/scripting/builtins/libitem.md
index c0775fd6..4d0b9a62 100644
--- a/doc/ru/scripting/builtins/libitem.md
+++ b/doc/ru/scripting/builtins/libitem.md
@@ -20,10 +20,10 @@ item.defs_count() -> int
 item.icon(itemid: int) -> str
 
 -- Возвращает числовой id блока, назначенного как 'placing-block' или 0
-item.get_placing_block(itemid: int) -> int
+item.placing_block(itemid: int) -> int
 
 -- Возвращает значение свойства `model-name`
-item.get_model_name(itemid: int) -> str
+item.model_name(itemid: int) -> str
 ```
 
 
diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua
index dee4255c..195c5270 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.get_model_name(dropitem.id))
+    rig:set_model(0, item.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 2c9517b4..871284d5 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.get_model_name(itemid))
+    rig:set_model(itemIndex, item.model_name(itemid))
     rig:set_matrix(itemIndex, mat4.rotate({0, 1, 0}, -80))
 end
 
diff --git a/src/logic/scripting/lua/libs/libitem.cpp b/src/logic/scripting/lua/libs/libitem.cpp
index 0bef6d79..a5ba27e5 100644
--- a/src/logic/scripting/lua/libs/libitem.cpp
+++ b/src/logic/scripting/lua/libs/libitem.cpp
@@ -54,14 +54,14 @@ static int l_caption(lua::State* L) {
     return 0;
 }
 
-static int l_get_placing_block(lua::State* L) {
+static int l_placing_block(lua::State* L) {
     if (auto def = get_item_def(L, 1)) {
         return lua::pushinteger(L, def->rt.placingBlock);
     }
     return 0;
 }
 
-static int l_get_model_name(lua::State* L) {
+static int l_model_name(lua::State* L) {
     if (auto def = get_item_def(L, 1)) {
         return lua::pushstring(L, def->modelName);
     }
@@ -75,6 +75,6 @@ const luaL_Reg itemlib[] = {
     {"defs_count", lua::wrap<l_defs_count>},
     {"icon", lua::wrap<l_get_icon>},
     {"caption", lua::wrap<l_caption>},
-    {"get_placing_block", lua::wrap<l_get_placing_block>},
-    {"get_model_name", lua::wrap<l_get_model_name>},
+    {"placing_block", lua::wrap<l_placing_block>},
+    {"model_name", lua::wrap<l_model_name>},
     {NULL, NULL}};