Minor cleanup

This commit is contained in:
MoNTE48 2020-03-22 21:25:05 +01:00 committed by SmallJoker
parent 448fe3ebf1
commit 800a93f5ee
12 changed files with 8 additions and 22 deletions

View File

@ -109,4 +109,3 @@ Copyright (C) 2013 ShadowNinja
Licensed under the GNU LGPL version 2.1 or later. Licensed under the GNU LGPL version 2.1 or later.
See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt

View File

@ -1,6 +1,5 @@
local hudHandlers = {} local hudHandlers = {}
areas.registered_on_adds = {} areas.registered_on_adds = {}
areas.registered_on_removes = {} areas.registered_on_removes = {}
areas.registered_on_moves = {} areas.registered_on_moves = {}
@ -17,13 +16,11 @@ function areas:registerOnMove(func)
table.insert(areas.registered_on_moves, func) table.insert(areas.registered_on_moves, func)
end end
--- Adds a function as a HUD handler, it will be able to add items to the Areas HUD element. --- Adds a function as a HUD handler, it will be able to add items to the Areas HUD element.
function areas:registerHudHandler(handler) function areas:registerHudHandler(handler)
table.insert(hudHandlers, handler) table.insert(hudHandlers, handler)
end end
function areas:getExternalHudEntries(pos) function areas:getExternalHudEntries(pos)
local areas = {} local areas = {}
for _, func in pairs(hudHandlers) do for _, func in pairs(hudHandlers) do
@ -118,7 +115,7 @@ end
-- Note that this fails and returns false when the specified area is fully -- Note that this fails and returns false when the specified area is fully
-- owned by the player, but with multiple protection zones, none of which -- owned by the player, but with multiple protection zones, none of which
-- cover the entire checked area. -- cover the entire checked area.
-- @param name (optional) Player name. If not specified checks for any intersecting areas. -- @param name (optional) Player name. If not specified checks for any intersecting areas.
-- @param allow_open Whether open areas should be counted as if they didn't exist. -- @param allow_open Whether open areas should be counted as if they didn't exist.
-- @return Boolean indicating whether the player can interact in that area. -- @return Boolean indicating whether the player can interact in that area.
-- @return Un-owned intersecting area ID, if found. -- @return Un-owned intersecting area ID, if found.

View File

@ -75,8 +75,7 @@ minetest.register_chatcommand("add_owner", {
.." positions that have already been protected," .." positions that have already been protected,"
.." Use set_owner if you don't want the parent to be set."), .." Use set_owner if you don't want the parent to be set."),
func = function(name, param) func = function(name, param)
local pid, ownerName, areaName local pid, ownerName, areaName = param:match('^(%d+) ([^ ]+) (.+)$')
= param:match('^(%d+) ([^ ]+) (.+)$')
if not pid then if not pid then
minetest.chat_send_player(name, S("Invalid usage, see /help @1.", "add_owner")) minetest.chat_send_player(name, S("Invalid usage, see /help @1.", "add_owner"))
@ -294,7 +293,7 @@ if areas.factions_available then
if not id then if not id then
return false, S("Invalid usage, see /help @1.", "area_faction_open") return false, S("Invalid usage, see /help @1.", "area_faction_open")
end end
if not areas:isAreaOwner(id, name) then if not areas:isAreaOwner(id, name) then
return false, S("Area @1 does not exist" return false, S("Area @1 does not exist"
.." or is not owned by you.", id) .." or is not owned by you.", id)
@ -386,7 +385,7 @@ minetest.register_chatcommand("area_info", {
area_num = area_num + 1 area_num = area_num + 1
end end
end end
table.insert(lines, S("You have @1 areas.", area_num)) table.insert(lines, S("You have @1 areas.", area_num))
-- Area limit -- Area limit
local area_limit_line = privs.areas and local area_limit_line = privs.areas and
@ -418,4 +417,3 @@ minetest.register_chatcommand("area_info", {
return true, table.concat(lines, "\n") return true, table.concat(lines, "\n")
end, end,
}) })

View File

@ -4,7 +4,6 @@ areas.hud = {}
areas.hud.refresh = 0 areas.hud.refresh = 0
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
areas.hud.refresh = areas.hud.refresh + dtime areas.hud.refresh = areas.hud.refresh + dtime
if areas.hud.refresh > areas.config["tick"] then if areas.hud.refresh > areas.config["tick"] then
areas.hud.refresh = 0 areas.hud.refresh = 0
@ -69,4 +68,3 @@ end)
minetest.register_on_leaveplayer(function(player) minetest.register_on_leaveplayer(function(player)
areas.hud[player:get_player_name()] = nil areas.hud[player:get_player_name()] = nil
end) end)

View File

@ -25,7 +25,7 @@ minetest.register_privilege("areas", {
description = "Can administer areas." description = "Can administer areas."
}) })
minetest.register_privilege("areas_high_limit", { minetest.register_privilege("areas_high_limit", {
description = "Can can more, bigger areas." description = "Can protect more, bigger areas."
}) })
if not minetest.registered_privileges[areas.config.self_protection_privilege] then if not minetest.registered_privileges[areas.config.self_protection_privilege] then
@ -38,4 +38,3 @@ if minetest.settings:get_bool("log_mods") then
local diffTime = os.clock() - areas.startTime local diffTime = os.clock() - areas.startTime
minetest.log("action", "areas loaded in "..diffTime.."s.") minetest.log("action", "areas loaded in "..diffTime.."s.")
end end

View File

@ -17,4 +17,3 @@ minetest.register_on_protection_violation(function(pos, name)
table.concat(owners, ", "))) table.concat(owners, ", ")))
end end
end) end)

View File

@ -48,7 +48,7 @@ end
function areas:checkAreaStoreId(sid) function areas:checkAreaStoreId(sid)
if not sid then if not sid then
minetest.log("error", "AreaStore failed to find an ID for an " minetest.log("error", "AreaStore failed to find an ID for an "
.."area! Falling back to iterative area checking.") .."area! Falling back to iterative area checking.")
self.store = nil self.store = nil
self.store_ids = nil self.store_ids = nil
end end
@ -150,7 +150,6 @@ function areas:move(id, area, pos1, pos2)
area.pos1 = pos1 area.pos1 = pos1
area.pos2 = pos2 area.pos2 = pos2
for i=1, #areas.registered_on_moves do for i=1, #areas.registered_on_moves do
areas.registered_on_moves[i](id, area, pos1, pos2) areas.registered_on_moves[i](id, area, pos1, pos2)
end end

View File

@ -137,4 +137,3 @@ if areas.config.legacy_table then
end end
}) })
end end

View File

@ -86,7 +86,7 @@ Area is too big.=La zone est trop grande.
Self protection is disabled or you do not have the necessary privilege.=Lautoprotection est désactivée ou vous navez pas le privilège nécessaire. Self protection is disabled or you do not have the necessary privilege.=Lautoprotection est désactivée ou vous navez pas le privilège nécessaire.
The area intersects with @1 [@2] (@3).=La zone a une intersection avec @1 [@2] (@3). The area intersects with @1 [@2] (@3).=La zone a une intersection avec @1 [@2] (@3).
You have reached the maximum amount of areas that you are allowed to protect.=Vous avez atteint le nombre maximum de zones que vous êtes autorisé à protéger. You have reached the maximum amount of areas that you are allowed to protect.=Vous avez atteint le nombre maximum de zones que vous êtes autorisé à protéger.

View File

@ -1,4 +1,5 @@
local S = minetest.get_translator("areas") local S = minetest.get_translator("areas")
-- I could depend on WorldEdit for this, but you need to have the 'worldedit' -- I could depend on WorldEdit for this, but you need to have the 'worldedit'
-- permission to use those commands and you don't have -- permission to use those commands and you don't have
-- /area_pos{1,2} [X Y Z|X,Y,Z]. -- /area_pos{1,2} [X Y Z|X,Y,Z].
@ -262,4 +263,3 @@ minetest.register_entity("areas:pos2", {
areas.marker2[name] = nil areas.marker2[name] = nil
end, end,
}) })

View File

@ -43,4 +43,3 @@ file:close()
-------------- --------------
setting("filename", "string", world_path.."/areas.dat") setting("filename", "string", world_path.."/areas.dat")

View File

@ -35,4 +35,3 @@ areas.self_protection_max_size_high (Maximal area size) v3f (512, 512, 512)
# Only enter positive whole numbers for the coordinate values or you'll mess up stuff. # Only enter positive whole numbers for the coordinate values or you'll mess up stuff.
# This setting applies for plyaers with the privilege 'areas_high_limit' # This setting applies for plyaers with the privilege 'areas_high_limit'
areas.self_protection_max_areas_high (Maximal area count) float 32 areas.self_protection_max_areas_high (Maximal area count) float 32