From e326a942661c8c449bb942968be55ce0000d5cb1 Mon Sep 17 00:00:00 2001 From: Treer Date: Sun, 26 Jul 2020 15:07:39 +1000 Subject: [PATCH] Add nether.debug() (#28) --- init.lua | 49 ++++++++++++++++++++++ portal_api.lua | 109 ++++++++++++++++++++++++++----------------------- 2 files changed, 106 insertions(+), 52 deletions(-) diff --git a/init.lua b/init.lua index 7497840..cf0123b 100644 --- a/init.lua +++ b/init.lua @@ -19,6 +19,13 @@ ]]-- +-- Set DEBUG_FLAGS to determine the behavior of nether.debug(): +-- 0 = off +-- 1 = print(...) +-- 2 = minetest.chat_send_all(...) +-- 4 = minetest.log("info", ...) +local DEBUG_FLAGS = 0 + local S if minetest.get_translator ~= nil then S = minetest.get_translator("nether") @@ -63,6 +70,48 @@ if nether.DEPTH_FLOOR + 1000 > nether.DEPTH_CEILING then end nether.DEPTH = nether.DEPTH_CEILING -- Deprecated, use nether.DEPTH_CEILING instead. + +-- A debug-print function that understands vectors etc. and does not +-- evaluate when debugging is turned off. +-- Works like string.format(), treating the message as a format string. +-- nils, tables, and vectors passed as arguments to nether.debug() are +-- converted to strings and can be included inside the message with %s +function nether.debug(message, ...) + + local args = {...} + local argCount = select("#", ...) + + for i = 1, argCount do + local arg = args[i] + if arg == nil then + -- convert nils to strings + args[i] = '' + elseif type(arg) == "table" then + local tableCount = 0 + for _,_ in pairs(arg) do tableCount = tableCount + 1 end + if tableCount == 3 and arg.x ~= nil and arg.y ~= nil and arg.z ~= nil then + -- convert vectors to strings + args[i] = minetest.pos_to_string(arg) + else + -- convert tables to strings + -- (calling function can use dump() if a multi-line listing is desired) + args[i] = string.gsub(dump(arg, ""), "\n", " ") + end + end + end + + local composed_message = string.format(message, unpack(args)) + + if math.floor(DEBUG_FLAGS / 1) % 2 == 1 then print(composed_message) end + if math.floor(DEBUG_FLAGS / 2) % 2 == 1 then minetest.chat_send_all(composed_message) end + if math.floor(DEBUG_FLAGS / 4) % 2 == 1 then minetest.log("info", composed_message) end +end +if DEBUG_FLAGS == 0 then + -- do as little evaluation as possible + nether.debug = function() end +end + + -- Load files dofile(nether.path .. "/portal_api.lua") dofile(nether.path .. "/nodes.lua") diff --git a/portal_api.lua b/portal_api.lua index c396b4f..f2780ce 100644 --- a/portal_api.lua +++ b/portal_api.lua @@ -23,8 +23,9 @@ ]]-- -local DEBUG = false -local DEBUG_IGNORE_MODSTORAGE = false -- setting true prevents portals from knowing where other portals are, forcing find_realm_anchorpos() etc. to be executed every time +-- setting DEBUG_IGNORE_MODSTORAGE true prevents portals from knowing where other +-- portals are, forcing find_realm_anchorpos() etc. to be executed every time. +local DEBUG_IGNORE_MODSTORAGE = false nether.registered_portals = {} nether.registered_portals_count = 0 @@ -662,8 +663,9 @@ nether.PortalShape_Platform = { -- Portal implementation functions -- -- =============================== -- +local S = nether.get_translator +local debugf = nether.debug local ignition_item_name -local S = nether.get_translator local mod_storage = minetest.get_mod_storage() local meseconsAvailable = minetest.get_modpath("mesecon") ~= nil and minetest.global_exists("mesecon") local book_added_as_treasure = false @@ -821,7 +823,7 @@ end local function store_portal_location_info(portal_name, anchorPos, orientation, ignited) if not DEBUG_IGNORE_MODSTORAGE then local key = minetest.pos_to_string(anchorPos) .. " is " .. portal_name - if DEBUG then minetest.chat_send_all("Adding/updating portal in mod_storage: " .. key) end + debugf("Adding/updating portal in mod_storage: " .. key) mod_storage:set_string( key, minetest.serialize({orientation = orientation, active = ignited}) @@ -834,7 +836,7 @@ end local function remove_portal_location_info(portal_name, anchorPos) if not DEBUG_IGNORE_MODSTORAGE then local key = minetest.pos_to_string(anchorPos) .. " is " .. portal_name - if DEBUG then minetest.chat_send_all("Removing portal from mod_storage: " .. key) end + debugf("Removing portal from mod_storage: " .. key) mod_storage:set_string(key, "") end end @@ -872,7 +874,7 @@ local function list_closest_portals(portal_definition, anchorPos, distance_limit local distance = math.hypot(y * y_factor, math.hypot(x, z)) if distance <= distance_limit or distance_limit < 0 then local info = minetest.deserialize(value) or {} - if DEBUG then minetest.chat_send_all("found " .. found_name .. " listed at distance " .. distance .. " (within " .. distance_limit .. ") from dest " .. minetest.pos_to_string(anchorPos) .. ", found: " .. minetest.pos_to_string(found_anchorPos) .. " orientation " .. info.orientation) end + debugf("found %s listed at distance %.2f (within %.2f) from dest %s, found: %s orientation %s", found_name, distance, distance_limit, anchorPos, found_anchorPos, info.orientation) info.anchorPos = found_anchorPos info.distance = distance result[distance] = info @@ -924,14 +926,14 @@ end function extinguish_portal(pos, node_name, frame_was_destroyed) -- mesecons seems to invoke action_off() 6 times every time you place a block? - if DEBUG then minetest.chat_send_all("extinguish_portal" .. minetest.pos_to_string(pos) .. " " .. node_name) end + debugf("extinguish_portal %s %s", pos, node_name) local meta = minetest.get_meta(pos) local p1 = minetest.string_to_pos(meta:get_string("p1")) local p2 = minetest.string_to_pos(meta:get_string("p2")) local target = minetest.string_to_pos(meta:get_string("target")) if p1 == nil or p2 == nil then - if DEBUG then minetest.chat_send_all(" no active portal found to extinguish") end + debugf(" no active portal found to extinguish") return false end @@ -983,7 +985,7 @@ function extinguish_portal(pos, node_name, frame_was_destroyed) end if target ~= nil then - if DEBUG then minetest.chat_send_all(" attempting to also extinguish target with wormholePos " .. minetest.pos_to_string(target)) end + debugf(" attempting to also extinguish target with wormholePos %s", target) extinguish_portal(target, node_name) end @@ -1000,7 +1002,8 @@ end -- Note: will extinguish any portal using the same nodes that are being set local function set_portal_metadata(portal_definition, anchorPos, orientation, destination_wormholePos, ignite) - if DEBUG then minetest.chat_send_all("set_portal_metadata(ignite=" .. tostring(ignite) .. ") at " .. minetest.pos_to_string(anchorPos) .. " orient " .. orientation .. ", setting to target " .. minetest.pos_to_string(destination_wormholePos)) end + ignite = ignite or false; + debugf("set_portal_metadata(ignite=%s) at %s orient %s, setting to target %s", ignite, anchorPos, orientation, destination_wormholePos) -- Portal position is stored in metadata as p1 and p2 to keep maps compatible with earlier versions of this mod. -- p1 is the bottom/west/south corner of the portal, and p2 is the opposite corner, together @@ -1028,7 +1031,7 @@ local function set_portal_metadata(portal_definition, anchorPos, orientation, de if existing_p1 ~= "" then local existing_p2 = meta:get_string("p2") if existing_p1 ~= p1_string or existing_p2 ~= p2_string then - if DEBUG then minetest.chat_send_all("set_portal_metadata() found existing metadata from another portal: existing_p1 " .. existing_p1 .. ", existing_p2" .. existing_p2 .. ", p1 " .. p1_string .. ", p2 " .. p2_string .. ", will existinguish existing portal...") end + debugf("set_portal_metadata() found existing metadata from another portal: existing_p1 %s, existing_p2 %s, p1 %s, p2 %s, will extinguish existing portal...", existing_p1, existing_p2, p1_string, p2_string) -- this node is already part of another portal, so extinguish that, because nodes only -- contain a link in the metadata to one portal, and being part of two allows a slew of bugs extinguish_portal(pos, node_name, false) @@ -1092,7 +1095,7 @@ local function is_portal_at_anchorPos(portal_definition, anchorPos, orientation, -- area isn't loaded, force loading/emerge of check area minetest.get_voxel_manip():read_from_map(check_pos, check_pos) foundName = minetest.get_node(check_pos).name - if DEBUG then minetest.chat_send_all("Forced loading of 'ignore' node at " .. minetest.pos_to_string(check_pos) .. ", got " .. foundName) end + debugf("Forced loading of 'ignore' node at %s, got %s", check_pos, foundName) if foundName ~= frame_node_name then nodes_are_valid = false @@ -1202,7 +1205,7 @@ local function build_portal(portal_definition, anchorPos, orientation, destinati function(pos) minetest.swap_node(pos, wormholeNode) end ) - if DEBUG then minetest.chat_send_all("Placed " .. portal_definition.name .. " portal schematic at " .. minetest.pos_to_string(portal_definition.shape.get_schematicPos_from_anchorPos(anchorPos, orientation)) .. ", orientation " .. orientation) end + debugf("Placed %s portal schematic at %s, orientation %s", portal_definition.name, portal_definition.shape.get_schematicPos_from_anchorPos(anchorPos, orientation), orientation) set_portal_metadata(portal_definition, anchorPos, orientation, destination_wormholePos) @@ -1216,7 +1219,7 @@ end -- Make portals immortal for ~20 seconds after creation local function remote_portal_checkup(elapsed, portal_definition, anchorPos, orientation, destination_wormholePos) - if DEBUG then minetest.chat_send_all("portal checkup at " .. elapsed .. " seconds") end + debugf("portal checkup at %d seconds", elapsed) local wormholePos = portal_definition.shape.get_wormholePos_from_anchorPos(anchorPos, orientation) local wormhole_node = minetest.get_node_or_nil(wormholePos) @@ -1231,7 +1234,7 @@ local function remote_portal_checkup(elapsed, portal_definition, anchorPos, orie -- ruh roh local message = "Newly created portal at " .. minetest.pos_to_string(anchorPos) .. " was overwritten. Attempting to recreate. Issue spotted after " .. elapsed .. " seconds" minetest.log("warning", message) - if DEBUG then minetest.chat_send_all("!!! " .. message) end + debugf("!!! " .. message) -- A pre-existing portal frame wouldn't have been immediately overwritten, so no need to check for one, just place the portal. build_portal(portal_definition, anchorPos, orientation, destination_wormholePos) @@ -1259,7 +1262,7 @@ end -- specified if an existing portal was already found there. local function locate_or_build_portal(portal_definition, suggested_wormholePos, suggested_orientation, destination_wormholePos) - if DEBUG then minetest.chat_send_all("locate_or_build_portal() called at wormholePos" .. minetest.pos_to_string(suggested_wormholePos) .. " with suggested orient " .. suggested_orientation .. ", targetted to " .. minetest.pos_to_string(destination_wormholePos)) end + debugf("locate_or_build_portal() called at wormholePos%s with suggested orient %s, targeted to %s", suggested_wormholePos, suggested_orientation, destination_wormholePos) local result_anchorPos; local result_orientation; @@ -1280,13 +1283,13 @@ local function locate_or_build_portal(portal_definition, suggested_wormholePos, if result_target ~= nil and vector.equals(result_target, destination_wormholePos) then -- It already links back to the portal the player is teleporting from, so don't -- extinguish it or the player's portal will also extinguish. - if DEBUG then minetest.chat_send_all(" Build unnecessary: already a lit portal that links back here at " .. minetest.pos_to_string(found_anchorPos) .. ", orientation " .. result_orientation) end + debugf(" Build unnecessary: already a lit portal that links back here at %s, orientation %s", found_anchorPos, result_orientation) else - if DEBUG then minetest.chat_send_all(" Build unnecessary: already a lit portal at " .. minetest.pos_to_string(found_anchorPos) .. ", orientation " .. result_orientation .. ", linking to " .. result_target_str .. ". Extinguishing...") end + debugf(" Build unnecessary: already a lit portal at %s, orientation %s, linking to %s. Extinguishing...", found_anchorPos, result_orientation, result_target_str) extinguish_portal(found_anchorPos, portal_definition.frame_node_name, false) end else - if DEBUG then minetest.chat_send_all(" Build unnecessary: already an unlit portal at " .. minetest.pos_to_string(found_anchorPos) .. ", orientation " .. result_orientation) end + debugf(" Build unnecessary: already an unlit portal at %s, orientation %s", found_anchorPos, result_orientation) end -- ignite the portal set_portal_metadata_and_ignite(portal_definition, result_anchorPos, result_orientation, destination_wormholePos) @@ -1308,7 +1311,7 @@ end local function ignite_portal(ignition_pos, player_name, ignition_node_name) if ignition_node_name == nil then ignition_node_name = minetest.get_node(ignition_pos).name end - if DEBUG then minetest.chat_send_all("IGNITE the " .. ignition_node_name .. " at " .. minetest.pos_to_string(ignition_pos)) end + debugf("IGNITE the %s at %s", ignition_node_name, ignition_pos) -- find which sort of portals are made from the node that was clicked on local portal_definition_list = list_portal_definitions_for_frame_node(ignition_node_name) @@ -1319,7 +1322,7 @@ local function ignite_portal(ignition_pos, player_name, ignition_node_name) -- check it was a portal frame that the player is trying to ignite local anchorPos, orientation, is_ignited = is_within_portal_frame(portal_definition, ignition_pos) if anchorPos == nil then - if DEBUG then minetest.chat_send_all("No " .. portal_definition.name .. " portal frame found at " .. minetest.pos_to_string(ignition_pos)) end + debugf("No %s portal frame found at ", portal_definition.name, ignition_pos) continue = true -- no portal is here, but perhaps there's more than one portal type we need to search for elseif is_ignited then -- Found a portal, check its metadata and timer is healthy. @@ -1331,10 +1334,10 @@ local function ignite_portal(ignition_pos, player_name, ignition_node_name) -- metadata is missing, the portal frame node must have been removed without calling -- on_destruct - perhaps by an ABM, then replaced - presumably by a player. -- allowing reigniting will repair the portal - if DEBUG then minetest.chat_send_all("Broken portal detected, allowing reignition/repair") end + debugf("Broken portal detected, allowing reignition/repair") repair = true else - if DEBUG then minetest.chat_send_all("This portal links to " .. meta:get_string("target") .. ". p1=" .. meta:get_string("p1") .. " p2=" .. meta:get_string("p2")) end + debugf("This portal links to %s. p1=%s p2=%s", meta:get_string("target"), meta:get_string("p1"), meta:get_string("p2")) -- Check the portal's timer is running, and fix if it's not. -- A portal's timer can stop running if the game is played without that portal type being @@ -1342,7 +1345,7 @@ local function ignite_portal(ignition_pos, player_name, ignition_node_name) -- (if this is a frequent problem, then change the value of "run_at_every_load" in the lbm) local timer = minetest.get_node_timer(get_timerPos_from_p1_and_p2(minetest.string_to_pos(p1), minetest.string_to_pos(p2))) if timer ~= nil and timer:get_timeout() == 0 then - if DEBUG then minetest.chat_send_all("Portal timer was not running: restarting the timer.") end + debugf("Portal timer was not running: restarting the timer.") timer:start(1) end end @@ -1351,7 +1354,7 @@ local function ignite_portal(ignition_pos, player_name, ignition_node_name) end if continue == false then - if DEBUG then minetest.chat_send_all("Found portal frame. Looked at " .. minetest.pos_to_string(ignition_pos) .. ", found at " .. minetest.pos_to_string(anchorPos) .. " orientation " .. orientation) end + debugf("Found portal frame. Looked at %s, found at %s orientation %s", ignition_pos, anchorPos, orientation) local destination_anchorPos, destination_orientation if portal_definition.is_within_realm(ignition_pos) then @@ -1359,15 +1362,17 @@ local function ignite_portal(ignition_pos, player_name, ignition_node_name) else destination_anchorPos, destination_orientation = portal_definition.find_realm_anchorPos(anchorPos, player_name or "") end - if DEBUG and destination_orientation == nil then minetest.chat_send_all("No destination_orientation given") end - if destination_orientation == nil then destination_orientation = orientation end + if destination_orientation == nil then + debugf("No destination_orientation given") + destination_orientation = orientation + end if destination_anchorPos == nil then - if DEBUG then minetest.chat_send_all("No portal destination available here!") end + debugf("No portal destination available here!") return false else local destination_wormholePos = portal_definition.shape.get_wormholePos_from_anchorPos(destination_anchorPos, destination_orientation) - if DEBUG then minetest.chat_send_all("Destination set to " .. minetest.pos_to_string(destination_anchorPos)) end + debugf("Destination set to %s", destination_anchorPos) -- ignition/BURN_BABY_BURN set_portal_metadata_and_ignite(portal_definition, anchorPos, orientation, destination_wormholePos) @@ -1406,7 +1411,7 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, local local_p1, local_p2 = portal_definition.shape:get_p1_and_p2_from_anchorPos(local_anchorPos, local_orientation) local p1_at_playerPos = minetest.string_to_pos(meta:get_string("p1")) if p1_at_playerPos == nil or not vector.equals(local_p1, p1_at_playerPos) then - if DEBUG then minetest.chat_send_all("the player already teleported from " .. minetest.pos_to_string(local_anchorPos) .. ", and is now standing in a different portal - " .. meta:get_string("p1")) end + debugf("the player already teleported from %s, and is now standing in a different portal - %s", local_anchorPos, meta:get_string("p1")) return -- the player already teleported, and is now standing in a different portal end @@ -1414,7 +1419,7 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, if dest_wormhole_node == nil then -- area not emerged yet, delay and retry - if DEBUG then minetest.chat_send_all("ensure_remote_portal_then_teleport() could not find anything yet at " .. minetest.pos_to_string(destination_wormholePos)) end + debugf("ensure_remote_portal_then_teleport() could not find anything yet at %s", destination_wormholePos) minetest.after(1, ensure_remote_portal_then_teleport, playerName, portal_definition, local_anchorPos, local_orientation, destination_wormholePos) else local local_wormholePos = portal_definition.shape.get_wormholePos_from_anchorPos(local_anchorPos, local_orientation) @@ -1431,9 +1436,9 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, local remoteMeta = minetest.get_meta(destination_wormholePos) local remoteTarget = minetest.string_to_pos(remoteMeta:get_string("target")) if remoteTarget == nil then - if DEBUG then minetest.chat_send_all("Failed to test whether target portal links back to this one") end + debugf("Failed to test whether target portal links back to this one") elseif not vector.equals(remoteTarget, local_wormholePos) then - if DEBUG then minetest.chat_send_all("Target portal is already linked, extinguishing then relighting to point back at this one") end + debugf("Target portal is already linked, extinguishing then relighting to point back at this one") extinguish_portal(remoteTarget, portal_definition.frame_node_name, false) set_portal_metadata_and_ignite( portal_definition, @@ -1443,7 +1448,7 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, ) end - if DEBUG then minetest.chat_send_all("Teleporting player from wormholePos" .. minetest.pos_to_string(local_wormholePos) .. " to wormholePos" .. minetest.pos_to_string(destination_wormholePos)) end + debugf("Teleporting player from wormholePos%s to wormholePos%s", local_wormholePos, destination_wormholePos) -- play the teleport sound if portal_definition.sounds.teleport ~= nil then @@ -1470,7 +1475,7 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, -- which will leave a confused player. -- I don't think this is worth preventing, but I document it incase someone describes entering a portal -- and then the portal turning off. - if DEBUG then minetest.chat_send_all("ensure_remote_portal_then_teleport() saw " .. dest_wormhole_node.name .. " at " .. minetest.pos_to_string(destination_wormholePos) .. " rather than a wormhole. Calling locate_or_build_portal()") end + debugf("ensure_remote_portal_then_teleport() saw %s at %s rather than a wormhole. Calling locate_or_build_portal()", dest_wormhole_node.name, destination_wormholePos) local new_dest_anchorPos, new_dest_orientation = locate_or_build_portal(portal_definition, destination_wormholePos, local_orientation, local_wormholePos) local new_dest_wormholePos = portal_definition.shape.get_wormholePos_from_anchorPos(new_dest_anchorPos, new_dest_orientation) @@ -1487,10 +1492,10 @@ local function ensure_remote_portal_then_teleport(playerName, portal_definition, -- local portal to also be extinguished. local message = "Local portal at " .. minetest.pos_to_string(local_anchorPos) .. " was extinguished while linking to existing portal at " .. minetest.pos_to_string(new_dest_anchorPos) minetest.log("error", message) - if DEBUG then minetest.chat_send_all("!ERROR! - " .. message) end + debugf("!ERROR! - " .. message) else destination_wormholePos = new_dest_wormholePos - if DEBUG then minetest.chat_send_all(" updating target to where remote portal was found - " .. minetest.pos_to_string(destination_wormholePos)) end + debugf(" updating target to where remote portal was found - %s", destination_wormholePos) set_portal_metadata( portal_definition, @@ -1825,22 +1830,22 @@ function register_frame_node(frame_node_name) extended_node_def.replaced_by_portalapi.mesecons = extended_node_def.mesecons extended_node_def.mesecons = {effector = { action_on = function (pos, node) - if DEBUG then minetest.chat_send_all("portal frame material: mesecons action ON") end + debugf("portal frame material: mesecons action ON") ignite_portal(pos, nil, node.name) end, action_off = function (pos, node) - if DEBUG then minetest.chat_send_all("portal frame material: mesecons action OFF") end + debugf("portal frame material: mesecons action OFF") extinguish_portal(pos, node.name, false) end }} extended_node_def.replaced_by_portalapi.on_destruct = extended_node_def.on_destruct extended_node_def.on_destruct = function(pos) - if DEBUG then minetest.chat_send_all("portal frame material: destruct") end + debugf("portal frame material: destruct") extinguish_portal(pos, frame_node_name, true) end extended_node_def.replaced_by_portalapi.on_blast = extended_node_def.on_blast extended_node_def.on_blast = function(pos, intensity) - if DEBUG then minetest.chat_send_all("portal frame material: blast") end + debugf("portal frame material: blast") extinguish_portal(pos, frame_node_name, extended_node_def.replaced_by_portalapi.on_blast == nil) if extended_node_def.replaced_by_portalapi.on_blast ~= nil then extended_node_def.replaced_by_portalapi.on_blast(pos, intensity) @@ -1936,9 +1941,9 @@ minetest.register_lbm({ local timer = minetest.get_node_timer(timerPos) if timer ~= nil then timer:start(1) - if DEBUG then minetest.chat_send_all("LBM started portal timer " .. minetest.pos_to_string(timerPos)) end - elseif DEBUG then - minetest.chat_send_all("get_node_timer" .. minetest.pos_to_string(timerPos) .. " returned null") + debugf("LBM started portal timer %s", timerPos) + else + debugf("get_node_timer%s returned null", timerPos) end end end @@ -2193,7 +2198,7 @@ function nether.volume_is_natural_and_unprotected(minp, maxp, player_name) local vi = area:index(minp.x, y, z) for x = minp.x, maxp.x do local id = data[vi] -- Existing node - if DEBUG and id == nil then minetest.chat_send_all("nil block at index " .. vi) end + if id == nil then debugf("nil block at index " .. vi) end if id ~= c_air and id ~= c_ignore and id ~= nil then -- checked for common natural or not emerged local name = minetest.get_name_from_content_id(id) local nodedef = minetest.registered_nodes[name] @@ -2201,7 +2206,7 @@ function nether.volume_is_natural_and_unprotected(minp, maxp, player_name) -- trees are natural but not "ground content" local node_groups = nodedef.groups if node_groups == nil or (node_groups.tree == nil and node_groups.leaves == nil and node_groups.leafdecay == nil) then - if DEBUG then minetest.chat_send_all("volume_is_natural_and_unprotected() found unnatural node " .. name) end + debugf("volume_is_natural_and_unprotected() found unnatural node %s", name) return false end end @@ -2212,11 +2217,11 @@ function nether.volume_is_natural_and_unprotected(minp, maxp, player_name) end if minetest.is_area_protected(minp, maxp, player_name or "") then - if DEBUG then minetest.chat_send_all("Volume is protected " .. minetest.pos_to_string(minp) .. "-" .. minetest.pos_to_string(maxp)) end + debugf("Volume is protected %s-%s", minp, maxp) return false; end - if DEBUG then minetest.chat_send_all("Volume is natural and unprotected for player '" .. (player_name or "") .. "', " .. minetest.pos_to_string(minp) .. "-" .. minetest.pos_to_string(maxp)) end + debugf("Volume is natural and unprotected for player '%s', %s-%s", player_name, minp, maxp) return true end @@ -2227,7 +2232,7 @@ function nether.volume_is_natural(minp, maxp) local stack = debug.traceback("", 2); local calling_func = (string.split(stack, "\n", false, 2, false)[2] or ""):trim() minetest.log("warning", - "Deprecated function \"nether.volume_is_natural()\" invoked. Use \"nether.volume_is_natural_and_unprotected()\" instead. " .. + "Deprecated function \"nether.volume_is_natural()\" invoked, use \"nether.volume_is_natural_and_unprotected()\" instead. " .. calling_func) nether.deprecation_warning_volume_is_natural = true; end @@ -2322,7 +2327,7 @@ function nether.find_surface_target_y(target_x, target_z, portal_name, player_na -- but reigniting existing portals in portal rooms is fine - desirable even. local anchorPos, orientation, is_ignited = is_within_portal_frame(nether.registered_portals[portal_name], {x = target_x, y = y, z = target_z}) if anchorPos ~= nil then - if DEBUG then minetest.chat_send_all("volume_is_natural_and_unprotected check failed, but a portal frame is here " .. minetest.pos_to_string(anchorPos) .. ", so this is still a good target y level") end + debugf("volume_is_natural_and_unprotected check failed, but a portal frame is here %s, so this is still a good target y level", anchorPos) return y end end @@ -2351,7 +2356,7 @@ function nether.find_nearest_working_portal(portal_name, anchorPos, distance_lim for _, dist in ipairs(dist_list) do local portal_info = contenders[dist] - if DEBUG then minetest.chat_send_all("checking portal from mod_storage at " .. minetest.pos_to_string(portal_info.anchorPos) .. " orientation " .. portal_info.orientation) end + debugf("checking portal from mod_storage at %s orientation %s", portal_info.anchorPos, portal_info.orientation) -- the mod_storage list of portals is unreliable - e.g. it won't know if inactive portals have been -- destroyed, so check the portal is still there @@ -2360,7 +2365,7 @@ function nether.find_nearest_working_portal(portal_name, anchorPos, distance_lim if portalFound then return portal_info.anchorPos, portal_info.orientation else - if DEBUG then minetest.chat_send_all("Portal wasn't found, removing portal from mod_storage at " .. minetest.pos_to_string(portal_info.anchorPos) .. " orientation " .. portal_info.orientation) end + debugf("Portal wasn't found, removing portal from mod_storage at %s orientation %s", portal_info.anchorPos, portal_info.orientation) -- The portal at that location must have been destroyed remove_portal_location_info(portal_name, portal_info.anchorPos) end