diff options
Diffstat (limited to 'builtin/game/init.lua')
-rw-r--r-- | builtin/game/init.lua | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/builtin/game/init.lua b/builtin/game/init.lua index 2f9f90315..d7606f357 100644 --- a/builtin/game/init.lua +++ b/builtin/game/init.lua @@ -1,30 +1,40 @@ -local scriptpath = core.get_builtin_path()..DIR_DELIM -local commonpath = scriptpath.."common"..DIR_DELIM -local gamepath = scriptpath.."game"..DIR_DELIM +local scriptpath = core.get_builtin_path() +local commonpath = scriptpath .. "common" .. DIR_DELIM +local gamepath = scriptpath .. "game".. DIR_DELIM -dofile(commonpath.."vector.lua") +-- Shared between builtin files, but +-- not exposed to outer context +local builtin_shared = {} -dofile(gamepath.."constants.lua") -dofile(gamepath.."item.lua") -dofile(gamepath.."register.lua") +dofile(gamepath .. "constants.lua") +dofile(gamepath .. "item_s.lua") +assert(loadfile(gamepath .. "item.lua"))(builtin_shared) +dofile(gamepath .. "register.lua") -if core.setting_getbool("profiler.load") then - profiler = dofile(scriptpath.."profiler"..DIR_DELIM.."init.lua") +if core.settings:get_bool("profiler.load") then + profiler = dofile(scriptpath .. "profiler" .. DIR_DELIM .. "init.lua") end -dofile(gamepath.."item_entity.lua") -dofile(gamepath.."deprecated.lua") -dofile(gamepath.."misc.lua") -dofile(gamepath.."privileges.lua") -dofile(gamepath.."auth.lua") -dofile(gamepath.."chatcommands.lua") -dofile(gamepath.."static_spawn.lua") -dofile(gamepath.."detached_inventory.lua") -dofile(gamepath.."falling.lua") -dofile(gamepath.."features.lua") -dofile(gamepath.."voxelarea.lua") -dofile(gamepath.."forceloading.lua") -dofile(gamepath.."statbars.lua") +dofile(commonpath .. "after.lua") +dofile(commonpath .. "mod_storage.lua") +dofile(gamepath .. "item_entity.lua") +dofile(gamepath .. "deprecated.lua") +dofile(gamepath .. "misc_s.lua") +dofile(gamepath .. "misc.lua") +dofile(gamepath .. "privileges.lua") +dofile(gamepath .. "auth.lua") +dofile(commonpath .. "chatcommands.lua") +dofile(gamepath .. "chat.lua") +dofile(commonpath .. "information_formspecs.lua") +dofile(gamepath .. "static_spawn.lua") +dofile(gamepath .. "detached_inventory.lua") +assert(loadfile(gamepath .. "falling.lua"))(builtin_shared) +dofile(gamepath .. "features.lua") +dofile(gamepath .. "voxelarea.lua") +dofile(gamepath .. "forceloading.lua") +dofile(gamepath .. "statbars.lua") +dofile(gamepath .. "knockback.lua") +dofile(gamepath .. "async.lua") profiler = nil |