Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Get rid of random print() calls #127

Merged
merged 10 commits into from
Jul 3, 2024
Merged

Get rid of random print() calls #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c03699
Get rid of random print() calls
Emojigit Jun 16, 2024
ba00a49
Apply https://github.com/mt-mods/pipeworks/pull/127#issuecomment-2172…
Emojigit Jun 17, 2024
739ddc6
Use Mesecon's implementation of salf_print
Emojigit Jun 17, 2024
1980ae1
Use pipeworks_lua_tube_print_behavior for Lua tube print()
Emojigit Jun 18, 2024
060067d
So I forgot to apply things again
Emojigit Jun 18, 2024
073d721
Change log level of memory overflow
Emojigit Jun 18, 2024
9cce442
Allow (not yet?) runtime adjustment of safe_print behavior
Emojigit Jun 18, 2024
0023175
Apply https://github.com/mt-mods/pipeworks/pull/127#discussion_r16451…
Emojigit Jun 19, 2024
a57c1d6
Apply suggestions from code review
Emojigit Jun 22, 2024
744fc4a
Revert changes
Emojigit Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autoplace_pipes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function pipeworks.scan_pipe_surroundings(pos)
pzm = 1
end

print("stage 2 returns "..pxm+8*pxp+2*pym+16*pyp+4*pzm+32*pzp..
minetest.log("info", "stage 2 returns "..pxm+8*pxp+2*pym+16*pyp+4*pzm+32*pzp..
" for nodes surrounding "..minetest.get_node(pos).name.." at "..minetest.pos_to_string(pos))
return pxm+8*pxp+2*pym+16*pyp+4*pzm+32*pzp
end
Expand Down
4 changes: 4 additions & 0 deletions settingtypes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ pipeworks_entity_update_interval (Entity Update Interval) float 0 0 0.8

# if set to true, items passing through teleport tubes will log log where they came from and where they went.
pipeworks_log_teleport_tubes (Log Teleport Tubes) bool false

# Behavior of print() inside a lua tube. By default, this emits a message into actionstream.
# Set it to noop if you wish to disable that behavior.
pipeworks_lua_tube_print_behavior (Behavior of print in Lua Tube) enum log log,noop
14 changes: 8 additions & 6 deletions tubes/lua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,13 @@ end
-------------------------

local function safe_print(param)
local string_meta = getmetatable("")
local sandbox = string_meta.__index
string_meta.__index = string -- Leave string sandbox temporarily
print(dump(param))
string_meta.__index = sandbox -- Restore string sandbox
if (minetest.settings:get("pipeworks_lua_tube_print_behavior") or "log") == "log" then
local string_meta = getmetatable("")
local sandbox = string_meta.__index
string_meta.__index = string -- Leave string sandbox temporarily
minetest.log("action", string.format("[pipeworks.tubes.lua] print(%s)", dump(param)))
string_meta.__index = sandbox -- Restore string sandbox
end
end

local function safe_date()
Expand Down Expand Up @@ -603,7 +605,7 @@ local function save_memory(pos, meta, mem)
meta:set_string("lc_memory", memstring)
meta:mark_as_private("lc_memory")
else
print("Error: lua_tube memory overflow. "..memsize_max.." bytes available, "
minetest.log("info", "lua_tube memory overflow. "..memsize_max.." bytes available, "
..#memstring.." required. Controller overheats.")
burn_controller(pos)
end
Expand Down
1 change: 0 additions & 1 deletion wielder.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ if pipeworks.enable_node_breaker then
-- Don't mechanically wear out tool
if stack:get_wear() ~= old_stack:get_wear() and stack:get_count() == old_stack:get_count()
and (item_def.wear_represents == nil or item_def.wear_represents == "mechanical_wear") then
print("replaced")
fakeplayer:set_wielded_item(old_stack)
end
elseif not stack:is_empty() then
Expand Down