Rename mod: jewels → rp_jewels

mods/rp_gold/init.lua

@@ -100,26 +100,26 @@ if minetest.get_modpath("mobs") ~= nil then
    -- trading currency
    if minetest.get_modpath("jewels") ~= nil then -- jewels/gold
       --farmer
-      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 16", "", "jewels:jewel"})
-      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 22", "", "jewels:jewel 2"})
-      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 34", "", "jewels:jewel 4"})
+      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 16", "", "rp_jewels:jewel"})
+      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 22", "", "rp_jewels:jewel 2"})
+      table.insert(gold.trades["farmer"], {"rp_gold:ingot_gold 34", "", "rp_jewels:jewel 4"})
 
-      table.insert(gold.trades["farmer"], {"jewels:jewel", "", "rp_gold:ingot_gold 14"})
-      table.insert(gold.trades["farmer"], {"jewels:jewel 2", "", "rp_gold:ingot_gold 20"})
-      table.insert(gold.trades["farmer"], {"jewels:jewel 4", "", "rp_gold:ingot_gold 32"})
+      table.insert(gold.trades["farmer"], {"rp_jewels:jewel", "", "rp_gold:ingot_gold 14"})
+      table.insert(gold.trades["farmer"], {"rp_jewels:jewel 2", "", "rp_gold:ingot_gold 20"})
+      table.insert(gold.trades["farmer"], {"rp_jewels:jewel 4", "", "rp_gold:ingot_gold 32"})
 
       -- carpenter
       table.insert(gold.trades["carpenter"], {"rp_default:tree 2", "", "rp_gold:ingot_gold"})
 
       -- tavern keeper
-      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 14", "", "jewels:jewel"})
-      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 20", "", "jewels:jewel 2"})
-      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 32", "", "jewels:jewel 4"})
+      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 14", "", "rp_jewels:jewel"})
+      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 20", "", "rp_jewels:jewel 2"})
+      table.insert(gold.trades["tavernkeeper"], {"rp_gold:ingot_gold 32", "", "rp_jewels:jewel 4"})
 
       -- blacksmith
-      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 14", "", "jewels:jewel"})
-      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 20", "", "jewels:jewel 2"})
-      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 32", "", "jewels:jewel 4"})
+      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 14", "", "rp_jewels:jewel"})
+      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 20", "", "rp_jewels:jewel 2"})
+      table.insert(gold.trades["blacksmith"], {"rp_default:ingot_steel 32", "", "rp_jewels:jewel 4"})
    end
 
    -- butcher(no mod check)

mods/rp_goodies/init.lua

@@ -61,10 +61,10 @@ if minetest.get_modpath("village") ~= nil then
 
    -- jewels and gold
    if minetest.get_modpath("jewels") ~= nil then
-      goodies.types_valuable["house"]["jewels:bench"] = { chance = 24, max_stack = 1 }
-      goodies.types_valuable["house"]["jewels:jewel"] = 34
-      goodies.types_valuable["tavern"]["jewels:jewel"] = 32
-      goodies.types_valuable["forge"]["jewels:jewel"] = 30
+      goodies.types_valuable["house"]["rp_jewels:bench"] = { chance = 24, max_stack = 1 }
+      goodies.types_valuable["house"]["rp_jewels:jewel"] = 34
+      goodies.types_valuable["tavern"]["rp_jewels:jewel"] = 32
+      goodies.types_valuable["forge"]["rp_jewels:jewel"] = 30
    end
    if minetest.get_modpath("rp_gold") ~= nil then
       goodies.types["forge"]["rp_gold:ingot_gold"] = { chance = 24, max_stack = 2 }

mods/rp_goodies/mod.conf

@@ -1,3 +1,3 @@
 name = rp_goodies
 depends = rp_default, rp_farming, rp_bed, mobs
-optional_depends = rp_gold, jewels
+optional_depends = rp_gold, rp_jewels

mods/rp_jewels/aliases.lua

@@ -0,0 +1,48 @@
+minetest.register_alias("jewels:axe_bronze_damage", "rp_jewels:axe_bronze_damage")
+minetest.register_alias("jewels:axe_bronze_digspeed", "rp_jewels:axe_bronze_digspeed")
+minetest.register_alias("jewels:axe_bronze_uses", "rp_jewels:axe_bronze_uses")
+minetest.register_alias("jewels:axe_carbon_steel_damage", "rp_jewels:axe_carbon_steel_damage")
+minetest.register_alias("jewels:axe_carbon_steel_digspeed", "rp_jewels:axe_carbon_steel_digspeed")
+minetest.register_alias("jewels:axe_carbon_steel_uses", "rp_jewels:axe_carbon_steel_uses")
+minetest.register_alias("jewels:axe_steel_damage", "rp_jewels:axe_steel_damage")
+minetest.register_alias("jewels:axe_steel_digspeed", "rp_jewels:axe_steel_digspeed")
+minetest.register_alias("jewels:axe_steel_uses", "rp_jewels:axe_steel_uses")
+minetest.register_alias("jewels:bench", "rp_jewels:bench")
+minetest.register_alias("jewels:broadsword_jeweled_pommel", "rp_jewels:broadsword_jeweled_pommel")
+minetest.register_alias("jewels:broadsword_jeweled_pommel_and_guard", "rp_jewels:broadsword_jeweled_pommel_and_guard")
+minetest.register_alias("jewels:jewel", "rp_jewels:jewel")
+minetest.register_alias("jewels:jewel_ore", "rp_jewels:jewel_ore")
+minetest.register_alias("jewels:pick_bronze_damage", "rp_jewels:pick_bronze_damage")
+minetest.register_alias("jewels:pick_bronze_digspeed", "rp_jewels:pick_bronze_digspeed")
+minetest.register_alias("jewels:pick_bronze_uses", "rp_jewels:pick_bronze_uses")
+minetest.register_alias("jewels:pick_carbon_steel_damage", "rp_jewels:pick_carbon_steel_damage")
+minetest.register_alias("jewels:pick_carbon_steel_digspeed", "rp_jewels:pick_carbon_steel_digspeed")
+minetest.register_alias("jewels:pick_carbon_steel_uses", "rp_jewels:pick_carbon_steel_uses")
+minetest.register_alias("jewels:pick_steel_damage", "rp_jewels:pick_steel_damage")
+minetest.register_alias("jewels:pick_steel_digspeed", "rp_jewels:pick_steel_digspeed")
+minetest.register_alias("jewels:pick_steel_uses", "rp_jewels:pick_steel_uses")
+minetest.register_alias("jewels:serrated_broadsword", "rp_jewels:serrated_broadsword")
+minetest.register_alias("jewels:shears_bronze_digspeed", "rp_jewels:shears_bronze_digspeed")
+minetest.register_alias("jewels:shears_bronze_uses", "rp_jewels:shears_bronze_uses")
+minetest.register_alias("jewels:shears_carbon_steel_digspeed", "rp_jewels:shears_carbon_steel_digspeed")
+minetest.register_alias("jewels:shears_carbon_steel_uses", "rp_jewels:shears_carbon_steel_uses")
+minetest.register_alias("jewels:shears_steel_digspeed", "rp_jewels:shears_steel_digspeed")
+minetest.register_alias("jewels:shears_steel_uses", "rp_jewels:shears_steel_uses")
+minetest.register_alias("jewels:shovel_bronze_damage", "rp_jewels:shovel_bronze_damage")
+minetest.register_alias("jewels:shovel_bronze_digspeed", "rp_jewels:shovel_bronze_digspeed")
+minetest.register_alias("jewels:shovel_bronze_uses", "rp_jewels:shovel_bronze_uses")
+minetest.register_alias("jewels:shovel_carbon_steel_damage", "rp_jewels:shovel_carbon_steel_damage")
+minetest.register_alias("jewels:shovel_carbon_steel_digspeed", "rp_jewels:shovel_carbon_steel_digspeed")
+minetest.register_alias("jewels:shovel_carbon_steel_uses", "rp_jewels:shovel_carbon_steel_uses")
+minetest.register_alias("jewels:shovel_steel_damage", "rp_jewels:shovel_steel_damage")
+minetest.register_alias("jewels:shovel_steel_digspeed", "rp_jewels:shovel_steel_digspeed")
+minetest.register_alias("jewels:shovel_steel_uses", "rp_jewels:shovel_steel_uses")
+minetest.register_alias("jewels:spear_bronze_damage", "rp_jewels:spear_bronze_damage")
+minetest.register_alias("jewels:spear_bronze_reach", "rp_jewels:spear_bronze_reach")
+minetest.register_alias("jewels:spear_bronze_uses", "rp_jewels:spear_bronze_uses")
+minetest.register_alias("jewels:spear_carbon_steel_damage", "rp_jewels:spear_carbon_steel_damage")
+minetest.register_alias("jewels:spear_carbon_steel_reach", "rp_jewels:spear_carbon_steel_reach")
+minetest.register_alias("jewels:spear_carbon_steel_uses", "rp_jewels:spear_carbon_steel_uses")
+minetest.register_alias("jewels:spear_steel_damage", "rp_jewels:spear_steel_damage")
+minetest.register_alias("jewels:spear_steel_reach", "rp_jewels:spear_steel_reach")
+minetest.register_alias("jewels:spear_steel_uses", "rp_jewels:spear_steel_uses")

mods/rp_jewels/init.lua

@@ -4,7 +4,7 @@
 -- By Kaadmy
 --
 
-local S = minetest.get_translator("jewels")
+local S = minetest.get_translator("rp_jewels")
 local NS = function(s) return s end
 local F = minetest.formspec_escape
 
@@ -32,7 +32,7 @@ form_bench = form_bench .. "listring[current_player;main]"
 form_bench = form_bench .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1)
 form_bench = form_bench .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3)
 
-default.ui.register_page("jewels_bench", form_bench)
+default.ui.register_page("rp_jewels_bench", form_bench)
 
 local function plus_power(i)
    if i >= 0 then
@@ -118,7 +118,7 @@ function jewels.register_jewel(toolname, new_toolname, def)
       desc = data.description
    else
       -- All tools should have their description set explicitly. This is a fallback
-      minetest.log("warning", "[jewels] No description for jeweled tool "..new_toolname.."! Auto-generating a name")
+      minetest.log("warning", "[rp_jewels] No description for jeweled tool "..new_toolname.."! Auto-generating a name")
       desc = new_tooldef.description
       if not desc then
          desc = new_toolname
@@ -240,7 +240,7 @@ end
 -- Items
 
 minetest.register_craftitem(
-   "jewels:jewel",
+   "rp_jewels:jewel",
    {
       description = S("Jewel"),
       inventory_image = "jewels_jewel.png",
@@ -285,7 +285,7 @@ local check_take = function(pos, listname, index, stack, player)
 end
 
 minetest.register_node(
-   "jewels:bench",
+   "rp_jewels:bench",
    {
       description = S("Jeweler's Workbench"),
       _tt_help = S("Tools can be upgraded with jewels here"),
@@ -298,7 +298,7 @@ minetest.register_node(
 
       on_construct = function(pos)
          local meta = minetest.get_meta(pos)
-         meta:set_string("formspec", default.ui.get_page("jewels_bench"))
+         meta:set_string("formspec", default.ui.get_page("rp_jewels_bench"))
          meta:set_string("infotext", S("Jeweler's Workbench"))
 
          local inv = meta:get_inventory()
@@ -316,7 +316,7 @@ minetest.register_node(
       on_punch = function(pos, node, player, pointed_thing)
          local itemstack = player:get_wielded_item()
          local itemstack_changed = false
-         if itemstack:get_name() == "jewels:jewel" then
+         if itemstack:get_name() == "rp_jewels:jewel" then
             if minetest.is_protected(pos, player:get_player_name()) and
                     not minetest.check_player_privs(player, "protection_bypass") then
                 minetest.record_protection_violation(pos, player:get_player_name())
@@ -358,7 +358,7 @@ minetest.register_node(
 })
 
 minetest.register_node(
-   "jewels:jewel_ore",
+   "rp_jewels:jewel_ore",
    {
       description = S("Jewel Ore"),
       tiles = {
@@ -366,18 +366,18 @@ minetest.register_node(
          "default_tree_birch_top.png",
          "default_tree_birch.png^jewels_ore.png"
       },
-      drop = "jewels:jewel",
+      drop = "rp_jewels:jewel",
       groups = {snappy=1, choppy=1, tree=1},
       sounds = default.node_sound_wood_defaults(),
 })
 
 crafting.register_craft(
    {
-      output = "jewels:bench",
+      output = "rp_jewels:bench",
       items = {
          "group:planks 5",
          "rp_default:ingot_carbon_steel 2",
-         "jewels:jewel",
+         "rp_jewels:jewel",
       }
 })
 
@@ -397,12 +397,13 @@ achievements.register_achievement(
       title = S("Secret of Jewels"),
       description = S("Discover the origin of jewels."),
       times = 1,
-      dignode = "jewels:jewel_ore",
+      dignode = "rp_jewels:jewel_ore",
 })
 
 -- The tool jewel definitions
 
-dofile(minetest.get_modpath("jewels").."/jewels.lua")
-dofile(minetest.get_modpath("jewels").."/mapgen.lua")
+dofile(minetest.get_modpath("rp_jewels").."/jewels.lua")
+dofile(minetest.get_modpath("rp_jewels").."/mapgen.lua")
+dofile(minetest.get_modpath("rp_jewels").."/aliases.lua")
 
-default.log("mod:jewels", "loaded")
+default.log("mod:rp_jewels", "loaded")

mods/rp_jewels/jewels.lua

@@ -2,7 +2,7 @@
 -- Jeweled tool defs
 --
 
-local S = minetest.get_translator("jewels")
+local S = minetest.get_translator("rp_jewels")
 
 --  Automatic jeweling on specific tools
 
@@ -280,7 +280,7 @@ for tool_name, tool_def in pairs(tool_types) do
          end
          jewels.register_jewel(
             "rp_default:" .. tool_name .. "_" .. material_name,
-            "jewels:" .. tool_name .. "_" .. material_name .. "_" .. jewel_name,
+            "rp_jewels:" .. tool_name .. "_" .. material_name .. "_" .. jewel_name,
             {
                stats = jewel_def,
                description = description,
@@ -296,7 +296,7 @@ end
 
 jewels.register_jewel(
    "rp_default:broadsword",
-   "jewels:broadsword_jeweled_pommel",
+   "rp_jewels:broadsword_jeweled_pommel",
    {
       description = S("Pommel Jewel Broadsword"),
       overlay = "jewels_jeweled_pommel.png",
@@ -306,8 +306,8 @@ jewels.register_jewel(
 })
 
 jewels.register_jewel(
-   "jewels:broadsword_jeweled_pommel",
-   "jewels:broadsword_jeweled_pommel_and_guard",
+   "rp_jewels:broadsword_jeweled_pommel",
+   "rp_jewels:broadsword_jeweled_pommel_and_guard",
    {
       description = S("Pommel&Guard Jewel Broadsword"),
       overlay = "jewels_jeweled_guard.png",
@@ -317,8 +317,8 @@ jewels.register_jewel(
 })
 
 jewels.register_jewel(
-   "jewels:broadsword_jeweled_pommel_and_guard",
-   "jewels:serrated_broadsword",
+   "rp_jewels:broadsword_jeweled_pommel_and_guard",
+   "rp_jewels:serrated_broadsword",
    {
       description = S("Serrated Jewel Broadsword"),
       overlay = "jewels_jeweled_blade.png",

mods/rp_jewels/locale/rp_jewels.de.tr

@@ -1,4 +1,4 @@
-# textdomain: jewels
+# textdomain: rp_jewels
 1. Place tool here=1.: Werkzeug hier ablegen
 2. Hold a jewel and punch the bench=2.: Juwel halten und auf Bank hauen
 Jeweled @1=@1 (Juwel)

mods/rp_jewels/locale/rp_jewels.fr.tr

@@ -1,4 +1,4 @@
-# textdomain: jewels
+# textdomain: rp_jewels
 1. Place tool here=1. Placez l'outil ici
 2. Hold a jewel and punch the bench=2. Tenir un bijou et poinçonner le banc
 Jeweled @1=Plaqué @1

mods/rp_jewels/locale/template.txt

@@ -1,4 +1,4 @@
-# textdomain: jewels
+# textdomain: rp_jewels
 1. Place tool here=
 2. Hold a jewel and punch the bench=
 Jeweled @1=

mods/rp_jewels/mapgen.lua

@@ -26,7 +26,7 @@ end
 local lvm_buffer = {}
 
 local c_birch = minetest.get_content_id("rp_default:tree_birch")
-local c_jewel_ore = minetest.get_content_id("jewels:jewel_ore")
+local c_jewel_ore = minetest.get_content_id("rp_jewels:jewel_ore")
 
 -- Generation algorithm:
 do

mods/rp_jewels/mod.conf

@@ -1,3 +1,3 @@
-name = jewels
+name = rp_jewels
 depends = rp_default, rp_crafting, rp_achievements
 optional_depends = tt