Rename mod: village → rp_village

mods/rp_goodies/init.lua

@@ -26,7 +26,7 @@ goodies.types["FURNACE_DST"] = {
 }
 
 -- chunk types for villages
-if minetest.get_modpath("village") ~= nil then
+if minetest.get_modpath("rp_village") ~= nil then
    goodies.types["forge"] = {
       ["rp_default:lump_coal"] = 4,
       ["rp_default:lump_iron"] = 6,

mods/rp_village/generate.lua

@@ -9,7 +9,7 @@ village.villages = {}
 
 local village_file = minetest.get_worldpath() .. "/villages.dat"
 
-local modpath = minetest.get_modpath("village")
+local modpath = minetest.get_modpath("rp_village")
 local mod_locks = minetest.get_modpath("rp_locks") ~= nil
 local mapseed = minetest.get_mapgen_setting("seed")
 local water_level = tonumber(minetest.get_mapgen_setting("water_level"))
@@ -455,13 +455,13 @@ function village.spawn_chunk(pos, state, orient, replace, pr, chunktype, nofill,
 	    goodies.fill(pos, "FURNACE_FUEL", pr, "fuel", 1)
 	 end, true)
    end
-   minetest.log("verbose", "[village] Chunk generated at "..minetest.pos_to_string(pos))
+   minetest.log("verbose", "[rp_village] Chunk generated at "..minetest.pos_to_string(pos))
    return true, state
 end
 
 function village.spawn_road(pos, state, houses, built, roads, depth, pr, replace, dont_check_empty)
    if not dont_check_empty and not check_empty(pos) then
-      minetest.log("verbose", "[village] Road not generated (too many stone/leaves/trees in the way) at "..minetest.pos_to_string(pos))
+      minetest.log("verbose", "[rp_village] Road not generated (too many stone/leaves/trees in the way) at "..minetest.pos_to_string(pos))
       return false, state
    end
 
@@ -650,7 +650,7 @@ function village.spawn_village(pos, pr, force_place_well)
       end
    end
    end
-   minetest.log("action", string.format("[village] Took %.2fms to generate village", (os.clock() - t1) * 1000))
+   minetest.log("action", string.format("[rp_village] Took %.2fms to generate village", (os.clock() - t1) * 1000))
    return true
 end
 

mods/rp_village/init.lua

@@ -14,8 +14,8 @@ village.min_spawn_dist = 512
 local mapseed = minetest.get_mapgen_setting("seed")
 village.pr = PseudoRandom(mapseed)
 
-dofile(minetest.get_modpath("village") .. "/names.lua")
-dofile(minetest.get_modpath("village") .. "/generate.lua")
-dofile(minetest.get_modpath("village") .. "/mapgen.lua")
+dofile(minetest.get_modpath("rp_village") .. "/names.lua")
+dofile(minetest.get_modpath("rp_village") .. "/generate.lua")
+dofile(minetest.get_modpath("rp_village") .. "/mapgen.lua")
 
-default.log("mod:village", "loaded")
+default.log("mod:rp_village", "loaded")

mods/rp_village/locale/rp_village.de.tr

@@ -1,4 +1,4 @@
-# textdomain: village
+# textdomain: rp_village
 Village Entity Spawner=Dorf-Entity-Erzeuger
 Village Spawner=Dorf-Erzeuger
 Mapgen Village Spawner=Kartengenerator-Dorf-Erzeuger

mods/rp_village/locale/rp_village.fr.tr

@@ -1,4 +1,4 @@
-# textdomain: village
+# textdomain: rp_village
 Village Entity Spawner=Fondateur du village Entity
 Village Spawner=Fondateur du village
 Mapgen Village Spawner=Fondateur du village Mapgen

mods/rp_village/locale/template.txt

@@ -1,4 +1,4 @@
-# textdomain: village
+# textdomain: rp_village
 Village Entity Spawner=
 Village Spawner=
 Mapgen Village Spawner=

mods/rp_village/mapgen.lua

@@ -2,7 +2,7 @@
 --
 -- Mapgen
 --
-local S = minetest.get_translator("village")
+local S = minetest.get_translator("rp_village")
 
 local spawn_pos = minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 0, z = 0}
 local spawn_radius = minetest.settings:get("static_spawn_radius") or 256
@@ -30,7 +30,7 @@ local place_priv = function(itemstack, placer, pointed_thing)
 end
 
 minetest.register_node(
-   "village:entity_spawner",
+   "rp_village:entity_spawner",
    {
       description = S("Village Entity Spawner"),
       _tt_help = S("Placeholder that marks a position at which to spawn an entity during village generation"),
@@ -64,7 +64,7 @@ minetest.register_node(
                      end
                   end
               else
-                  minetest.log("error", "[village] Entity spawner without 'entity' in meta set @ "..minetest.pos_to_string(pos))
+                  minetest.log("error", "[rp_village] Entity spawner without 'entity' in meta set @ "..minetest.pos_to_string(pos))
               end
               minetest.remove_node(pos)
               return
@@ -76,7 +76,7 @@ minetest.register_node(
 })
 
 minetest.register_node(
-   "village:grassland_village",
+   "rp_village:grassland_village",
    {
       description = S("Village Spawner"),
       _tt_help = S("Generates a village when placed"),
@@ -115,17 +115,17 @@ local function attempt_village_spawn(pos)
 
        if nearest.dist > village.min_spawn_dist then
           if vector.distance(spawn_pos, spos) > spawn_radius then
-             minetest.log("action", "[village] Spawning a grassland village at " .. "(" .. spos.x
+             minetest.log("action", "[rp_village] Spawning a grassland village at " .. "(" .. spos.x
                              .. ", " .. spos.y .. ", " .. spos.z .. ")")
              local ok = village.spawn_village({x=spos.x,y=spos.y-1,z=spos.z}, pr)
              if not ok then
-                 minetest.log("action", "[village] Village spawn failed")
+                 minetest.log("action", "[rp_village] Village spawn failed")
              end
           else
-             minetest.log("action", "[village] Cannot spawn village, too near the static spawnpoint")
+             minetest.log("action", "[rp_village] Cannot spawn village, too near the static spawnpoint")
           end
        else
-          minetest.log("action", "[village] Cannot spawn village, too near another village")
+          minetest.log("action", "[rp_village] Cannot spawn village, too near another village")
        end
     end
 end
@@ -170,5 +170,7 @@ if not minetest.settings:get_bool("mapgen_disable_villages") then
    end
 end
 
--- Legacy alias
+-- Legacy aliases
 minetest.register_alias("village:grassland_village_mg", "air")
+minetest.register_alias("village:entity_spawner", "rp_village:entity_spawner")
+minetest.register_alias("village:grassland_village", "rp_village:grassland_village")

mods/rp_village/mod.conf

@@ -1,3 +1,3 @@
-name = village
+name = rp_village
 depends = rp_default, rp_util, mobs, rp_goodies, rp_nav, rp_privs
 optional_depends = rp_locks