Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with Voxelibre #109

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ max_line_length = 999
globals = {
"minetest", "unified_inventory", "core",
"player_api", "clothing", "armor", "sfinv",
"mcl_skins",
}

read_globals = {
Expand Down
21 changes: 21 additions & 0 deletions api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@ function skins.get_player_skin(player)
storage:set_string(player_name, "")
end
end

if skins.use_voxelibre_compat then
local texture = mcl_skins.player_skins[player].simple_skins_id
if texture then
for k, listed_skin in pairs(skins.meta) do
if listed_skin._texture == texture then
return listed_skin
end
end
end
end

return skin or skins.get(skins.default)
end

Expand All @@ -46,6 +58,12 @@ function skins.assign_player_skin(player, skin)
else
return false
end

if skins.use_voxelibre_compat then
mcl_skins.player_skins[player].simple_skins_id = skin_obj:get_texture()
mcl_skins.save(player)
end

return true, skin_obj
end

Expand All @@ -60,6 +78,9 @@ function skins.update_player_skin(player)
if minetest.global_exists("sfinv") and sfinv.enabled then
sfinv.set_player_inventory_formspec(player)
end
if skins.use_voxelibre_compat then
mcl_skins.update_player_skin(player);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mcl_skins.update_player_skin(player);
mcl_skins.update_player_skin(player)

end
end
end

Expand Down
47 changes: 26 additions & 21 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ skins = {}
skins.modpath = minetest.get_modpath(minetest.get_current_modname())
skins.default = "character"

skins.use_voxelibre_compat = minetest.global_exists("mcl_skins")
assert(minetest.global_exists("player_api") or minetest.global_exists("mcl_skins"), "One of player_api or mcl_skins is required.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Applying general Minetest code style rules here.

Suggested change
assert(minetest.global_exists("player_api") or minetest.global_exists("mcl_skins"), "One of player_api or mcl_skins is required.")
assert(minetest.global_exists("player_api") or minetest.global_exists("mcl_skins"),
"One of player_api or mcl_skins is required.")


dofile(skins.modpath.."/skin_meta_api.lua")
dofile(skins.modpath.."/api.lua")
dofile(skins.modpath.."/skinlist.lua")
Expand Down Expand Up @@ -72,27 +75,29 @@ minetest.register_on_shutdown(function()
end
end)

player_api.register_model("skinsdb_3d_armor_character_5.b3d", {
animation_speed = 30,
textures = {
"blank.png",
"blank.png",
"blank.png",
"blank.png"
},
animations = {
stand = {x=0, y=79},
lay = {x=162, y=166},
walk = {x=168, y=187},
mine = {x=189, y=198},
walk_mine = {x=200, y=219},
sit = {x=81, y=160},
-- compatibility w/ the emote mod
wave = {x = 192, y = 196, override_local = true},
point = {x = 196, y = 196, override_local = true},
freeze = {x = 205, y = 205, override_local = true},
},
})
if minetest.global_exists("player_api") then
player_api.register_model("skinsdb_3d_armor_character_5.b3d", {
animation_speed = 30,
textures = {
"blank.png",
"blank.png",
"blank.png",
"blank.png"
},
animations = {
stand = {x=0, y=79},
lay = {x=162, y=166},
walk = {x=168, y=187},
mine = {x=189, y=198},
walk_mine = {x=200, y=219},
sit = {x=81, y=160},
-- compatibility w/ the emote mod
wave = {x = 192, y = 196, override_local = true},
point = {x = 196, y = 196, override_local = true},
freeze = {x = 205, y = 205, override_local = true},
},
})
end

-- Register default character.png if not part of this mod
local default_skin_obj = skins.get(skins.default)
Expand Down
3 changes: 1 addition & 2 deletions mod.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name = skinsdb
description = Player skin mod, supporting unified_inventory, sfinv and smart_inventory
depends = player_api
optional_depends = unified_inventory,3d_armor,clothing,sfinv,hand_monoid
optional_depends = unified_inventory,3d_armor,clothing,mcl_skins,player_api,sfinv,hand_monoid
min_minetest_version = 5.4.0
18 changes: 11 additions & 7 deletions skin_meta_api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ function skin_class:apply_skin_to_player(player)
local playername = player:get_player_name()
local ver = self:get_meta("format") or "1.0"

player_api.set_model(player, "skinsdb_3d_armor_character_5.b3d")
if minetest.global_exists("player_api") then
player_api.set_model(player, "skinsdb_3d_armor_character_5.b3d")
end

local v10_texture = "blank.png"
local v18_texture = "blank.png"
Expand Down Expand Up @@ -195,12 +197,14 @@ function skin_class:apply_skin_to_player(player)
end
end

player_api.set_textures(player, {
v10_texture,
v18_texture,
armor_texture,
wielditem_texture,
})
if minetest.global_exists("player_api") then
player_api.set_textures(player, {
v10_texture,
v18_texture,
armor_texture,
wielditem_texture,
})
end

player:set_properties({
visual_size = {
Expand Down
4 changes: 4 additions & 0 deletions skinlist.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ function skins.register_skin(path, filename)
skin_obj._legacy_name = filename_noext:gsub("[._]+", "_")
end

if skins.use_voxelibre_compat then
mcl_skins.register_simple_skin({texture = filename})
end

if playername then
skin_obj:set_meta("assignment", "player:"..playername)
skin_obj:set_meta("playername", playername)
Expand Down