diff --git a/mods/armor/mod.conf b/mods/armor/mod.conf index 84a34d88..82b32012 100644 --- a/mods/armor/mod.conf +++ b/mods/armor/mod.conf @@ -1,2 +1,2 @@ name = armor -depends = rp_default, drop_items_on_die, rp_crafting, achievements +depends = rp_default, drop_items_on_die, rp_crafting, rp_achievements diff --git a/mods/bed/mod.conf b/mods/bed/mod.conf index 28653de8..d86a4738 100644 --- a/mods/bed/mod.conf +++ b/mods/bed/mod.conf @@ -1,3 +1,3 @@ name = bed -depends = rp_crafting, rp_default, player_effects, achievements +depends = rp_crafting, rp_default, player_effects, rp_achievements optional_depends = rp_farming diff --git a/mods/door/mod.conf b/mods/door/mod.conf index d28789ae..d889e6c7 100644 --- a/mods/door/mod.conf +++ b/mods/door/mod.conf @@ -1,2 +1,2 @@ name = door -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements diff --git a/mods/gold/mod.conf b/mods/gold/mod.conf index 07e2b081..22578be8 100644 --- a/mods/gold/mod.conf +++ b/mods/gold/mod.conf @@ -1,2 +1,2 @@ name = gold -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements diff --git a/mods/jewels/mod.conf b/mods/jewels/mod.conf index b04e34cc..8746ac4d 100644 --- a/mods/jewels/mod.conf +++ b/mods/jewels/mod.conf @@ -1,3 +1,3 @@ name = jewels -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements optional_depends = tt diff --git a/mods/locks/mod.conf b/mods/locks/mod.conf index 21a67d4b..0bd31822 100644 --- a/mods/locks/mod.conf +++ b/mods/locks/mod.conf @@ -1,2 +1,2 @@ name = locks -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements diff --git a/mods/lumien/mod.conf b/mods/lumien/mod.conf index 0c8efe86..6e252f1d 100644 --- a/mods/lumien/mod.conf +++ b/mods/lumien/mod.conf @@ -1,2 +1,2 @@ name = lumien -depends = rp_default, rp_tnt, rp_util, rp_crafting, achievements +depends = rp_default, rp_tnt, rp_util, rp_crafting, rp_achievements diff --git a/mods/mobs/mod.conf b/mods/mobs/mod.conf index 5e2746d6..425e48dc 100644 --- a/mods/mobs/mod.conf +++ b/mods/mobs/mod.conf @@ -1,2 +1,2 @@ name = mobs -depends = rp_default, rp_util, rp_crafting, achievements +depends = rp_default, rp_util, rp_crafting, rp_achievements diff --git a/mods/nav/mod.conf b/mods/nav/mod.conf index 180ea195..ab3e1fe3 100644 --- a/mods/nav/mod.conf +++ b/mods/nav/mod.conf @@ -1,2 +1,2 @@ name = nav -depends = rp_default, rp_util, achievements +depends = rp_default, rp_util, rp_achievements diff --git a/mods/parachute/mod.conf b/mods/parachute/mod.conf index 9106e772..7a6dc506 100644 --- a/mods/parachute/mod.conf +++ b/mods/parachute/mod.conf @@ -1,2 +1,2 @@ name = parachute -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements diff --git a/mods/achievements/README.txt b/mods/rp_achievements/README.txt similarity index 100% rename from mods/achievements/README.txt rename to mods/rp_achievements/README.txt diff --git a/mods/achievements/init.lua b/mods/rp_achievements/init.lua similarity index 96% rename from mods/achievements/init.lua rename to mods/rp_achievements/init.lua index 11b69826..e4592064 100644 --- a/mods/achievements/init.lua +++ b/mods/rp_achievements/init.lua @@ -5,7 +5,7 @@ local COLOR_GOTTEN = "#00FF00" -local S = minetest.get_translator("achievements") +local S = minetest.get_translator("rp_achievements") achievements = {} @@ -97,7 +97,7 @@ function achievements.trigger_achievement(player, aname, times) end, name, aname) end - if default.ui.current_page[name] == "achievements:achievements" then + if default.ui.current_page[name] == "rp_achievements:achievements" then local form = achievements.get_formspec(name) player:set_inventory_formspec(form) end @@ -201,7 +201,7 @@ local form = default.ui.get_page("rp_default:default") form = form .. "tablecolumns[color;image,align=left,width=1,0=ui_checkmark.png^[colorize:"..COLOR_GOTTEN..":255,1=blank.png,2=blank.png;text,align=left,width=11;" .. "text,align=left,width=28]" -default.ui.register_page("achievements:achievements", form) +default.ui.register_page("rp_achievements:achievements", form) function achievements.get_formspec(name, row) row = row or 1 @@ -243,7 +243,7 @@ function achievements.get_formspec(name, row) achievement_list = achievement_list .. minetest.formspec_escape(def.description) end - local form = default.ui.get_page("achievements:achievements") + local form = default.ui.get_page("rp_achievements:achievements") form = form .. "table[0.25,2.5;7.9,5.5;achievement_list;" .. achievement_list .. ";" .. row .. "]" @@ -292,7 +292,7 @@ local function receive_fields(player, form_name, fields) local name = player:get_player_name() local in_achievements_menu = false - if form_name == "achievements:achievements" then + if form_name == "rp_achievements:achievements" then in_achievements_menu = true elseif form_name ~= "" then return @@ -319,7 +319,7 @@ local function receive_fields(player, form_name, fields) local form = achievements.get_formspec(name, selected) minetest.show_formspec( name, - "achievements:achievements", + "rp_achievements:achievements", form ) player:set_inventory_formspec(form) diff --git a/mods/achievements/locale/achievements.de.tr b/mods/rp_achievements/locale/rp_achievements.de.tr similarity index 97% rename from mods/achievements/locale/achievements.de.tr rename to mods/rp_achievements/locale/rp_achievements.de.tr index 0226ca44..aada56e8 100644 --- a/mods/achievements/locale/achievements.de.tr +++ b/mods/rp_achievements/locale/rp_achievements.de.tr @@ -1,4 +1,4 @@ -# textdomain: achievements +# textdomain: rp_achievements Gotten=Erhalten Missing=Fehlt @1 of @2 achievements gotten, @3 in progress=@1 von @2 Errungenschaften erhalten, @3 in Arbeit diff --git a/mods/achievements/locale/achievements.fr.tr b/mods/rp_achievements/locale/rp_achievements.fr.tr similarity index 97% rename from mods/achievements/locale/achievements.fr.tr rename to mods/rp_achievements/locale/rp_achievements.fr.tr index 5778fa4d..5db3197e 100644 --- a/mods/achievements/locale/achievements.fr.tr +++ b/mods/rp_achievements/locale/rp_achievements.fr.tr @@ -1,4 +1,4 @@ -# textdomain: achievements +# textdomain: rp_achievements Gotten=Obtenu Missing=Manquant @1 of @2 achievements gotten, @3 in progress=@1 @2 réalisations obtenues, @3 en cours diff --git a/mods/achievements/locale/template.txt b/mods/rp_achievements/locale/template.txt similarity index 94% rename from mods/achievements/locale/template.txt rename to mods/rp_achievements/locale/template.txt index e2bb5481..b3e3c34c 100644 --- a/mods/achievements/locale/template.txt +++ b/mods/rp_achievements/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: achievements +# textdomain: rp_achievements Gotten= Missing= @1 of @2 achievements gotten, @3 in progress= diff --git a/mods/achievements/mod.conf b/mods/rp_achievements/mod.conf similarity index 59% rename from mods/achievements/mod.conf rename to mods/rp_achievements/mod.conf index 787344ab..b2a7fd54 100644 --- a/mods/achievements/mod.conf +++ b/mods/rp_achievements/mod.conf @@ -1,2 +1,2 @@ -name = achievements +name = rp_achievements depends = rp_default, rp_crafting diff --git a/mods/rp_default/formspec.lua b/mods/rp_default/formspec.lua index b3c8ab53..6caea51b 100644 --- a/mods/rp_default/formspec.lua +++ b/mods/rp_default/formspec.lua @@ -307,7 +307,7 @@ form_default_default = form_default_default .. default.ui.tab(-0.9, 0.5, "tab_cr if minetest.get_modpath("armor") ~= nil then form_default_default = form_default_default .. default.ui.tab(-0.9, 1.28, "tab_armor", "ui_icon_armor.png", S("Armor")) end -if minetest.get_modpath("achievements") ~= nil then +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 @@ -345,8 +345,8 @@ function default.ui.receive_fields(player, form_name, fields) elseif minetest.get_modpath("armor") ~= nil and fields.tab_armor then formname = "armor:armor" form = armor.get_formspec(name) - elseif minetest.get_modpath("achievements") ~= nil and fields.tab_achievements then - formname = "achievements:achievements" + 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 formname = "player_skins:player_skins" diff --git a/mods/rp_farming/mod.conf b/mods/rp_farming/mod.conf index a6f69698..a2cf0704 100644 --- a/mods/rp_farming/mod.conf +++ b/mods/rp_farming/mod.conf @@ -1,2 +1,2 @@ name = rp_farming -depends = rp_default, rp_weather, rp_crafting, achievements +depends = rp_default, rp_weather, rp_crafting, rp_achievements diff --git a/mods/rp_tnt/mod.conf b/mods/rp_tnt/mod.conf index 76fdf1fe..bebba851 100644 --- a/mods/rp_tnt/mod.conf +++ b/mods/rp_tnt/mod.conf @@ -1,2 +1,2 @@ name = rp_tnt -depends = rp_default, rp_crafting, achievements +depends = rp_default, rp_crafting, rp_achievements