-
Notifications
You must be signed in to change notification settings - Fork 120
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add library support to Luacontrollers #557
Open
cheapie
wants to merge
2
commits into
minetest-mods:master
Choose a base branch
from
cheapie:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -459,6 +459,24 @@ local function get_digiline_send(pos, itbl, send_warning) | |
end | ||
end | ||
|
||
-- Mods can place their own "libraries" in here to be loaded via require() from in a Luacontroller. | ||
-- These can take two different forms: | ||
-- Function (recommended for libraries adding new functionality): A function that, when called, returns something that will be passed to the LuaC code. | ||
-- Function signature is getlibrary(env, pos) where 'env' is the environment that the Luacontroller code is running in, and 'pos' is the position of the controller. | ||
-- Table (recommended for libraries containing mostly lookup tables): A table that will be copied, and the copy returned to the LuaC code. | ||
-- When using the table format, any functions in the table will have their environment changed to that of the Luacontroller. | ||
mesecon.luacontroller_libraries = {} | ||
|
||
local function get_require(pos, env) | ||
return function(name) | ||
if type(mesecon.luacontroller_libraries[name]) == "function" then | ||
return mesecon.luacontroller_libraries[name](env, pos) | ||
elseif type(mesecon.luacontroller_libraries[name]) == "table" then | ||
return mesecon.tablecopy_change_env(mesecon.luacontroller_libraries[name], env) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Repetitive |
||
end | ||
end | ||
end | ||
|
||
local safe_globals = { | ||
-- Don't add pcall/xpcall unless willing to deal with the consequences (unless very careful, incredibly likely to allow killing server indirectly) | ||
"assert", "error", "ipairs", "next", "pairs", "select", | ||
|
@@ -546,6 +564,8 @@ local function create_environment(pos, mem, event, itbl, send_warning) | |
for _, name in pairs(safe_globals) do | ||
env[name] = _G[name] | ||
end | ||
|
||
env.require = get_require(pos, env) | ||
|
||
return env | ||
end | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to have this mentioned somewhere, eg. in the code comment at the top of the file.