mirror of
https://github.com/minetest-mods/technic.git
synced 2024-12-22 05:42:33 +01:00
Make technic_worldgen loadable before technic
There was a small amount of dependency of technic_worldgen on the technic mod, for configuration loading and the top-level "technic" table. Resolve that by sharing the configuration and top-level table between the two mods. This means that technic_worldgen can be loaded before technic, permitting other mods to depend on it without depending on technic.
This commit is contained in:
parent
dd65a68ce9
commit
9f0b41fe71
@ -1,7 +1,4 @@
|
|||||||
|
technic.config = technic.config or Settings(minetest.get_worldpath().."/technic.conf")
|
||||||
local worldpath = minetest.get_worldpath()
|
|
||||||
|
|
||||||
technic.config = Settings(worldpath.."/technic.conf")
|
|
||||||
|
|
||||||
local conf_table = technic.config:to_table()
|
local conf_table = technic.config:to_table()
|
||||||
|
|
||||||
@ -9,9 +6,6 @@ local defaults = {
|
|||||||
enable_mining_drill = "true",
|
enable_mining_drill = "true",
|
||||||
enable_mining_laser = "true",
|
enable_mining_laser = "true",
|
||||||
enable_flashlight = "false",
|
enable_flashlight = "false",
|
||||||
enable_rubber_tree_generation = "true",
|
|
||||||
enable_marble_generation = "true",
|
|
||||||
enable_granite_generation = "true",
|
|
||||||
enable_wind_mill = "false",
|
enable_wind_mill = "false",
|
||||||
enable_corium_griefing = "true",
|
enable_corium_griefing = "true",
|
||||||
}
|
}
|
||||||
@ -21,4 +15,3 @@ for k, v in pairs(defaults) do
|
|||||||
technic.config:set(k, v)
|
technic.config:set(k, v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
-- namespace: technic
|
-- namespace: technic
|
||||||
-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
|
-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
|
||||||
|
|
||||||
technic = {}
|
technic = technic or {}
|
||||||
|
|
||||||
local load_start = os.clock()
|
local load_start = os.clock()
|
||||||
local modpath = minetest.get_modpath("technic")
|
local modpath = minetest.get_modpath("technic")
|
||||||
|
15
technic_worldgen/config.lua
Normal file
15
technic_worldgen/config.lua
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
technic.config = technic.config or Settings(minetest.get_worldpath().."/technic.conf")
|
||||||
|
|
||||||
|
local conf_table = technic.config:to_table()
|
||||||
|
|
||||||
|
local defaults = {
|
||||||
|
enable_granite_generation = "true",
|
||||||
|
enable_marble_generation = "true",
|
||||||
|
enable_rubber_tree_generation = "true",
|
||||||
|
}
|
||||||
|
|
||||||
|
for k, v in pairs(defaults) do
|
||||||
|
if conf_table[k] == nil then
|
||||||
|
technic.config:set(k, v)
|
||||||
|
end
|
||||||
|
end
|
@ -1,4 +1,3 @@
|
|||||||
default
|
default
|
||||||
technic
|
|
||||||
intllib?
|
intllib?
|
||||||
mg?
|
mg?
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
local modpath = minetest.get_modpath("technic_worldgen")
|
local modpath = minetest.get_modpath("technic_worldgen")
|
||||||
|
|
||||||
|
technic = technic or {}
|
||||||
technic.worldgen = {}
|
technic.worldgen = {}
|
||||||
if intllib then
|
if intllib then
|
||||||
technic.worldgen.gettext = intllib.Getter()
|
technic.worldgen.gettext = intllib.Getter()
|
||||||
@ -7,6 +8,7 @@ else
|
|||||||
technic.worldgen.gettext = function(s) return s end
|
technic.worldgen.gettext = function(s) return s end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
dofile(modpath.."/config.lua")
|
||||||
dofile(modpath.."/nodes.lua")
|
dofile(modpath.."/nodes.lua")
|
||||||
dofile(modpath.."/oregen.lua")
|
dofile(modpath.."/oregen.lua")
|
||||||
dofile(modpath.."/crafts.lua")
|
dofile(modpath.."/crafts.lua")
|
||||||
|
Loading…
Reference in New Issue
Block a user