From cc671688c577dff21e3e43f5bc67683055c80800 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sun, 22 Nov 2020 16:28:34 -0700 Subject: [PATCH] had to change namegen's name to avoid a collision on ContentDB --- settlements_desert/init.lua | 8 ++++---- settlements_desert/mod.conf | 2 +- settlements_igloo/init.lua | 8 ++++---- settlements_igloo/mod.conf | 2 +- settlements_jungle/init.lua | 8 ++++---- settlements_jungle/mod.conf | 2 +- settlements_medieval/init.lua | 8 ++++---- settlements_medieval/mod.conf | 2 +- settlements_mer/init.lua | 8 ++++---- settlements_mer/mod.conf | 2 +- settlements_ruins/init.lua | 8 ++++---- settlements_ruins/mod.conf | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/settlements_desert/init.lua b/settlements_desert/init.lua index 72813f0..80a30cb 100644 --- a/settlements_desert/init.lua +++ b/settlements_desert/init.lua @@ -112,8 +112,8 @@ local desert_settlements = { }, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("desert_settlement") + if minetest.get_modpath("name_generator") then + return name_generator.generate("desert_settlement") end return S("Desert settlement") end, @@ -121,8 +121,8 @@ local desert_settlements = { generate_book = generate_book, } -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_desert.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_desert.cfg")) end settlements.register_settlement("desert", desert_settlements) diff --git a/settlements_desert/mod.conf b/settlements_desert/mod.conf index 04c83dd..3b6c213 100644 --- a/settlements_desert/mod.conf +++ b/settlements_desert/mod.conf @@ -1,4 +1,4 @@ name = settlements_desert description = Adds small settlements to desert regions during map generation. depends = settlements, default, stairs, doors, beds -optional_depends = namegen, commoditymarket_fantasy +optional_depends = name_generator, commoditymarket_fantasy diff --git a/settlements_igloo/init.lua b/settlements_igloo/init.lua index 572ae95..5b21584 100644 --- a/settlements_igloo/init.lua +++ b/settlements_igloo/init.lua @@ -4,8 +4,8 @@ local S = minetest.get_translator(modname) local schem_path = modpath.."/schematics/" -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_inuit.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_inuit.cfg")) end -- Node initialization @@ -59,8 +59,8 @@ local inuit_settlements = { }, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("inuit_camps") + if minetest.get_modpath("name_generator") then + return name_generator.generate("inuit_camps") end return S("Inuit camp") end, diff --git a/settlements_igloo/mod.conf b/settlements_igloo/mod.conf index 06991be..1635df3 100644 --- a/settlements_igloo/mod.conf +++ b/settlements_igloo/mod.conf @@ -1,4 +1,4 @@ name = settlements_igloo description = Adds small igloo settlements to map generation. depends = settlements, default, stairs, beds -optional_depends = namegen +optional_depends = name_generator diff --git a/settlements_jungle/init.lua b/settlements_jungle/init.lua index 12b887f..0baf739 100644 --- a/settlements_jungle/init.lua +++ b/settlements_jungle/init.lua @@ -75,14 +75,14 @@ local jungle_settlements = { }, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("jungle_camps") + if minetest.get_modpath("name_generator") then + return name_generator.generate("jungle_camps") end return S("Jungle settlement") end, } -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_jungle.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_jungle.cfg")) end settlements.register_settlement("jungle", jungle_settlements) diff --git a/settlements_jungle/mod.conf b/settlements_jungle/mod.conf index e395bc3..e4b3fb2 100644 --- a/settlements_jungle/mod.conf +++ b/settlements_jungle/mod.conf @@ -1,4 +1,4 @@ name = settlements_jungle description = Adds small jungle settlements to map generation. depends = settlements, default, stairs, doors, beds -optional_depends = namegen +optional_depends = name_generator diff --git a/settlements_medieval/init.lua b/settlements_medieval/init.lua index e936274..ae79235 100644 --- a/settlements_medieval/init.lua +++ b/settlements_medieval/init.lua @@ -4,8 +4,8 @@ local S = minetest.get_translator(modname) local schem_path = modpath.."/schematics/" -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_towns.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_towns.cfg")) end ------------------------------------- @@ -250,8 +250,8 @@ local medieval_settlements = { altitude_max = 300, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("settlement_towns") + if minetest.get_modpath("name_generator") then + return name_generator.generate("settlement_towns") end return S("Town") end, diff --git a/settlements_medieval/mod.conf b/settlements_medieval/mod.conf index 8229baa..0f91228 100644 --- a/settlements_medieval/mod.conf +++ b/settlements_medieval/mod.conf @@ -1,4 +1,4 @@ name = settlements_medieval description = Adds small medieval settlements to map generation. depends = settlements, default, walls, stairs, xpanes, fire, vessels, farming, doors, beds -optional_depends = mobs_npc, namegen, commoditymarket_fantasy, bell +optional_depends = mobs_npc, name_generator, commoditymarket_fantasy, bell diff --git a/settlements_mer/init.lua b/settlements_mer/init.lua index 4ed20e8..fa33ff0 100644 --- a/settlements_mer/init.lua +++ b/settlements_mer/init.lua @@ -54,14 +54,14 @@ local mer_settlements = { }, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("mer_settlements") + if minetest.get_modpath("name_generator") then + return name_generator.generate("mer_settlements") end return S("Mer camp") end, } -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_mer.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_mer.cfg")) end settlements.register_settlement("mer", mer_settlements) diff --git a/settlements_mer/mod.conf b/settlements_mer/mod.conf index cd0d895..1f526be 100644 --- a/settlements_mer/mod.conf +++ b/settlements_mer/mod.conf @@ -1,4 +1,4 @@ name = settlements_mer description = Adds small underwater coral settlements to map generation. depends = settlements, default -optional_depends = namegen +optional_depends = name_generator diff --git a/settlements_ruins/init.lua b/settlements_ruins/init.lua index 3b31e32..72a7bfb 100644 --- a/settlements_ruins/init.lua +++ b/settlements_ruins/init.lua @@ -53,15 +53,15 @@ local ruin_settlements = { }, generate_name = function(pos) - if minetest.get_modpath("namegen") then - return namegen.generate("ruin_settlement") + if minetest.get_modpath("name_generator") then + return name_generator.generate("ruin_settlement") end return S("Ruins") end, } -if minetest.get_modpath("namegen") then - namegen.parse_lines(io.lines(modpath.."/namegen_ruins.cfg")) +if minetest.get_modpath("name_generator") then + name_generator.parse_lines(io.lines(modpath.."/namegen_ruins.cfg")) end settlements.register_settlement("ruins", ruin_settlements) diff --git a/settlements_ruins/mod.conf b/settlements_ruins/mod.conf index fef425e..ca1ac20 100644 --- a/settlements_ruins/mod.conf +++ b/settlements_ruins/mod.conf @@ -1,4 +1,4 @@ name = settlements_ruins description = Adds small ruined settlements to tundra map generation. depends = settlements, default, stairs -optional_depends = namegen, commoditymarket_fantasy +optional_depends = name_generator, commoditymarket_fantasy