diff --git a/mods/rp_armor/init.lua b/mods/rp_armor/init.lua index 0ec6cd6..1eb0aab 100644 --- a/mods/rp_armor/init.lua +++ b/mods/rp_armor/init.lua @@ -66,7 +66,7 @@ function armor.is_slot(itemname, slot) end function armor.get_base_skin(player) - if minetest.get_modpath("player_skins") ~= nil then + if minetest.get_modpath("rp_player_skins") ~= nil then return player_skins.get_skin(player:get_player_name()) else return armor.player_skin diff --git a/mods/rp_default/formspec.lua b/mods/rp_default/formspec.lua index fac320d..852e1ce 100644 --- a/mods/rp_default/formspec.lua +++ b/mods/rp_default/formspec.lua @@ -310,7 +310,7 @@ end if minetest.get_modpath("rp_achievements") ~= nil then form_default_default = form_default_default .. default.ui.tab(-0.9, 2.06, "tab_achievements", "ui_icon_achievements.png", S("Achievements")) end -if minetest.get_modpath("player_skins") ~= nil then +if minetest.get_modpath("rp_player_skins") ~= nil then form_default_default = form_default_default .. default.ui.tab(-0.9, 2.84, "tab_player_skins", "ui_icon_player_skins.png", S("Player Skins")) end if minetest.get_modpath("rp_creative") ~= nil and minetest.settings:get_bool("creative_mode") then @@ -348,7 +348,7 @@ function default.ui.receive_fields(player, form_name, fields) elseif minetest.get_modpath("rp_achievements") ~= nil and fields.tab_achievements then formname = "rp_achievements:achievements" form = achievements.get_formspec(name) - elseif minetest.get_modpath("player_skins") ~= nil and fields.tab_player_skins then + elseif minetest.get_modpath("rp_player_skins") ~= nil and fields.tab_player_skins then formname = "player_skins:player_skins" form = player_skins.get_formspec(name) elseif minetest.get_modpath("rp_creative") ~= nil and minetest.settings:get_bool("creative_mode") and fields.tab_creative then diff --git a/mods/player_skins/README.txt b/mods/rp_player_skins/README.txt similarity index 100% rename from mods/player_skins/README.txt rename to mods/rp_player_skins/README.txt diff --git a/mods/player_skins/init.lua b/mods/rp_player_skins/init.lua similarity index 92% rename from mods/player_skins/init.lua rename to mods/rp_player_skins/init.lua index e3c44eb..9c6d01a 100644 --- a/mods/player_skins/init.lua +++ b/mods/rp_player_skins/init.lua @@ -4,7 +4,7 @@ -- updated by Wuzzy, for Repixture -- -local S = minetest.get_translator("player_skins") +local S = minetest.get_translator("rp_player_skins") player_skins = {} @@ -31,7 +31,7 @@ local function load_legacy_player_skins() legacy_skins[name] = tex end until f:read(0) == nil - minetest.log("action", "[player_skins] Legacy skins file player_skins.dat found and loaded") + minetest.log("action", "[rp_player_skins] Legacy skins file player_skins.dat found and loaded") io.close(f) end @@ -133,13 +133,13 @@ local function on_joinplayer(player) legacy_skins[name] = nil -- Load skin from legacy version (v1.4.2 and before) if legacy_skin == "female" then - minetest.log("action", "[player_skins] Converting legacy skin 'female' for player "..name) + minetest.log("action", "[rp_player_skins] Converting legacy skin 'female' for player "..name) hair = "short_brown" elseif legacy_skin == "male" then - minetest.log("action", "[player_skins] Converting legacy skin 'male' for player "..name) + minetest.log("action", "[rp_player_skins] Converting legacy skin 'male' for player "..name) hair = "beard_brown" else - minetest.log("action", "[player_skins] Unknown legacy skin '"..tostring(legacy_skin).."' detected for player "..name..", setting a random skin") + minetest.log("action", "[rp_player_skins] Unknown legacy skin '"..tostring(legacy_skin).."' detected for player "..name..", setting a random skin") player_skins.set_random_skin(name) return end @@ -173,7 +173,7 @@ local function on_joinplayer(player) player_skins.set_skin(name, skin, cloth, bands, hair, eye) else -- No skin found, set a random one - minetest.log("action", "[player_skins] Player "..name.." appears to be new, setting initial random skin") + minetest.log("action", "[rp_player_skins] Player "..name.." appears to be new, setting initial random skin") player_skins.set_random_skin(name) end end @@ -264,4 +264,4 @@ function player_skins.set_random_skin(name) player_skins.set_skin(name, scol, ccol, bcol, hair, ecol) end -default.log("mod:player_skins", "loaded") +default.log("mod:rp_player_skins", "loaded") diff --git a/mods/player_skins/locale/player_skins.de.tr b/mods/rp_player_skins/locale/rp_player_skins.de.tr similarity index 71% rename from mods/player_skins/locale/player_skins.de.tr rename to mods/rp_player_skins/locale/rp_player_skins.de.tr index f51cc8e..3787047 100644 --- a/mods/player_skins/locale/player_skins.de.tr +++ b/mods/rp_player_skins/locale/rp_player_skins.de.tr @@ -1,4 +1,4 @@ -# textdomain: player_skins +# textdomain: rp_player_skins Random=Zufällig Hair=Haare Eyes=Augen diff --git a/mods/player_skins/locale/player_skins.fr.tr b/mods/rp_player_skins/locale/rp_player_skins.fr.tr similarity index 58% rename from mods/player_skins/locale/player_skins.fr.tr rename to mods/rp_player_skins/locale/rp_player_skins.fr.tr index 34148c5..367fe8e 100644 --- a/mods/player_skins/locale/player_skins.fr.tr +++ b/mods/rp_player_skins/locale/rp_player_skins.fr.tr @@ -1,4 +1,4 @@ -# textdomain: player_skins +# textdomain: rp_player_skins Random= Hair= Eyes= diff --git a/mods/player_skins/locale/template.txt b/mods/rp_player_skins/locale/template.txt similarity index 58% rename from mods/player_skins/locale/template.txt rename to mods/rp_player_skins/locale/template.txt index 34148c5..367fe8e 100644 --- a/mods/player_skins/locale/template.txt +++ b/mods/rp_player_skins/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: player_skins +# textdomain: rp_player_skins Random= Hair= Eyes= diff --git a/mods/player_skins/mod.conf b/mods/rp_player_skins/mod.conf similarity index 75% rename from mods/player_skins/mod.conf rename to mods/rp_player_skins/mod.conf index b721f61..eb41388 100644 --- a/mods/player_skins/mod.conf +++ b/mods/rp_player_skins/mod.conf @@ -1,3 +1,3 @@ -name = player_skins +name = rp_player_skins depends = rp_default, rp_wieldhand, rp_util optional_depends = rp_armor diff --git a/mods/player_skins/textures/player_skins_bands_blue.png b/mods/rp_player_skins/textures/player_skins_bands_blue.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_blue.png rename to mods/rp_player_skins/textures/player_skins_bands_blue.png diff --git a/mods/player_skins/textures/player_skins_bands_cyan.png b/mods/rp_player_skins/textures/player_skins_bands_cyan.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_cyan.png rename to mods/rp_player_skins/textures/player_skins_bands_cyan.png diff --git a/mods/player_skins/textures/player_skins_bands_green.png b/mods/rp_player_skins/textures/player_skins_bands_green.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_green.png rename to mods/rp_player_skins/textures/player_skins_bands_green.png diff --git a/mods/player_skins/textures/player_skins_bands_lime.png b/mods/rp_player_skins/textures/player_skins_bands_lime.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_lime.png rename to mods/rp_player_skins/textures/player_skins_bands_lime.png diff --git a/mods/player_skins/textures/player_skins_bands_magenta.png b/mods/rp_player_skins/textures/player_skins_bands_magenta.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_magenta.png rename to mods/rp_player_skins/textures/player_skins_bands_magenta.png diff --git a/mods/player_skins/textures/player_skins_bands_orange.png b/mods/rp_player_skins/textures/player_skins_bands_orange.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_orange.png rename to mods/rp_player_skins/textures/player_skins_bands_orange.png diff --git a/mods/player_skins/textures/player_skins_bands_purple.png b/mods/rp_player_skins/textures/player_skins_bands_purple.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_purple.png rename to mods/rp_player_skins/textures/player_skins_bands_purple.png diff --git a/mods/player_skins/textures/player_skins_bands_red.png b/mods/rp_player_skins/textures/player_skins_bands_red.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_red.png rename to mods/rp_player_skins/textures/player_skins_bands_red.png diff --git a/mods/player_skins/textures/player_skins_bands_redviolet.png b/mods/rp_player_skins/textures/player_skins_bands_redviolet.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_redviolet.png rename to mods/rp_player_skins/textures/player_skins_bands_redviolet.png diff --git a/mods/player_skins/textures/player_skins_bands_skyblue.png b/mods/rp_player_skins/textures/player_skins_bands_skyblue.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_skyblue.png rename to mods/rp_player_skins/textures/player_skins_bands_skyblue.png diff --git a/mods/player_skins/textures/player_skins_bands_turquoise.png b/mods/rp_player_skins/textures/player_skins_bands_turquoise.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_turquoise.png rename to mods/rp_player_skins/textures/player_skins_bands_turquoise.png diff --git a/mods/player_skins/textures/player_skins_bands_yellow.png b/mods/rp_player_skins/textures/player_skins_bands_yellow.png similarity index 100% rename from mods/player_skins/textures/player_skins_bands_yellow.png rename to mods/rp_player_skins/textures/player_skins_bands_yellow.png diff --git a/mods/player_skins/textures/player_skins_base_female.png b/mods/rp_player_skins/textures/player_skins_base_female.png similarity index 100% rename from mods/player_skins/textures/player_skins_base_female.png rename to mods/rp_player_skins/textures/player_skins_base_female.png diff --git a/mods/player_skins/textures/player_skins_base_male.png b/mods/rp_player_skins/textures/player_skins_base_male.png similarity index 100% rename from mods/player_skins/textures/player_skins_base_male.png rename to mods/rp_player_skins/textures/player_skins_base_male.png diff --git a/mods/player_skins/textures/player_skins_clothes_blue.png b/mods/rp_player_skins/textures/player_skins_clothes_blue.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_blue.png rename to mods/rp_player_skins/textures/player_skins_clothes_blue.png diff --git a/mods/player_skins/textures/player_skins_clothes_cyan.png b/mods/rp_player_skins/textures/player_skins_clothes_cyan.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_cyan.png rename to mods/rp_player_skins/textures/player_skins_clothes_cyan.png diff --git a/mods/player_skins/textures/player_skins_clothes_green.png b/mods/rp_player_skins/textures/player_skins_clothes_green.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_green.png rename to mods/rp_player_skins/textures/player_skins_clothes_green.png diff --git a/mods/player_skins/textures/player_skins_clothes_magenta.png b/mods/rp_player_skins/textures/player_skins_clothes_magenta.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_magenta.png rename to mods/rp_player_skins/textures/player_skins_clothes_magenta.png diff --git a/mods/player_skins/textures/player_skins_clothes_orange.png b/mods/rp_player_skins/textures/player_skins_clothes_orange.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_orange.png rename to mods/rp_player_skins/textures/player_skins_clothes_orange.png diff --git a/mods/player_skins/textures/player_skins_clothes_purple.png b/mods/rp_player_skins/textures/player_skins_clothes_purple.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_purple.png rename to mods/rp_player_skins/textures/player_skins_clothes_purple.png diff --git a/mods/player_skins/textures/player_skins_clothes_red.png b/mods/rp_player_skins/textures/player_skins_clothes_red.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_red.png rename to mods/rp_player_skins/textures/player_skins_clothes_red.png diff --git a/mods/player_skins/textures/player_skins_clothes_redviolet.png b/mods/rp_player_skins/textures/player_skins_clothes_redviolet.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_redviolet.png rename to mods/rp_player_skins/textures/player_skins_clothes_redviolet.png diff --git a/mods/player_skins/textures/player_skins_clothes_yellow.png b/mods/rp_player_skins/textures/player_skins_clothes_yellow.png similarity index 100% rename from mods/player_skins/textures/player_skins_clothes_yellow.png rename to mods/rp_player_skins/textures/player_skins_clothes_yellow.png diff --git a/mods/player_skins/textures/player_skins_eyes_blue.png b/mods/rp_player_skins/textures/player_skins_eyes_blue.png similarity index 100% rename from mods/player_skins/textures/player_skins_eyes_blue.png rename to mods/rp_player_skins/textures/player_skins_eyes_blue.png diff --git a/mods/player_skins/textures/player_skins_eyes_brown.png b/mods/rp_player_skins/textures/player_skins_eyes_brown.png similarity index 100% rename from mods/player_skins/textures/player_skins_eyes_brown.png rename to mods/rp_player_skins/textures/player_skins_eyes_brown.png diff --git a/mods/player_skins/textures/player_skins_eyes_green.png b/mods/rp_player_skins/textures/player_skins_eyes_green.png similarity index 100% rename from mods/player_skins/textures/player_skins_eyes_green.png rename to mods/rp_player_skins/textures/player_skins_eyes_green.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_black.png b/mods/rp_player_skins/textures/player_skins_hair_beard_black.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_black.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_black.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_brown.png b/mods/rp_player_skins/textures/player_skins_hair_beard_brown.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_brown.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_brown.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_dark_brown.png b/mods/rp_player_skins/textures/player_skins_hair_beard_dark_brown.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_dark_brown.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_dark_brown.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_orange.png b/mods/rp_player_skins/textures/player_skins_hair_beard_orange.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_orange.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_orange.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_red.png b/mods/rp_player_skins/textures/player_skins_hair_beard_red.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_red.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_red.png diff --git a/mods/player_skins/textures/player_skins_hair_beard_silver.png b/mods/rp_player_skins/textures/player_skins_hair_beard_silver.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_beard_silver.png rename to mods/rp_player_skins/textures/player_skins_hair_beard_silver.png diff --git a/mods/player_skins/textures/player_skins_hair_short_black.png b/mods/rp_player_skins/textures/player_skins_hair_short_black.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_black.png rename to mods/rp_player_skins/textures/player_skins_hair_short_black.png diff --git a/mods/player_skins/textures/player_skins_hair_short_brown.png b/mods/rp_player_skins/textures/player_skins_hair_short_brown.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_brown.png rename to mods/rp_player_skins/textures/player_skins_hair_short_brown.png diff --git a/mods/player_skins/textures/player_skins_hair_short_dark_brown.png b/mods/rp_player_skins/textures/player_skins_hair_short_dark_brown.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_dark_brown.png rename to mods/rp_player_skins/textures/player_skins_hair_short_dark_brown.png diff --git a/mods/player_skins/textures/player_skins_hair_short_orange.png b/mods/rp_player_skins/textures/player_skins_hair_short_orange.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_orange.png rename to mods/rp_player_skins/textures/player_skins_hair_short_orange.png diff --git a/mods/player_skins/textures/player_skins_hair_short_red.png b/mods/rp_player_skins/textures/player_skins_hair_short_red.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_red.png rename to mods/rp_player_skins/textures/player_skins_hair_short_red.png diff --git a/mods/player_skins/textures/player_skins_hair_short_silver.png b/mods/rp_player_skins/textures/player_skins_hair_short_silver.png similarity index 100% rename from mods/player_skins/textures/player_skins_hair_short_silver.png rename to mods/rp_player_skins/textures/player_skins_hair_short_silver.png diff --git a/mods/player_skins/textures/player_skins_skin_0.png b/mods/rp_player_skins/textures/player_skins_skin_0.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_0.png rename to mods/rp_player_skins/textures/player_skins_skin_0.png diff --git a/mods/player_skins/textures/player_skins_skin_1.png b/mods/rp_player_skins/textures/player_skins_skin_1.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_1.png rename to mods/rp_player_skins/textures/player_skins_skin_1.png diff --git a/mods/player_skins/textures/player_skins_skin_2.png b/mods/rp_player_skins/textures/player_skins_skin_2.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_2.png rename to mods/rp_player_skins/textures/player_skins_skin_2.png diff --git a/mods/player_skins/textures/player_skins_skin_3.png b/mods/rp_player_skins/textures/player_skins_skin_3.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_3.png rename to mods/rp_player_skins/textures/player_skins_skin_3.png diff --git a/mods/player_skins/textures/player_skins_skin_4.png b/mods/rp_player_skins/textures/player_skins_skin_4.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_4.png rename to mods/rp_player_skins/textures/player_skins_skin_4.png diff --git a/mods/player_skins/textures/player_skins_skin_5.png b/mods/rp_player_skins/textures/player_skins_skin_5.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_5.png rename to mods/rp_player_skins/textures/player_skins_skin_5.png diff --git a/mods/player_skins/textures/player_skins_skin_6.png b/mods/rp_player_skins/textures/player_skins_skin_6.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_6.png rename to mods/rp_player_skins/textures/player_skins_skin_6.png diff --git a/mods/player_skins/textures/player_skins_skin_7.png b/mods/rp_player_skins/textures/player_skins_skin_7.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_7.png rename to mods/rp_player_skins/textures/player_skins_skin_7.png diff --git a/mods/player_skins/textures/player_skins_skin_8.png b/mods/rp_player_skins/textures/player_skins_skin_8.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_8.png rename to mods/rp_player_skins/textures/player_skins_skin_8.png diff --git a/mods/player_skins/textures/player_skins_skin_9.png b/mods/rp_player_skins/textures/player_skins_skin_9.png similarity index 100% rename from mods/player_skins/textures/player_skins_skin_9.png rename to mods/rp_player_skins/textures/player_skins_skin_9.png