diff --git a/mods/achievements/mod.conf b/mods/achievements/mod.conf index a190f1a..787344a 100644 --- a/mods/achievements/mod.conf +++ b/mods/achievements/mod.conf @@ -1,2 +1,2 @@ name = achievements -depends = rp_default, crafting +depends = rp_default, rp_crafting diff --git a/mods/armor/mod.conf b/mods/armor/mod.conf index f961713..84a34d8 100644 --- a/mods/armor/mod.conf +++ b/mods/armor/mod.conf @@ -1,2 +1,2 @@ name = armor -depends = rp_default, drop_items_on_die, crafting, achievements +depends = rp_default, drop_items_on_die, rp_crafting, achievements diff --git a/mods/bed/mod.conf b/mods/bed/mod.conf index 5aa9cf5..28653de 100644 --- a/mods/bed/mod.conf +++ b/mods/bed/mod.conf @@ -1,3 +1,3 @@ name = bed -depends = crafting, rp_default, player_effects, achievements +depends = rp_crafting, rp_default, player_effects, achievements optional_depends = rp_farming diff --git a/mods/crafting/init.lua b/mods/crafting/init.lua deleted file mode 100644 index e82c731..0000000 --- a/mods/crafting/init.lua +++ /dev/null @@ -1,10 +0,0 @@ - --- --- Crafting mod --- By Kaadmy, for Pixture --- - -dofile(minetest.get_modpath("crafting").."/api.lua") -dofile(minetest.get_modpath("crafting").."/recipes.lua") - -default.log("mod:crafting", "loaded") diff --git a/mods/door/mod.conf b/mods/door/mod.conf index 1e93007..d28789a 100644 --- a/mods/door/mod.conf +++ b/mods/door/mod.conf @@ -1,2 +1,2 @@ name = door -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements diff --git a/mods/gold/mod.conf b/mods/gold/mod.conf index a710e2a..07e2b08 100644 --- a/mods/gold/mod.conf +++ b/mods/gold/mod.conf @@ -1,2 +1,2 @@ name = gold -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements diff --git a/mods/jewels/mod.conf b/mods/jewels/mod.conf index 1a34c0c..b04e34c 100644 --- a/mods/jewels/mod.conf +++ b/mods/jewels/mod.conf @@ -1,3 +1,3 @@ name = jewels -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements optional_depends = tt diff --git a/mods/locks/mod.conf b/mods/locks/mod.conf index 9ec107e..21a67d4 100644 --- a/mods/locks/mod.conf +++ b/mods/locks/mod.conf @@ -1,2 +1,2 @@ name = locks -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements diff --git a/mods/lumien/mod.conf b/mods/lumien/mod.conf index 67eee1b..0c8efe8 100644 --- a/mods/lumien/mod.conf +++ b/mods/lumien/mod.conf @@ -1,2 +1,2 @@ name = lumien -depends = rp_default, rp_tnt, rp_util, crafting, achievements +depends = rp_default, rp_tnt, rp_util, rp_crafting, achievements diff --git a/mods/mobs/mod.conf b/mods/mobs/mod.conf index 2162f57..5e2746d 100644 --- a/mods/mobs/mod.conf +++ b/mods/mobs/mod.conf @@ -1,2 +1,2 @@ name = mobs -depends = rp_default, rp_util, crafting, achievements +depends = rp_default, rp_util, rp_crafting, achievements diff --git a/mods/music/mod.conf b/mods/music/mod.conf index e257635..79d9c55 100644 --- a/mods/music/mod.conf +++ b/mods/music/mod.conf @@ -1,2 +1,2 @@ name = music -depends = rp_default, rp_util, crafting +depends = rp_default, rp_util, rp_crafting diff --git a/mods/parachute/mod.conf b/mods/parachute/mod.conf index aa9cfb8..9106e77 100644 --- a/mods/parachute/mod.conf +++ b/mods/parachute/mod.conf @@ -1,2 +1,2 @@ name = parachute -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements diff --git a/mods/partialblocks/mod.conf b/mods/partialblocks/mod.conf index 02e80cc..999c205 100644 --- a/mods/partialblocks/mod.conf +++ b/mods/partialblocks/mod.conf @@ -1,2 +1,2 @@ name = partialblocks -depends = rp_default, crafting +depends = rp_default, rp_crafting diff --git a/mods/crafting/README.txt b/mods/rp_crafting/README.txt similarity index 92% rename from mods/crafting/README.txt rename to mods/rp_crafting/README.txt index bb22e86..1a6743e 100644 --- a/mods/crafting/README.txt +++ b/mods/rp_crafting/README.txt @@ -1,4 +1,4 @@ -Cratfing mod +Crafting mod ============ By Kaadmy, for Pixture diff --git a/mods/crafting/api.lua b/mods/rp_crafting/api.lua similarity index 98% rename from mods/crafting/api.lua rename to mods/rp_crafting/api.lua index 7c810c0..492b004 100644 --- a/mods/crafting/api.lua +++ b/mods/rp_crafting/api.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("crafting") +local S = minetest.get_translator("rp_crafting") -- Crafting menu display modes local MODE_CRAFTABLE = 1 -- crafting guide mode, show all recipes (default) @@ -286,7 +286,7 @@ form = form .. default.ui.button(7.25, 2.25, 1, 1, "do_craft_10", "10", nil, S(" form = form .. "tablecolumns[text,align=left,width=2;text,align=left,width=40]" -default.ui.register_page("crafting:crafting", form) +default.ui.register_page("rp_crafting:crafting", form) function crafting.get_formspec(name, select_item) local row = 1 @@ -369,7 +369,7 @@ function crafting.get_formspec(name, select_item) end end - local form = default.ui.get_page("crafting:crafting") + local form = default.ui.get_page("rp_crafting:crafting") if craft_count > 0 then form = form .. "table[2.25,0.25;4.75,3.75;craft_list;" .. craft_list @@ -521,7 +521,7 @@ local function on_player_receive_fields(player, form_name, fields) if selection.type == "CHG" then crafting.userdata[name].row = selection.row - minetest.show_formspec(name, "crafting:crafting", + minetest.show_formspec(name, "rp_crafting:crafting", crafting.get_formspec(name)) end elseif fields.toggle_filter then @@ -538,7 +538,7 @@ local function on_player_receive_fields(player, form_name, fields) crafting.userdata[name].mode = MODE_GUIDE end - minetest.show_formspec(name, "crafting:crafting", + minetest.show_formspec(name, "rp_crafting:crafting", crafting.get_formspec(name, old_item)) end @@ -548,7 +548,7 @@ end function crafting.update_crafting_formspec(player, old_item) local name = player:get_player_name() local newform = crafting.get_formspec(name, old_item) - minetest.show_formspec(name, "crafting:crafting", newform) + minetest.show_formspec(name, "rp_crafting:crafting", newform) player:set_inventory_formspec(newform) end diff --git a/mods/rp_crafting/init.lua b/mods/rp_crafting/init.lua new file mode 100644 index 0000000..fdd13f9 --- /dev/null +++ b/mods/rp_crafting/init.lua @@ -0,0 +1,10 @@ + +-- +-- Crafting mod +-- By Kaadmy, for Pixture +-- + +dofile(minetest.get_modpath("rp_crafting").."/api.lua") +dofile(minetest.get_modpath("rp_crafting").."/recipes.lua") + +default.log("mod:rp_crafting", "loaded") diff --git a/mods/crafting/locale/crafting.de.tr b/mods/rp_crafting/locale/rp_crafting.de.tr similarity index 85% rename from mods/crafting/locale/crafting.de.tr rename to mods/rp_crafting/locale/rp_crafting.de.tr index 6f2ea50..239f4a8 100644 --- a/mods/crafting/locale/crafting.de.tr +++ b/mods/rp_crafting/locale/rp_crafting.de.tr @@ -1,4 +1,4 @@ -# textdomain:crafting +# textdomain:rp_crafting Show all recipes=Alle Rezepte zeigen Show only craftable recipes=Nur mögliche Rezepte zeigen Craft once=Ein mal fertigen diff --git a/mods/crafting/locale/crafting.fr.tr b/mods/rp_crafting/locale/rp_crafting.fr.tr similarity index 88% rename from mods/crafting/locale/crafting.fr.tr rename to mods/rp_crafting/locale/rp_crafting.fr.tr index 13c30cc..f398c79 100644 --- a/mods/crafting/locale/crafting.fr.tr +++ b/mods/rp_crafting/locale/rp_crafting.fr.tr @@ -1,4 +1,4 @@ -# textdomain: crafting +# textdomain: rp_crafting Show all recipes=Voir toutes les recettes Show only craftable recipes=Afficher seulement des recettes fabriquées via l'artisanat Craft once=Constuire une fois diff --git a/mods/crafting/locale/template.txt b/mods/rp_crafting/locale/template.txt similarity index 75% rename from mods/crafting/locale/template.txt rename to mods/rp_crafting/locale/template.txt index 57de320..ae54303 100644 --- a/mods/crafting/locale/template.txt +++ b/mods/rp_crafting/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain:crafting +# textdomain:rp_crafting Show all recipes= Show only craftable recipes= Craft once= diff --git a/mods/crafting/mod.conf b/mods/rp_crafting/mod.conf similarity index 67% rename from mods/crafting/mod.conf rename to mods/rp_crafting/mod.conf index 02c20d1..853ad93 100644 --- a/mods/crafting/mod.conf +++ b/mods/rp_crafting/mod.conf @@ -1,2 +1,2 @@ -name = crafting +name = rp_crafting depends = rp_default, drop_items_on_die diff --git a/mods/crafting/recipes.lua b/mods/rp_crafting/recipes.lua similarity index 100% rename from mods/crafting/recipes.lua rename to mods/rp_crafting/recipes.lua diff --git a/mods/rp_default/formspec.lua b/mods/rp_default/formspec.lua index 5aa253e..b3c8ab5 100644 --- a/mods/rp_default/formspec.lua +++ b/mods/rp_default/formspec.lua @@ -340,7 +340,7 @@ function default.ui.receive_fields(player, form_name, fields) local formname, form if fields.tab_crafting then - formname = "crafting:crafting" + formname = "rp_crafting:crafting" form = crafting.get_formspec(name) elseif minetest.get_modpath("armor") ~= nil and fields.tab_armor then formname = "armor:armor" @@ -376,7 +376,7 @@ minetest.register_on_joinplayer( default.ui.current_page[name] = "rp_creative:creative" else player:set_inventory_formspec(crafting.get_formspec(name)) - default.ui.current_page[name] = "crafting:crafting" + default.ui.current_page[name] = "rp_crafting:crafting" end end) diff --git a/mods/rp_farming/mod.conf b/mods/rp_farming/mod.conf index 92f8c64..a6f6969 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, crafting, achievements +depends = rp_default, rp_weather, rp_crafting, achievements diff --git a/mods/rp_tnt/mod.conf b/mods/rp_tnt/mod.conf index 435bbc8..76fdf1f 100644 --- a/mods/rp_tnt/mod.conf +++ b/mods/rp_tnt/mod.conf @@ -1,2 +1,2 @@ name = rp_tnt -depends = rp_default, crafting, achievements +depends = rp_default, rp_crafting, achievements