diff --git a/mods/ITEMS/3d_armor/3d_armor/api.lua b/mods/ITEMS/3d_armor/3d_armor/api.lua index d562d61..04b3c6e 100644 --- a/mods/ITEMS/3d_armor/3d_armor/api.lua +++ b/mods/ITEMS/3d_armor/3d_armor/api.lua @@ -34,7 +34,8 @@ armor = { elements = {"head", "torso", "legs", "feet"}, physics = {"jump", "speed", "gravity"}, attributes = {"heal", "fire", "water"}, - formspec = "image[2.5,0;2,4;armor_preview]".. + formspec = "model[2.5,0;2,4;armor_preview]" .. + -- "image[2.5,0;2,4;armor_preview]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. @@ -525,7 +526,20 @@ armor.get_armor_formspec = function(self, name, listring) formspec = formspec.."listring[current_player;main]".. "listring[detached:"..name.."_armor;armor]" end - formspec = formspec:gsub("armor_preview", armor.textures[name].preview) + -- formspec = formspec:gsub("armor_preview", armor.textures[name].preview) + local player = minetest.get_player_by_name(name) + local anim = player:get_local_animation() + local player_model = table.concat({ + "player_model_"..name, + player:get_properties().mesh, + table.concat(player:get_properties().textures,","), + table.concat({0,-150},","), + "false", + "true", + table.concat({anim.x,anim.y},","), + "30" + },";") + formspec = formspec:gsub("armor_preview",player_model) formspec = formspec:gsub("armor_level", armor.def[name].level) for _, attr in pairs(self.attributes) do formspec = formspec:gsub("armor_attr_"..attr, armor.def[name][attr]) diff --git a/mods/MTG/sfinv/README.txt b/mods/PLAYER/sfinv/README.txt similarity index 100% rename from mods/MTG/sfinv/README.txt rename to mods/PLAYER/sfinv/README.txt diff --git a/mods/MTG/sfinv/api.lua b/mods/PLAYER/sfinv/api.lua similarity index 98% rename from mods/MTG/sfinv/api.lua rename to mods/PLAYER/sfinv/api.lua index 1dbc44a..ba17910 100644 --- a/mods/MTG/sfinv/api.lua +++ b/mods/PLAYER/sfinv/api.lua @@ -35,7 +35,6 @@ function sfinv.get_nav_fs(player, context, nav, current_idx) return "" end end - local theme_inv = [[ image[0,5.2;1,1;gui_hb_bg.png] image[1,5.2;1,1;gui_hb_bg.png] @@ -52,6 +51,7 @@ local theme_inv = [[ function sfinv.make_formspec(player, context, content, show_inv, size) local tmp = { size or "size[8,9.1]", + "background9[-2,-2;12,13.1;sfinv_bg.png;false;64,96]", sfinv.get_nav_fs(player, context, context.nav_titles, context.nav_idx), show_inv and theme_inv or "", content diff --git a/mods/MTG/sfinv/init.lua b/mods/PLAYER/sfinv/init.lua similarity index 88% rename from mods/MTG/sfinv/init.lua rename to mods/PLAYER/sfinv/init.lua index 71e9ee7..81e7f45 100644 --- a/mods/MTG/sfinv/init.lua +++ b/mods/PLAYER/sfinv/init.lua @@ -7,8 +7,10 @@ local S = minetest.get_translator("sfinv") sfinv.register_page("sfinv:crafting", { title = S("Crafting"), + icon = "crafting_icon.png", get = function(self, player, context) return sfinv.make_formspec(player, context, [[ + style_type[list;size=1,spacing=.5] list[current_player;craft;1.75,0.5;3,3;] list[current_player;craftpreview;5.75,1.5;1,1;] image[4.75,1.5;1,1;sfinv_crafting_arrow.png] diff --git a/mods/MTG/sfinv/license.txt b/mods/PLAYER/sfinv/license.txt similarity index 100% rename from mods/MTG/sfinv/license.txt rename to mods/PLAYER/sfinv/license.txt diff --git a/mods/MTG/sfinv/locale/sfinv.de.tr b/mods/PLAYER/sfinv/locale/sfinv.de.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.de.tr rename to mods/PLAYER/sfinv/locale/sfinv.de.tr diff --git a/mods/MTG/sfinv/locale/sfinv.es.tr b/mods/PLAYER/sfinv/locale/sfinv.es.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.es.tr rename to mods/PLAYER/sfinv/locale/sfinv.es.tr diff --git a/mods/MTG/sfinv/locale/sfinv.fr.tr b/mods/PLAYER/sfinv/locale/sfinv.fr.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.fr.tr rename to mods/PLAYER/sfinv/locale/sfinv.fr.tr diff --git a/mods/MTG/sfinv/locale/sfinv.id.tr b/mods/PLAYER/sfinv/locale/sfinv.id.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.id.tr rename to mods/PLAYER/sfinv/locale/sfinv.id.tr diff --git a/mods/MTG/sfinv/locale/sfinv.it.tr b/mods/PLAYER/sfinv/locale/sfinv.it.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.it.tr rename to mods/PLAYER/sfinv/locale/sfinv.it.tr diff --git a/mods/MTG/sfinv/locale/sfinv.ms.tr b/mods/PLAYER/sfinv/locale/sfinv.ms.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.ms.tr rename to mods/PLAYER/sfinv/locale/sfinv.ms.tr diff --git a/mods/MTG/sfinv/locale/sfinv.ru.tr b/mods/PLAYER/sfinv/locale/sfinv.ru.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.ru.tr rename to mods/PLAYER/sfinv/locale/sfinv.ru.tr diff --git a/mods/MTG/sfinv/locale/sfinv.se.tr b/mods/PLAYER/sfinv/locale/sfinv.se.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.se.tr rename to mods/PLAYER/sfinv/locale/sfinv.se.tr diff --git a/mods/MTG/sfinv/locale/sfinv.zh_CN.tr b/mods/PLAYER/sfinv/locale/sfinv.zh_CN.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.zh_CN.tr rename to mods/PLAYER/sfinv/locale/sfinv.zh_CN.tr diff --git a/mods/MTG/sfinv/locale/sfinv.zh_TW.tr b/mods/PLAYER/sfinv/locale/sfinv.zh_TW.tr similarity index 100% rename from mods/MTG/sfinv/locale/sfinv.zh_TW.tr rename to mods/PLAYER/sfinv/locale/sfinv.zh_TW.tr diff --git a/mods/MTG/sfinv/locale/template.txt b/mods/PLAYER/sfinv/locale/template.txt similarity index 100% rename from mods/MTG/sfinv/locale/template.txt rename to mods/PLAYER/sfinv/locale/template.txt diff --git a/mods/MTG/sfinv/mod.conf b/mods/PLAYER/sfinv/mod.conf similarity index 100% rename from mods/MTG/sfinv/mod.conf rename to mods/PLAYER/sfinv/mod.conf diff --git a/mods/PLAYER/sfinv/textures/sfinv_bg.png b/mods/PLAYER/sfinv/textures/sfinv_bg.png new file mode 100644 index 0000000..da97d02 Binary files /dev/null and b/mods/PLAYER/sfinv/textures/sfinv_bg.png differ diff --git a/mods/MTG/sfinv/textures/sfinv_crafting_arrow.png b/mods/PLAYER/sfinv/textures/sfinv_crafting_arrow.png similarity index 100% rename from mods/MTG/sfinv/textures/sfinv_crafting_arrow.png rename to mods/PLAYER/sfinv/textures/sfinv_crafting_arrow.png