Skip to content

Commit

Permalink
Compatibility with Voxelibre
Browse files Browse the repository at this point in the history
This allows skinsdb to replace or supplement
Voxelibre’s skin system, using its mcl_skins.

Downgrades player_api to an optional dependency.
  • Loading branch information
JadedCtrl committed Jul 21, 2024
1 parent b7cd514 commit 6660861
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 30 deletions.
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
24 changes: 24 additions & 0 deletions api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ function skins.get_player_skin(player)
storage:set_string(player_name, "")
end
end

-- Voxelibre compatibility
if minetest.global_exists("mcl_skins") 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 +59,13 @@ function skins.assign_player_skin(player, skin)
else
return false
end

-- Voxelibre compatibility
if minetest.global_exists("mcl_skins") 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 +80,10 @@ function skins.update_player_skin(player)
if minetest.global_exists("sfinv") and sfinv.enabled then
sfinv.set_player_inventory_formspec(player)
end
-- Voxelibre compatibility
if minetest.global_exists("mcl_skins") then
mcl_skins.update_player_skin(player);
end
end
end

Expand Down
46 changes: 25 additions & 21 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ dofile(skins.modpath.."/skins_updater.lua")
skins.ie = nil
skins.http = nil

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

-- 3d_armor compatibility
if minetest.global_exists("armor") then
skins.armor_loaded = true
Expand Down Expand Up @@ -72,27 +74,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 minetest.global_exists("mcl_skins") 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

0 comments on commit 6660861

Please sign in to comment.