From 932e12410a098923b8e7009d00e71343830d4bc2 Mon Sep 17 00:00:00 2001 From: wsor Date: Sat, 5 Dec 2020 14:20:51 -0500 Subject: [PATCH 1/5] add luacheck --- .github/workflows/build.yml | 17 +++++++++++++++++ .luacheckrc | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .luacheckrc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..7acb366 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,17 @@ +name: build + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: apt + run: sudo apt-get install -y luarocks + - name: luacheck install + run: luarocks install --local luacheck + - name: luacheck run + run: $HOME/.luarocks/bin/luacheck ./ diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..6bec803 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,21 @@ +unused_args = false +allow_defined_top = true +exclude_files = {".luacheckrc"} + +globals = { + "minetest", +} + +read_globals = { + string = {fields = {"split"}}, + table = {fields = {"copy", "getn"}}, + + -- Builtin + "vector", "ItemStack", + "dump", "DIR_DELIM", "VoxelArea", "Settings", + + -- MTG + "default", "sfinv", "creative", "carts", + + --depends +} \ No newline at end of file From a5fd28affdc013389e2e4058039fba84eca04255 Mon Sep 17 00:00:00 2001 From: wsor Date: Sat, 5 Dec 2020 14:23:43 -0500 Subject: [PATCH 2/5] fix luacheck warnings --- init.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 10fa0f6..2f00e86 100644 --- a/init.lua +++ b/init.lua @@ -35,9 +35,12 @@ minetest.register_chatcommand("mapfix", { previous = time end - minetest.log("action", name .. " uses mapfix at " .. minetest.pos_to_string(vector.round(pos)) .. " with radius " .. size) + minetest.log("action", + name .. " uses mapfix at " .. minetest.pos_to_string(vector.round(pos)) .. " with radius " .. size) - size = math.max(math.floor(size - 8), 0) -- When passed to get_voxel_manip, positions are rounded up, to a multiple of 16 nodes in each direction. By subtracting 8 it's rounded to the nearest chunk border. max is used to avoid negative radius. + -- When passed to get_voxel_manip, positions are rounded up, to a multiple of 16 nodes in each direction. + -- By subtracting 8 it's rounded to the nearest chunk border. max is used to avoid negative radius. + size = math.max(math.floor(size - 8), 0) local minp = vector.subtract(pos, size) local maxp = vector.add(pos, size) From a7109318cad35043d55b5ca49394396574a4fd9b Mon Sep 17 00:00:00 2001 From: wsor Date: Sat, 5 Dec 2020 15:02:06 -0500 Subject: [PATCH 3/5] add option to change mapfix priv --- init.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 2f00e86..fa9c831 100644 --- a/init.lua +++ b/init.lua @@ -13,6 +13,16 @@ local default_size = tonumber(minetest.settings:get("mapfix_default_size")) or 2 local max_size = tonumber(minetest.settings:get("mapfix_max_size")) or 32 local delay = tonumber(minetest.settings:get("mapfix_delay")) or 15 +local function mapfix_priv() + local priv = minetest.settings:get("mapfix_priv") + + if not minetest.registered_privileges[priv] then + return "server" + else + return priv + end +end + minetest.register_chatcommand("mapfix", { params = "", description = "Recalculate the flowing liquids and the light of a chunk", @@ -23,12 +33,12 @@ minetest.register_chatcommand("mapfix", { if size >= 121 then return false, "Radius is too big" end - local privs = minetest.check_player_privs(name, {server=true}) + local privs = minetest.check_player_privs(name, mapfix_priv()) local time = os.time() if not privs then if size > max_size then - return false, "You need the server privilege to exceed the radius of " .. max_size .. " blocks" + return false, "You need the " .. mapfix_priv() .. " privilege to exceed the radius of " .. max_size .. " blocks" elseif time - previous < delay then return false, "Wait at least " .. delay .. " seconds from the previous \"/mapfix\"." end From 85aac3c26260316af21713aad21cb32688bc7232 Mon Sep 17 00:00:00 2001 From: wsor Date: Sat, 5 Dec 2020 15:10:24 -0500 Subject: [PATCH 4/5] add settingtypes.txt --- settingtypes.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 settingtypes.txt diff --git a/settingtypes.txt b/settingtypes.txt new file mode 100644 index 0000000..00bff61 --- /dev/null +++ b/settingtypes.txt @@ -0,0 +1,4 @@ +mapfix_default_size (default size a mapfix range is) int 24 +mapfix_max_size (max size a mapfix range can be) int 32 +mapfix_delay (delay between issueing of /mapfix for players) int 15 +mapfix_priv (priv for unrestricted /mapfix use) string server \ No newline at end of file From 16ef3878ae9806b90ee5c110919bdad4e76a796a Mon Sep 17 00:00:00 2001 From: wsor Date: Sat, 5 Dec 2020 15:17:54 -0500 Subject: [PATCH 5/5] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0549554..2bf1b66 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,4 @@ Look at the water and the jungle trunk at the center. * mapfix_default_size (by default 24) : size used when omitted * mapfix_max_size (by default 32) : maximum size allowed for players * mapfix_delay (by default 15) : minimal delay in seconds between 2 `/mapfix` (to avoid server freezing) +* mapfix_priv (by default server) : priv that allows use of `/mapfix` without restrictions