diff --git a/README.md b/README.md index 47806bb..448f37e 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ Change log: - 3.2 - Defaults to Minetest translation if found, otherwise intllib fallback if loaded, locale files updated for both. Added 'protector_msg' setting for player text. - 3.3 - Added support for playerfactions new api (thanks louisroyer), added limiter to protection radius of 22. - 3.4 - Player flip and hurt functions moved to minetest.register_protection_violation function (thanks hlqkj), added 'protector_crafts' setting, changed wood doors n chests to immediate_dig for mineclone2 fix. Upped protector radius limit to 30. -- 3.5 - Store settings in global, reduce screenshot, tweak door sounds, use node template, add name check to commands, add commands to add and remove member names, tweak & tidy code. Lucky Blocks: 10 @@ -77,7 +76,7 @@ remove specific user names /protector_remove name1 name2 -reset names on remove list +remove all names from list /protector_remove - @@ -93,27 +92,19 @@ replace owner with new name /protector_replace owner new_owner -reset names on replace list +reset name list /protector_replace - -show protected areas of your nearby protectors (max of 5) +show protected areas of your nearby protectors (max of 5) /protector_show_area -A players own protection blocks can be hidden and shown using the following: +A players own protection blocks can be hidden and shown using the following: /protector_hide /protector_show -Adding members to local protection can be done by using - - /protector_add_member - -Removing members from local protection can be done by using - - /protector_del_member - The following lines can be added to your minetest.conf file to configure specific features of the mod: diff --git a/admin.lua b/admin.lua index cc548c1..c8ae75c 100644 --- a/admin.lua +++ b/admin.lua @@ -1,38 +1,43 @@ -- translation and default name vars -local S = core.get_translator("protector") +local S = minetest.get_translator("protector") local removal_names = "" local replace_names = "" -- remove protection command -core.register_chatcommand("protector_remove", { +minetest.register_chatcommand("protector_remove", { params = S(""), description = S("Remove Protectors around players (separate names with spaces)"), privs = {server = true}, func = function(name, param) + if not param or param == "" then + + minetest.chat_send_player(name, + S("Protector Names to remove: @1", removal_names)) + + return + end + if param == "-" then - core.chat_send_player(name, S("Name List Reset")) + minetest.chat_send_player(name, S("Name List Reset")) - removal_names = "" ; return + removal_names = "" + + return end - if param ~= "" then - removal_names = param - end - - core.chat_send_player(name, - S("Protector Names to remove: @1", removal_names)) + removal_names = param end }) -- replace protection command -core.register_chatcommand("protector_replace", { +minetest.register_chatcommand("protector_replace", { params = S(" "), description = S("Replace Protector Owner with name provided"), privs = {server = true}, @@ -42,43 +47,33 @@ core.register_chatcommand("protector_replace", { -- reset list to empty if param == "-" then - core.chat_send_player(name, S("Name List Reset")) + minetest.chat_send_player(name, S("Name List Reset")) - replace_names = "" ; return - end + replace_names = "" - -- check and set replacement name - if param ~= "" then - - local names = param:split(" ") ; if not names[2] then return end - - if names[2] ~= string.match(names[2], "[%w_-]+") then - core.chat_send_player(name, S("Invalid player name!")) ; return - end - - if names[2]:len() > 25 then - core.chat_send_player(name, S("Player name too long")) ; return - end - - replace_names = param + return end -- show name info - if replace_names ~= "" then + if param == "" and replace_names ~= "" then local names = replace_names:split(" ") - core.chat_send_player(name, S("Replacing Protector name @1 with @2", + minetest.chat_send_player(name, S("Replacing Protector name @1 with @2", names[1] or "", names[2] or "")) + + return end + + replace_names = param end }) -- Abm to remove or replace protectors within active player area -core.register_abm({ +minetest.register_abm({ nodenames = {"protector:protect", "protector:protect2", "protector:protect_hidden"}, - interval = 5, + interval = 6, chance = 1, catch_up = false, @@ -86,7 +81,10 @@ core.register_abm({ if removal_names == "" and replace_names == "" then return end - local meta = core.get_meta(pos) ; if not meta then return end + local meta = minetest.get_meta(pos) + + if not meta then return end + local owner = meta:get_string("owner") if removal_names ~= "" then @@ -94,10 +92,7 @@ core.register_abm({ local names = removal_names:split(" ") for _, n in pairs(names) do - - if n == owner then - core.set_node(pos, {name = "air"}) ; return - end + if n == owner then minetest.set_node(pos, {name = "air"}) end end end @@ -106,7 +101,6 @@ core.register_abm({ local names = replace_names:split(" ") if names[1] and names[2] and owner == names[1] then - meta:set_string("owner", names[2]) meta:set_string("infotext", S("Protection (owned by @1)", names[2])) end @@ -114,22 +108,26 @@ core.register_abm({ end }) +-- get protection radius (max 30) + +local r = tonumber(minetest.settings:get("protector_radius")) or 5 + +if r > 30 then r = 30 end + -- show protection areas of nearby protectors owned by you (thanks agaran) -local r = protector.radius - -core.register_chatcommand("protector_show_area", { +minetest.register_chatcommand("protector_show_area", { params = "", description = S("Show protected areas of your nearby protectors"), privs = {}, func = function(name, param) - local player = core.get_player_by_name(name) + local player = minetest.get_player_by_name(name) local pos = player:get_pos() -- find the protector nodes - local pos = core.find_nodes_in_area( + local pos = minetest.find_nodes_in_area( {x = pos.x - r, y = pos.y - r, z = pos.z - r}, {x = pos.x + r, y = pos.y + r, z = pos.z + r}, {"protector:protect", "protector:protect2", "protector:protect_hidden"}) @@ -139,12 +137,12 @@ core.register_chatcommand("protector_show_area", { -- show a maximum of 5 protected areas only for n = 1, math.min(#pos, 5) do - meta = core.get_meta(pos[n]) + meta = minetest.get_meta(pos[n]) owner = meta:get_string("owner") or "" if owner == name - or core.check_player_privs(name, {protection_bypass = true}) then - core.add_entity(pos[n], "protector:display") + or minetest.check_player_privs(name, {protection_bypass = true}) then + minetest.add_entity(pos[n], "protector:display") end end end @@ -152,7 +150,7 @@ core.register_chatcommand("protector_show_area", { -- ability to hide protection blocks (borrowed from doors mod :) -core.register_node("protector:protect_hidden", { +minetest.register_node("protector:protect_hidden", { description = "Hidden Protector", drawtype = "airlike", paramtype = "light", @@ -168,7 +166,7 @@ core.register_node("protector:protect_hidden", { groups = {not_in_creative_inventory = 1, unbreakable = 1}, is_ground_content = false, on_blast = function() end, - -- 1px block to stop falling nodes replacing protector + -- 1px block inside door hinge near node top collision_box = { type = "fixed", fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32} } @@ -176,22 +174,22 @@ core.register_node("protector:protect_hidden", { -- make own protectors visible in area -core.register_chatcommand("protector_show", { +minetest.register_chatcommand("protector_show", { params = "", description = S("Show your nearby protection blocks"), privs = {interact = true}, func = function(name, param) - local player = core.get_player_by_name(name) + local player = minetest.get_player_by_name(name) if not player then - return false, S("Player not found.") + return false, "Player not found" end local pos = player:get_pos() - local a = core.find_nodes_in_area( + local a = minetest.find_nodes_in_area( {x = pos.x - r, y = pos.y - r, z = pos.z - r}, {x = pos.x + r, y = pos.y + r, z = pos.z + r}, {"protector:protect_hidden"}) @@ -200,12 +198,12 @@ core.register_chatcommand("protector_show", { for _, row in pairs(a) do - meta = core.get_meta(row) + meta = minetest.get_meta(row) owner = meta:get_string("owner") or "" if owner == name - or core.check_player_privs(name, {protection_bypass = true}) then - core.swap_node(row, {name = "protector:protect"}) + or minetest.check_player_privs(name, {protection_bypass = true}) then + minetest.swap_node(row, {name = "protector:protect"}) end end end @@ -213,22 +211,22 @@ core.register_chatcommand("protector_show", { -- make own protectors invisible in area -core.register_chatcommand("protector_hide", { +minetest.register_chatcommand("protector_hide", { params = "", description = S("Hide your nearby protection blocks"), privs = {interact = true}, func = function(name, param) - local player = core.get_player_by_name(name) + local player = minetest.get_player_by_name(name) if not player then - return false, S("Player not found.") + return false, "Player not found" end local pos = player:get_pos() - local a = core.find_nodes_in_area( + local a = minetest.find_nodes_in_area( {x = pos.x - r, y = pos.y - r, z = pos.z - r}, {x = pos.x + r, y = pos.y + r, z = pos.z + r}, {"protector:protect", "protector:protect2"}) @@ -237,12 +235,12 @@ core.register_chatcommand("protector_hide", { for _, row in pairs(a) do - meta = core.get_meta(row) + meta = minetest.get_meta(row) owner = meta:get_string("owner") or "" if owner == name - or core.check_player_privs(name, {protection_bypass = true}) then - core.swap_node(row, {name = "protector:protect_hidden"}) + or minetest.check_player_privs(name, {protection_bypass = true}) then + minetest.swap_node(row, {name = "protector:protect_hidden"}) end end end diff --git a/chest.lua b/chest.lua deleted file mode 100644 index 654993b..0000000 --- a/chest.lua +++ /dev/null @@ -1,260 +0,0 @@ - --- translation - -local S = core.get_translator("protector") -local F = core.formspec_escape - --- MineClone support - -local mcl = core.get_modpath("mcl_core") -local mcf = core.get_modpath("mcl_formspec") - --- Are crafts enabled? - -local protector_crafts = core.settings:get_bool("protector_crafts") ~= false - --- Protected Chest - -local chest_size = mcl and (9 * 3) or (8 * 4) - -core.register_node("protector:chest", { - description = S("Protected Chest"), - tiles = { - "default_chest_top.png", "default_chest_top.png", - "default_chest_side.png", "default_chest_side.png", - "default_chest_side.png", "default_chest_front.png^protector_logo.png" - }, - paramtype2 = "facedir", - groups = {dig_immediate = 2, unbreakable = 1}, - legacy_facedir_simple = true, - is_ground_content = false, - sounds = default.node_sound_wood_defaults(), - - on_construct = function(pos) - - local meta = core.get_meta(pos) - local inv = meta:get_inventory() - - meta:set_string("infotext", S("Protected Chest")) - meta:set_string("name", S("Protected Chest")) - inv:set_size("main", chest_size) - end, - - can_dig = function(pos,player) - - local meta = core.get_meta(pos) - local inv = meta:get_inventory() - - if inv:is_empty("main") then - - if not core.is_protected(pos, player:get_player_name()) then - return true - end - end - end, - - on_metadata_inventory_put = function(pos, listname, index, stack, player) - - core.log("action", player:get_player_name() - .. " moves stuff to protected chest at " .. core.pos_to_string(pos)) - end, - - on_metadata_inventory_take = function(pos, listname, index, stack, player) - - core.log("action", player:get_player_name() - .. " takes stuff from protected chest at " .. core.pos_to_string(pos)) - end, - - on_metadata_inventory_move = function( - pos, from_list, from_index, to_list, to_index, count, player) - - core.log("action", player:get_player_name() - .. " moves stuff inside protected chest at " .. core.pos_to_string(pos)) - end, - - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - - if core.is_protected(pos, player:get_player_name()) then - return 0 - end - - return stack:get_count() - end, - - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - - if core.is_protected(pos, player:get_player_name()) then - return 0 - end - - return stack:get_count() - end, - - allow_metadata_inventory_move = function( - pos, from_list, from_index, to_list, to_index, count, player) - - if core.is_protected(pos, player:get_player_name()) then - return 0 - end - - return count - end, - - on_rightclick = function(pos, node, clicker) - - if core.is_protected(pos, clicker:get_player_name()) then return end - - local meta = core.get_meta(pos) ; if not meta then return end - - local spos = pos.x .. "," .. pos.y .. "," ..pos.z - local formspec - - -- mineclone support - if mcl and mcf then - - formspec = "size[9,8.75]" - .. "label[0,0;" .. core.formspec_escape( - core.colorize("#313131", "Protected Chest")) .. "]" - .. "list[nodemeta:" .. spos .. ";main;0,0.5;9,3;]" - .. mcl_formspec.get_itemslot_bg(0,0.5,9,3) - .. "image_button[3.0,3.5;1.05,0.8;protector_up_icon.png;protect_up;]" - .. "image_button[4.0,3.5;1.05,0.8;protector_down_icon.png;protect_down;]" - .. "label[0,4.0;" .. core.formspec_escape( - core.colorize("#313131", "Inventory")) .. "]" - .. "list[current_player;main;0,4.5;9,3;9]" - .. mcl_formspec.get_itemslot_bg(0,4.5,9,3) - .. "list[current_player;main;0,7.74;9,1;]" - .. mcl_formspec.get_itemslot_bg(0,7.74,9,1) - .. "listring[nodemeta:" .. spos .. ";main]" - .. "listring[current_player;main]" - - else -- default formspec - - formspec = "size[8,9]" - .. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]" - - .. "image_button[-0.01,4.26;1.05,0.8;protector_up_icon.png;protect_up;]" - .. "image_button[0.98,4.26;1.05,0.8;protector_down_icon.png;protect_down;]" - .. "tooltip[protect_up;" .. S("To Chest") .. "]" - .. "tooltip[protect_down;" .. S("To Inventory") .. "]" - - .. "field[2.3,4.8;4,0.25;protect_name;;" - .. meta:get_string("name") .. "]" - .. "button[5.99,4.5;2.05,0.25;protect_rename;" .. S("Rename") .. "]" - - .. "list[current_player;main;0,5;8,1;]" - .. "list[current_player;main;0,6.08;8,3;8]" - .. "listring[nodemeta:" .. spos .. ";main]" - .. "listring[current_player;main]" - end - - core.sound_play("default_chest_open", { - gain = 0.3, pos = pos, max_hear_distance = 10}, true) - - core.show_formspec(clicker:get_player_name(), - "protector:chest_" .. core.pos_to_string(pos), formspec) - end, - - on_blast = function() end -}) - --- Container transfer helper - -local function to_from(src, dst) - - local stack, item, leftover - local size = dst:get_size("main") - - for i = 1, size do - - stack = src:get_stack("main", i) - item = stack:get_name() - - if item ~= "" and dst:room_for_item("main", item) then - - leftover = dst:add_item("main", stack) - - if leftover and not leftover:is_empty() then - src:set_stack("main", i, leftover) - else - src:set_stack("main", i, nil) - end - end - end -end - --- Protected Chest formspec buttons - -core.register_on_player_receive_fields(function(player, formname, fields) - - if string.sub(formname, 0, 16) ~= "protector:chest_" then return end - - local pos_s = string.sub(formname, 17) - local pos = core.string_to_pos(pos_s) - - if core.is_protected(pos, player:get_player_name()) then return end - - local meta = core.get_meta(pos) ; if not meta then return end - local chest_inv = meta:get_inventory() ; if not chest_inv then return end - local player_inv = player:get_inventory() - - -- copy contents of player inventory to chest - if fields.protect_up then - - to_from(player_inv, chest_inv) - - -- copy contents of chest to player inventory - elseif fields.protect_down then - - to_from(chest_inv, player_inv) - - elseif fields.protect_name or fields.protect_rename then - - -- change chest infotext to display name - if fields.protect_name ~= "" then - - if fields.protect_name ~= string.match(fields.protect_name, "[%w%s_-]+") - or fields.protect_name:len() > 35 then - return - end - - meta:set_string("name", fields.protect_name) - meta:set_string("infotext", fields.protect_name) - else - meta:set_string("name", S("Protected Chest")) - meta:set_string("infotext", S("Protected Chest")) - end - - elseif fields.quit then - - core.sound_play("default_chest_close", { - gain = 0.3, pos = pos, max_hear_distance = 10}, true) - end -end) - --- Protected Chest recipes - -if protector_crafts then - - if mcl then - - core.register_craft({ - output = "protector:chest", - recipe = { {"mcl_chests:chest", "mcl_core:gold_ingot"} } - }) - else - core.register_craft({ - output = "protector:chest", - recipe = { - {"group:wood", "group:wood", "group:wood"}, - {"group:wood", "default:copper_ingot", "group:wood"}, - {"group:wood", "group:wood", "group:wood"} - } - }) - - core.register_craft({ - output = "protector:chest", - recipe = { {"default:chest", "default:copper_ingot"} } - }) - end -end diff --git a/doors.lua b/doors.lua deleted file mode 100644 index 5c75178..0000000 --- a/doors.lua +++ /dev/null @@ -1,521 +0,0 @@ - --- doors code from an old client re-used - -local S = core.get_translator("protector") - --- MineClone support - -local mcl = core.get_modpath("mcl_core") - --- Are crafts enabled? - -local protector_crafts = core.settings:get_bool("protector_crafts") ~= false - --- Registers a door - -local function register_door(name, def) - - def.groups.not_in_creative_inventory = 1 - def.groups.handy = 1 - def.groups.prot_door = 1 - - local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5 + 1.5/16}} - - def.node_box_bottom = box - def.node_box_top = box - def.selection_box_bottom = box - def.selection_box_top = box - - core.register_craftitem(name, { - description = def.description, - inventory_image = def.inventory_image, - - on_place = function(itemstack, placer, pointed_thing) - - if pointed_thing.type ~= "node" then return itemstack end - - local ptu = pointed_thing.under - local nu = core.get_node(ptu) - - if core.registered_nodes[nu.name] - and core.registered_nodes[nu.name].on_rightclick then - return core.registered_nodes[nu.name].on_rightclick( - ptu, nu, placer, itemstack) - end - - local pt = pointed_thing.above - local pt2 = {x = pt.x, y = pt.y, z = pt.z} - - pt2.y = pt2.y + 1 - - if not core.registered_nodes[core.get_node(pt).name].buildable_to - or not core.registered_nodes[core.get_node(pt2).name].buildable_to - or not placer or not placer:is_player() then - return itemstack - end - - if core.is_protected(pt, placer:get_player_name()) - or core.is_protected(pt2, placer:get_player_name()) then - core.record_protection_violation(pt, placer:get_player_name()) - return itemstack - end - - local p2 = core.dir_to_facedir(placer:get_look_dir()) - local pt3 = {x = pt.x, y = pt.y, z = pt.z} - - if p2 == 0 then pt3.x = pt3.x - 1 - elseif p2 == 1 then pt3.z = pt3.z + 1 - elseif p2 == 2 then pt3.x = pt3.x + 1 - elseif p2 == 3 then pt3.z = pt3.z - 1 - end - - if core.get_item_group(core.get_node(pt3).name, "prot_door") == 0 then - core.set_node(pt, {name = name .. "_b_1", param2 = p2}) - core.set_node(pt2, {name = name .. "_t_1", param2 = p2}) - else - core.set_node(pt, {name = name .. "_b_2", param2 = p2}) - core.set_node(pt2, {name = name .. "_t_2", param2 = p2}) - - core.get_meta(pt):set_int("right", 1) - core.get_meta(pt2):set_int("right", 1) - end - - if not core.settings:get_bool("creative_mode") then - itemstack:take_item() - end - - core.sound_play(def.sounds.place, {pos = pt2}, true) - - return itemstack - end - }) - - local tt = def.tiles_top - local tb = def.tiles_bottom - - local function after_dig_node(pos, name, digger) - - local node = core.get_node(pos) - - if node.name == name then - core.node_dig(pos, node, digger) - end - end - - local function on_rightclick(pos, dir, check_name, replace, replace_dir, params) - - pos.y = pos.y + dir - - if core.get_node(pos).name ~= check_name then return end - - local p2 = core.get_node(pos).param2 - - p2 = params[p2 + 1] - - core.swap_node(pos, {name = replace_dir, param2 = p2}) - - pos.y = pos.y - dir - - core.swap_node(pos, {name = replace, param2=p2}) - - core.sound_play(def.open_sound, - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) - end - - local function on_rotate(pos, node, dir, user, check_name, mode, new_param2) - - if mode ~= screwdriver.ROTATE_FACE then return false end - - pos.y = pos.y + dir - - if core.get_node(pos).name ~= check_name then return false end - - if core.is_protected(pos, user:get_player_name()) then - core.record_protection_violation(pos, user:get_player_name()) - return false - end - - local node2 = core.get_node(pos) - - node2.param2 = (node2.param2 + 1) % 4 - - core.swap_node(pos, node2) - - pos.y = pos.y - dir - - node.param2 = (node.param2 + 1) % 4 - - core.swap_node(pos, node) - - return true - end - - core.register_node(name .. "_b_1", { - tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1] .. "^[transformfx"}, - paramtype = "light", - paramtype2 = "facedir", - use_texture_alpha = "clip", - is_ground_content = false, - node_dig_prediction = "", - drop = name, - drawtype = "nodebox", - node_box = {type = "fixed", fixed = def.node_box_bottom}, - selection_box = {type = "fixed", fixed = def.selection_box_bottom}, - groups = def.groups, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - pos.y = pos.y + 1 - after_dig_node(pos, name.."_t_1", digger) - end, - - on_rightclick = function(pos, node, clicker) - - if not core.is_protected(pos, clicker:get_player_name()) then - on_rightclick(pos, 1, name .. "_t_1", name .. "_b_2", - name .. "_t_2", {1,2,3,0}) - end - end, - - on_rotate = function(pos, node, user, mode, new_param2) - return on_rotate(pos, node, 1, user, name .. "_t_1", mode) - end, - - sounds = def.sounds, - sunlight_propagates = def.sunlight, - on_blast = function() end - }) - - core.register_node(name .. "_t_1", { - tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1] .. "^[transformfx"}, - paramtype = "light", - paramtype2 = "facedir", - use_texture_alpha = "clip", - is_ground_content = false, - node_dig_prediction = "", - drop = "", - drawtype = "nodebox", - node_box = {type = "fixed", fixed = def.node_box_top}, - selection_box = {type = "fixed", fixed = def.selection_box_top}, - groups = def.groups, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - pos.y = pos.y - 1 - after_dig_node(pos, name .. "_b_1", digger) - end, - - on_rightclick = function(pos, node, clicker) - if not core.is_protected(pos, clicker:get_player_name()) then - on_rightclick(pos, -1, name .. "_b_1", name .. "_t_2", - name .. "_b_2", {1,2,3,0}) - end - end, - - on_rotate = function(pos, node, user, mode, new_param2) - return on_rotate(pos, node, -1, user, name .. "_b_1", mode) - end, - - sounds = def.sounds, - sunlight_propagates = def.sunlight, - on_blast = function() end - }) - - core.register_node(name .. "_b_2", { - tiles = {tb[2], tb[2], tb[2], tb[2], tb[1] .. "^[transformfx", tb[1]}, - paramtype = "light", - paramtype2 = "facedir", - use_texture_alpha = "clip", - is_ground_content = false, - node_dig_prediction = "", - drop = name, - drawtype = "nodebox", - node_box = {type = "fixed", fixed = def.node_box_bottom}, - selection_box = {type = "fixed", fixed = def.selection_box_bottom}, - groups = def.groups, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - pos.y = pos.y + 1 - after_dig_node(pos, name .. "_t_2", digger) - end, - - on_rightclick = function(pos, node, clicker) - if not core.is_protected(pos, clicker:get_player_name()) then - on_rightclick(pos, 1, name .. "_t_2", name .. "_b_1", - name .. "_t_1", {3,0,1,2}) - end - end, - - on_rotate = function(pos, node, user, mode, new_param2) - return on_rotate(pos, node, 1, user, name .. "_t_2", mode) - end, - - sounds = def.sounds, - sunlight_propagates = def.sunlight, - on_blast = function() end - }) - - core.register_node(name .. "_t_2", { - tiles = {tt[2], tt[2], tt[2], tt[2], tt[1] .. "^[transformfx", tt[1]}, - paramtype = "light", - paramtype2 = "facedir", - use_texture_alpha = "clip", - is_ground_content = false, - node_dig_prediction = "", - drop = "", - drawtype = "nodebox", - node_box = {type = "fixed", fixed = def.node_box_top}, - selection_box = {type = "fixed", fixed = def.selection_box_top}, - groups = def.groups, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - pos.y = pos.y - 1 - after_dig_node(pos, name .. "_b_2", digger) - end, - - on_rightclick = function(pos, node, clicker) - if not core.is_protected(pos, clicker:get_player_name()) then - on_rightclick(pos, -1, name .. "_b_2", name .. "_t_1", - name .. "_b_1", {3,0,1,2}) - end - end, - - on_rotate = function(pos, node, user, mode, new_param2) - return on_rotate(pos, node, -1, user, name .. "_b_2", mode) - end, - - sounds = def.sounds, - sunlight_propagates = def.sunlight, - on_blast = function() end - }) -end - --- Protected Wooden Door - -local name = "protector:door_wood" - -register_door(name, { - description = S("Protected Wooden Door"), - inventory_image = "doors_wood.png^protector_logo.png", - groups = { - snappy = 1, choppy = 2, dig_immediate = 2, unbreakable = 1, axey = 1, handy = 1 - }, - tiles_bottom = {"doors_wood_b.png^protector_logo.png", "doors_brown.png"}, - tiles_top = {"doors_wood_a.png", "doors_brown.png"}, - sounds = default.node_sound_wood_defaults(), - open_sound = "default_dug_node", - sunlight = false -}) - -if protector_crafts then - - if mcl then - - core.register_craft({ - output = name, - recipe = { {"mcl_doors:wooden_door", "mcl_core:gold_ingot"} } - }) - else - core.register_craft({ - output = name, - recipe = { - {"group:wood", "group:wood"}, - {"group:wood", "default:copper_ingot"}, - {"group:wood", "group:wood"} - } - }) - - core.register_craft({ - output = name, - recipe = { {"doors:door_wood", "default:copper_ingot"} } - }) - end -end - --- Protected Steel Door - -local name = "protector:door_steel" - -register_door(name, { - description = S("Protected Steel Door"), - inventory_image = "doors_steel.png^protector_logo.png", - groups = { - snappy = 1, cracky = 1, handy = 1, - level = (mcl and 0 or 2), pickaxey = 2, unbreakable = 1 - }, - tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"}, - tiles_top = {"doors_steel_a.png", "doors_grey.png"}, - sounds = default.node_sound_metal_defaults(), - open_sound = "default_place_node_metal", - sunlight = false, -}) - -if protector_crafts then - - if mcl then - - core.register_craft({ - output = name, - recipe = { {"mcl_doors:iron_door", "mcl_core:gold_ingot"} } - }) - else - core.register_craft({ - output = name, - recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:copper_ingot"}, - {"default:steel_ingot", "default:steel_ingot"} - } - }) - - core.register_craft({ - output = name, - recipe = { {"doors:door_steel", "default:copper_ingot"} } - }) - end -end - -----trapdoor---- - -local function register_trapdoor(name, def) - - local name_closed = name - local name_opened = name .. "_open" - - def.on_rightclick = function (pos, node, clicker, itemstack, pointed_thing) - - if core.is_protected(pos, clicker:get_player_name()) then return end - - local newname = node.name == name_closed and name_opened or name_closed - - core.sound_play(def.open_sound, - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) - - core.swap_node(pos, - {name = newname, param1 = node.param1, param2 = node.param2}) - end - - -- Common trapdoor configuration - def.drawtype = "nodebox" - def.paramtype = "light" - def.paramtype2 = "facedir" - def.use_texture_alpha = "clip" - def.is_ground_content = false - def.node_dig_prediction = "" - - local def_opened = table.copy(def) - local def_closed = table.copy(def) - - def_closed.node_box = { - type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} - } - def_closed.selection_box = { - type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} - } - def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side, - def.tile_side, def.tile_side } - - def_opened.node_box = { - type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} - } - def_opened.selection_box = { - type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} - } - def_opened.tiles = { def.tile_side, def.tile_side, - def.tile_side .. "^[transform3", - def.tile_side .. "^[transform1", - def.tile_front, def.tile_front } - - def_opened.drop = name_closed - def_opened.groups.not_in_creative_inventory = 1 - - core.register_node(name_opened, def_opened) - core.register_node(name_closed, def_closed) -end - --- Protected Wooden Trapdoor - -register_trapdoor("protector:trapdoor", { - description = S("Protected Trapdoor"), - inventory_image = "doors_trapdoor.png^protector_logo.png", - wield_image = "doors_trapdoor.png^protector_logo.png", - tile_front = "doors_trapdoor.png^protector_logo.png", - tile_side = "doors_trapdoor_side.png", - groups = {snappy = 1, choppy = 2, dig_immediate = 2, unbreakable = 1, axey = 1}, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1, - sounds = default.node_sound_wood_defaults(), - open_sound = "default_dug_node" -}) - -if protector_crafts then - - if mcl then - - core.register_craft({ - output = "protector:trapdoor", - recipe = { {"mcl_doors:trapdoor", "mcl_core:gold_ingot"} } - }) - else - core.register_craft({ - output = "protector:trapdoor 2", - recipe = { - {"group:wood", "default:copper_ingot", "group:wood"}, - {"group:wood", "group:wood", "group:wood"} - } - }) - - core.register_craft({ - output = "protector:trapdoor", - recipe = { {"doors:trapdoor", "default:copper_ingot"} } - }) - end -end - --- Protected Steel Trapdoor - -register_trapdoor("protector:trapdoor_steel", { - description = S("Protected Steel Trapdoor"), - inventory_image = "doors_trapdoor_steel.png^protector_logo.png", - wield_image = "doors_trapdoor_steel.png^protector_logo.png", - tile_front = "doors_trapdoor_steel.png^protector_logo.png", - tile_side = "doors_trapdoor_steel_side.png", - groups = { - snappy = 1, bendy = 2, cracky = 1, level = (mcl and 0 or 2), - unbreakable = 1, pickaxey = 2, handy = 1 - }, - _mcl_hardness = 1, - _mcl_blast_resistance = 1, - sounds = default.node_sound_metal_defaults(), - open_sound = "default_place_node_metal" -}) - -if protector_crafts then - - if mcl then - - core.register_craft({ - output = "protector:trapdoor_steel", - recipe = { {"mcl_doors:iron_trapdoor", "mcl_core:gold_ingot"} } - }) - else - core.register_craft({ - output = "protector:trapdoor_steel", - recipe = { - {"default:copper_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:steel_ingot"} - } - }) - - core.register_craft({ - output = "protector:trapdoor_steel", - recipe = { {"doors:trapdoor_steel", "default:copper_ingot"} } - }) - end -end diff --git a/doors_chest.lua b/doors_chest.lua new file mode 100644 index 0000000..f3b5e0d --- /dev/null +++ b/doors_chest.lua @@ -0,0 +1,757 @@ + +-- doors code from an old client re-used + +local S = minetest.get_translator("protector") +local F = minetest.formspec_escape + +-- MineClone support + +local mcl = minetest.get_modpath("mcl_core") +local mcf = minetest.get_modpath("mcl_formspec") + +-- Are crafts enabled? + +local protector_crafts = minetest.settings:get_bool("protector_crafts") ~= false + +-- Registers a door + +local function register_door(name, def) + + def.groups.not_in_creative_inventory = 1 + def.groups.handy = 1 + def.groups.prot_door = 1 + + local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5 + 1.5/16}} + + def.node_box_bottom = box + def.node_box_top = box + def.selection_box_bottom = box + def.selection_box_top = box + + minetest.register_craftitem(name, { + description = def.description, + inventory_image = def.inventory_image, + + on_place = function(itemstack, placer, pointed_thing) + + if pointed_thing.type ~= "node" then + return itemstack + end + + local ptu = pointed_thing.under + local nu = minetest.get_node(ptu) + + if minetest.registered_nodes[nu.name] + and minetest.registered_nodes[nu.name].on_rightclick then + return minetest.registered_nodes[nu.name].on_rightclick(ptu, nu, placer, itemstack) + end + + local pt = pointed_thing.above + local pt2 = {x = pt.x, y = pt.y, z = pt.z} + + pt2.y = pt2.y + 1 + + if not minetest.registered_nodes[minetest.get_node(pt).name].buildable_to + or not minetest.registered_nodes[minetest.get_node(pt2).name].buildable_to + or not placer or not placer:is_player() then + return itemstack + end + + if minetest.is_protected(pt, placer:get_player_name()) + or minetest.is_protected(pt2, placer:get_player_name()) then + minetest.record_protection_violation(pt, placer:get_player_name()) + return itemstack + end + + local p2 = minetest.dir_to_facedir(placer:get_look_dir()) + local pt3 = {x = pt.x, y = pt.y, z = pt.z} + + if p2 == 0 then + pt3.x = pt3.x - 1 + elseif p2 == 1 then + pt3.z = pt3.z + 1 + elseif p2 == 2 then + pt3.x = pt3.x + 1 + elseif p2 == 3 then + pt3.z = pt3.z - 1 + end + + if minetest.get_item_group(minetest.get_node(pt3).name, "prot_door") == 0 then + minetest.set_node(pt, {name = name .. "_b_1", param2 = p2}) + minetest.set_node(pt2, {name = name .. "_t_1", param2 = p2}) + else + minetest.set_node(pt, {name = name .. "_b_2", param2 = p2}) + minetest.set_node(pt2, {name = name .. "_t_2", param2 = p2}) + + minetest.get_meta(pt):set_int("right", 1) + minetest.get_meta(pt2):set_int("right", 1) + end + + if not minetest.settings:get_bool("creative_mode") then + itemstack:take_item() + end + + minetest.sound_play(def.sounds.place, {pos = pt2}, true) + + return itemstack + end + }) + + local tt = def.tiles_top + local tb = def.tiles_bottom + + local function after_dig_node(pos, name, digger) + + local node = minetest.get_node(pos) + + if node.name == name then + minetest.node_dig(pos, node, digger) + end + end + + local function on_rightclick(pos, dir, check_name, replace, replace_dir, params) + + pos.y = pos.y + dir + + if minetest.get_node(pos).name ~= check_name then return end + + local p2 = minetest.get_node(pos).param2 + + p2 = params[p2 + 1] + + minetest.swap_node(pos, {name = replace_dir, param2 = p2}) + + pos.y = pos.y - dir + + minetest.swap_node(pos, {name = replace, param2=p2}) + + minetest.sound_play("default_dug_node", + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + end + + local function on_rotate(pos, node, dir, user, check_name, mode, new_param2) + + if mode ~= screwdriver.ROTATE_FACE then return false end + + pos.y = pos.y + dir + + if minetest.get_node(pos).name ~= check_name then return false end + + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, user:get_player_name()) + return false + end + + local node2 = minetest.get_node(pos) + + node2.param2 = (node2.param2 + 1) % 4 + + minetest.swap_node(pos, node2) + + pos.y = pos.y - dir + + node.param2 = (node.param2 + 1) % 4 + + minetest.swap_node(pos, node) + + return true + end + + minetest.register_node(name .. "_b_1", { + tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1] .. "^[transformfx"}, + paramtype = "light", + paramtype2 = "facedir", + use_texture_alpha = "clip", + is_ground_content = false, + node_dig_prediction = "", + drop = name, + drawtype = "nodebox", + node_box = { type = "fixed", fixed = def.node_box_bottom }, + selection_box = { type = "fixed", fixed = def.selection_box_bottom }, + groups = def.groups, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1, + + after_dig_node = function(pos, oldnode, oldmetadata, digger) + pos.y = pos.y + 1 + after_dig_node(pos, name.."_t_1", digger) + end, + + on_rightclick = function(pos, node, clicker) + + if not minetest.is_protected(pos, clicker:get_player_name()) then + on_rightclick(pos, 1, name .. "_t_1", name .. "_b_2", name .. "_t_2", {1,2,3,0}) + end + end, + + on_rotate = function(pos, node, user, mode, new_param2) + return on_rotate(pos, node, 1, user, name .. "_t_1", mode) + end, + + sounds = def.sounds, + sunlight_propagates = def.sunlight, + on_blast = function() end + }) + + minetest.register_node(name .. "_t_1", { + tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1] .. "^[transformfx"}, + paramtype = "light", + paramtype2 = "facedir", + use_texture_alpha = "clip", + is_ground_content = false, + node_dig_prediction = "", + drop = "", + drawtype = "nodebox", + node_box = { type = "fixed", fixed = def.node_box_top }, + selection_box = { type = "fixed", fixed = def.selection_box_top }, + groups = def.groups, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1, + + after_dig_node = function(pos, oldnode, oldmetadata, digger) + pos.y = pos.y - 1 + after_dig_node(pos, name .. "_b_1", digger) + end, + + on_rightclick = function(pos, node, clicker) + if not minetest.is_protected(pos, clicker:get_player_name()) then + on_rightclick(pos, -1, name .. "_b_1", name .. "_t_2", name .. "_b_2", {1,2,3,0}) + end + end, + + on_rotate = function(pos, node, user, mode, new_param2) + return on_rotate(pos, node, -1, user, name .. "_b_1", mode) + end, + + sounds = def.sounds, + sunlight_propagates = def.sunlight, + on_blast = function() end + }) + + minetest.register_node(name .. "_b_2", { + tiles = {tb[2], tb[2], tb[2], tb[2], tb[1] .. "^[transformfx", tb[1]}, + paramtype = "light", + paramtype2 = "facedir", + use_texture_alpha = "clip", + is_ground_content = false, + node_dig_prediction = "", + drop = name, + drawtype = "nodebox", + node_box = { type = "fixed", fixed = def.node_box_bottom }, + selection_box = { type = "fixed", fixed = def.selection_box_bottom }, + groups = def.groups, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1, + + after_dig_node = function(pos, oldnode, oldmetadata, digger) + pos.y = pos.y + 1 + after_dig_node(pos, name .. "_t_2", digger) + end, + + on_rightclick = function(pos, node, clicker) + if not minetest.is_protected(pos, clicker:get_player_name()) then + on_rightclick(pos, 1, name .. "_t_2", name .. "_b_1", name .. "_t_1", {3,0,1,2}) + end + end, + + on_rotate = function(pos, node, user, mode, new_param2) + return on_rotate(pos, node, 1, user, name .. "_t_2", mode) + end, + + sounds = def.sounds, + sunlight_propagates = def.sunlight, + on_blast = function() end + }) + + minetest.register_node(name .. "_t_2", { + tiles = {tt[2], tt[2], tt[2], tt[2], tt[1] .. "^[transformfx", tt[1]}, + paramtype = "light", + paramtype2 = "facedir", + use_texture_alpha = "clip", + is_ground_content = false, + node_dig_prediction = "", + drop = "", + drawtype = "nodebox", + node_box = { type = "fixed", fixed = def.node_box_top }, + selection_box = { type = "fixed", fixed = def.selection_box_top }, + groups = def.groups, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1, + + after_dig_node = function(pos, oldnode, oldmetadata, digger) + pos.y = pos.y - 1 + after_dig_node(pos, name .. "_b_2", digger) + end, + + on_rightclick = function(pos, node, clicker) + if not minetest.is_protected(pos, clicker:get_player_name()) then + on_rightclick(pos, -1, name .. "_b_2", name .. "_t_1", name .. "_b_1", {3,0,1,2}) + end + end, + + on_rotate = function(pos, node, user, mode, new_param2) + return on_rotate(pos, node, -1, user, name .. "_b_2", mode) + end, + + sounds = def.sounds, + sunlight_propagates = def.sunlight, + on_blast = function() end + }) +end + +-- Protected Wooden Door + +local name = "protector:door_wood" + +register_door(name, { + description = S("Protected Wooden Door"), + inventory_image = "doors_wood.png^protector_logo.png", + groups = {snappy = 1, choppy = 2, dig_immediate = 2, unbreakable = 1, axey = 1}, + tiles_bottom = {"doors_wood_b.png^protector_logo.png", "doors_brown.png"}, + tiles_top = {"doors_wood_a.png", "doors_brown.png"}, + sounds = default.node_sound_wood_defaults(), + sunlight = false +}) + +if protector_crafts then + + if mcl then + + minetest.register_craft({ + output = name, + recipe = { {"mcl_doors:wooden_door", "mcl_core:gold_ingot"} } + }) + else + minetest.register_craft({ + output = name, + recipe = { + {"group:wood", "group:wood"}, + {"group:wood", "default:copper_ingot"}, + {"group:wood", "group:wood"} + } + }) + + minetest.register_craft({ + output = name, + recipe = { {"doors:door_wood", "default:copper_ingot"} } + }) + end +end + +-- Protected Steel Door + +local name = "protector:door_steel" + +register_door(name, { + description = S("Protected Steel Door"), + inventory_image = "doors_steel.png^protector_logo.png", + groups = { + snappy = 1, bendy = 2, cracky = 1, + level = (mcl and 0 or 2), pickaxey = 2, unbreakable = 1 + }, + tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"}, + tiles_top = {"doors_steel_a.png", "doors_grey.png"}, + sounds = default.node_sound_metal_defaults(), + sunlight = false, +}) + +if protector_crafts then + + if mcl then + + minetest.register_craft({ + output = name, + recipe = { {"mcl_doors:iron_door", "mcl_core:gold_ingot"} } + }) + else + minetest.register_craft({ + output = name, + recipe = { + {"default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "default:copper_ingot"}, + {"default:steel_ingot", "default:steel_ingot"} + } + }) + + minetest.register_craft({ + output = name, + recipe = { {"doors:door_steel", "default:copper_ingot"} } + }) + end +end + +----trapdoor---- + +local function register_trapdoor(name, def) + + local name_closed = name + local name_opened = name .. "_open" + + def.on_rightclick = function (pos, node, clicker, itemstack, pointed_thing) + + if minetest.is_protected(pos, clicker:get_player_name()) then return end + + local newname = node.name == name_closed and name_opened or name_closed + + minetest.sound_play("default_dug_node", + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + + minetest.swap_node(pos, + {name = newname, param1 = node.param1, param2 = node.param2}) + end + + -- Common trapdoor configuration + def.drawtype = "nodebox" + def.paramtype = "light" + def.paramtype2 = "facedir" + def.use_texture_alpha = "clip" + def.is_ground_content = false + def.node_dig_prediction = "" + + local def_opened = table.copy(def) + local def_closed = table.copy(def) + + def_closed.node_box = { + type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} + } + def_closed.selection_box = { + type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} + } + def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side, + def.tile_side, def.tile_side } + + def_opened.node_box = { + type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} + } + def_opened.selection_box = { + type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} + } + def_opened.tiles = { def.tile_side, def.tile_side, + def.tile_side .. "^[transform3", + def.tile_side .. "^[transform1", + def.tile_front, def.tile_front } + + def_opened.drop = name_closed + def_opened.groups.not_in_creative_inventory = 1 + + minetest.register_node(name_opened, def_opened) + minetest.register_node(name_closed, def_closed) +end + +-- Protected Wooden Trapdoor + +register_trapdoor("protector:trapdoor", { + description = S("Protected Trapdoor"), + inventory_image = "doors_trapdoor.png^protector_logo.png", + wield_image = "doors_trapdoor.png^protector_logo.png", + tile_front = "doors_trapdoor.png^protector_logo.png", + tile_side = "doors_trapdoor_side.png", + groups = {snappy = 1, choppy = 2, dig_immediate = 2, unbreakable = 1, axey = 1}, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1, + sounds = default.node_sound_wood_defaults(), +}) + +if protector_crafts then + + if mcl then + + minetest.register_craft({ + output = "protector:trapdoor", + recipe = { {"mcl_doors:trapdoor", "mcl_core:gold_ingot"} } + }) + else + minetest.register_craft({ + output = "protector:trapdoor 2", + recipe = { + {"group:wood", "default:copper_ingot", "group:wood"}, + {"group:wood", "group:wood", "group:wood"} + } + }) + + minetest.register_craft({ + output = "protector:trapdoor", + recipe = { {"doors:trapdoor", "default:copper_ingot"} } + }) + end +end + +-- Protected Steel Trapdoor + +register_trapdoor("protector:trapdoor_steel", { + description = S("Protected Steel Trapdoor"), + inventory_image = "doors_trapdoor_steel.png^protector_logo.png", + wield_image = "doors_trapdoor_steel.png^protector_logo.png", + tile_front = "doors_trapdoor_steel.png^protector_logo.png", + tile_side = "doors_trapdoor_steel_side.png", + groups = { + snappy = 1, bendy = 2, cracky = 1, melty = 2, level = (mcl and 0 or 2), + unbreakable = 1, pickaxey = 2 + }, + _mcl_hardness = 1, + _mcl_blast_resistance = 1, + sounds = default.node_sound_metal_defaults() +}) + +if protector_crafts then + + if mcl then + + minetest.register_craft({ + output = "protector:trapdoor_steel", + recipe = { {"mcl_doors:iron_trapdoor", "mcl_core:gold_ingot"} } + }) + else + minetest.register_craft({ + output = "protector:trapdoor_steel", + recipe = { + {"default:copper_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "default:steel_ingot"} + } + }) + + minetest.register_craft({ + output = "protector:trapdoor_steel", + recipe = { {"doors:trapdoor_steel", "default:copper_ingot"} } + }) + end +end + +-- Protected Chest + +local chest_size = mcl and (9 * 3) or (8 * 4) + +minetest.register_node("protector:chest", { + description = S("Protected Chest"), + tiles = { + "default_chest_top.png", "default_chest_top.png", + "default_chest_side.png", "default_chest_side.png", + "default_chest_side.png", "default_chest_front.png^protector_logo.png" + }, + paramtype2 = "facedir", + groups = {dig_immediate = 2, unbreakable = 1}, + legacy_facedir_simple = true, + is_ground_content = false, + sounds = default.node_sound_wood_defaults(), + + on_construct = function(pos) + + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + meta:set_string("infotext", S("Protected Chest")) + meta:set_string("name", S("Protected Chest")) + inv:set_size("main", chest_size) + end, + + can_dig = function(pos,player) + + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + if inv:is_empty("main") then + + if not minetest.is_protected(pos, player:get_player_name()) then + return true + end + end + end, + + on_metadata_inventory_put = function(pos, listname, index, stack, player) + + minetest.log("action", player:get_player_name() + .. " moves stuff to protected chest at " .. minetest.pos_to_string(pos)) + end, + + on_metadata_inventory_take = function(pos, listname, index, stack, player) + + minetest.log("action", player:get_player_name() + .. " takes stuff from protected chest at " .. minetest.pos_to_string(pos)) + end, + + on_metadata_inventory_move = function( + pos, from_list, from_index, to_list, to_index, count, player) + + minetest.log("action", player:get_player_name() + .. " moves stuff inside protected chest at " .. minetest.pos_to_string(pos)) + end, + + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + + return stack:get_count() + end, + + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + + return stack:get_count() + end, + + allow_metadata_inventory_move = function( + pos, from_list, from_index, to_list, to_index, count, player) + + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + + return count + end, + + on_rightclick = function(pos, node, clicker) + + if minetest.is_protected(pos, clicker:get_player_name()) then return end + + local meta = minetest.get_meta(pos) ; if not meta then return end + + local spos = pos.x .. "," .. pos.y .. "," ..pos.z + local formspec + + -- mineclone support + if mcl and mcf then + + formspec = "size[9,8.75]" + .. "label[0,0;" .. minetest.formspec_escape( + minetest.colorize("#313131", "Protected Chest")) .. "]" + .. "list[nodemeta:" .. spos .. ";main;0,0.5;9,3;]" + .. mcl_formspec.get_itemslot_bg(0,0.5,9,3) + .. "image_button[3.0,3.5;1.05,0.8;protector_up_icon.png;protect_up;]" + .. "image_button[4.0,3.5;1.05,0.8;protector_down_icon.png;protect_down;]" + .. "label[0,4.0;" .. minetest.formspec_escape( + minetest.colorize("#313131", "Inventory")) .. "]" + .. "list[current_player;main;0,4.5;9,3;9]" + .. mcl_formspec.get_itemslot_bg(0,4.5,9,3) + .. "list[current_player;main;0,7.74;9,1;]" + .. mcl_formspec.get_itemslot_bg(0,7.74,9,1) + .. "listring[nodemeta:" .. spos .. ";main]" + .. "listring[current_player;main]" + + else -- default formspec + + formspec = "size[8,9]" + .. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]" + + .. "image_button[-0.01,4.26;1.05,0.8;protector_up_icon.png;protect_up;]" + .. "image_button[0.98,4.26;1.05,0.8;protector_down_icon.png;protect_down;]" + .. "tooltip[protect_up;" .. S("To Chest") .. "]" + .. "tooltip[protect_down;" .. S("To Inventory") .. "]" + + .. "field[2.3,4.8;4,0.25;protect_name;;" + .. meta:get_string("name") .. "]" + .. "button[5.99,4.5;2.05,0.25;protect_rename;" .. S("Rename") .. "]" + + .. "list[current_player;main;0,5;8,1;]" + .. "list[current_player;main;0,6.08;8,3;8]" + .. "listring[nodemeta:" .. spos .. ";main]" + .. "listring[current_player;main]" + end + + minetest.show_formspec(clicker:get_player_name(), + "protector:chest_" .. minetest.pos_to_string(pos), formspec) + end, + + on_blast = function() end +}) + +-- Container transfer helper + +local function to_from(src, dst) + + local stack, item, leftover + local size = dst:get_size("main") + + for i = 1, size do + + stack = src:get_stack("main", i) + item = stack:get_name() + + if item ~= "" and dst:room_for_item("main", item) then + + leftover = dst:add_item("main", stack) + + if leftover and not leftover:is_empty() then + src:set_stack("main", i, leftover) + else + src:set_stack("main", i, nil) + end + end + end +end + +-- Protected Chest formspec buttons + +minetest.register_on_player_receive_fields(function(player, formname, fields) + + if string.sub(formname, 0, 16) ~= "protector:chest_" then return end + + local pos_s = string.sub(formname, 17) + local pos = minetest.string_to_pos(pos_s) + + if minetest.is_protected(pos, player:get_player_name()) then return end + + local meta = minetest.get_meta(pos) ; if not meta then return end + local chest_inv = meta:get_inventory() ; if not chest_inv then return end + local player_inv = player:get_inventory() + + -- copy contents of player inventory to chest + if fields.protect_up then + + to_from(player_inv, chest_inv) + + -- copy contents of chest to player inventory + elseif fields.protect_down then + + to_from(chest_inv, player_inv) + + elseif fields.protect_name or fields.protect_rename then + + -- change chest infotext to display name + if fields.protect_name ~= "" then + + if fields.protect_name ~= string.match(fields.protect_name, "[%w%s_-]+") + or fields.protect_name:len() > 35 then + return + end + + meta:set_string("name", fields.protect_name) + meta:set_string("infotext", fields.protect_name) + else + meta:set_string("name", S("Protected Chest")) + meta:set_string("infotext", S("Protected Chest")) + end + + end +end) + +-- Protected Chest recipes + +if protector_crafts then + + if mcl then + + minetest.register_craft({ + output = "protector:chest", + recipe = { {"mcl_chests:chest", "mcl_core:gold_ingot"} } + }) + else + minetest.register_craft({ + output = "protector:chest", + recipe = { + {"group:wood", "group:wood", "group:wood"}, + {"group:wood", "default:copper_ingot", "group:wood"}, + {"group:wood", "group:wood", "group:wood"} + } + }) + + minetest.register_craft({ + output = "protector:chest", + recipe = { {"default:chest", "default:copper_ingot"} } + }) + end +end diff --git a/hud.lua b/hud.lua index 1c8da00..9aaae5d 100644 --- a/hud.lua +++ b/hud.lua @@ -1,33 +1,36 @@ -- translation and protector radius -local S = core.get_translator("protector") -local radius = protector.radius +local S = minetest.get_translator("protector") +local radius = (tonumber(minetest.settings:get("protector_radius")) or 5) + +-- radius limiter (minetest cannot handle node volume of more than 4096000) + +if radius > 30 then radius = 30 end -- hud settings local hud = {} local hud_timer = 0 -local hud_interval = (tonumber(core.settings:get("protector_hud_interval")) or 4) -local hud_style = core.has_feature("hud_def_type_field") +local hud_interval = (tonumber(minetest.settings:get("protector_hud_interval")) or 5) +local hud_style = minetest.has_feature("hud_def_type_field") if hud_interval > 0 then -core.register_globalstep(function(dtime) +minetest.register_globalstep(function(dtime) + -- every 5 seconds hud_timer = hud_timer + dtime - if hud_timer < hud_interval then return end - hud_timer = 0 - for _, player in pairs(core.get_connected_players()) do + for _, player in pairs(minetest.get_connected_players()) do local name = player:get_player_name() local pos = vector.round(player:get_pos()) local hud_text = "" - local protectors = core.find_nodes_in_area( + local protectors = minetest.find_nodes_in_area( {x = pos.x - radius , y = pos.y - radius , z = pos.z - radius}, {x = pos.x + radius , y = pos.y + radius , z = pos.z + radius}, {"protector:protect","protector:protect2", "protector:protect_hidden"}) @@ -35,15 +38,10 @@ core.register_globalstep(function(dtime) if #protectors > 0 then local npos = protectors[1] - local meta = core.get_meta(npos) + local meta = minetest.get_meta(npos) local nodeowner = meta:get_string("owner") - local members = meta:get_string("members"):split(" ") hud_text = S("Owner: @1", nodeowner) - - if #members > 0 then - hud_text = hud_text .. " [" .. #members .. "]" - end end if not hud[name] then @@ -75,7 +73,7 @@ core.register_globalstep(function(dtime) end end) -core.register_on_leaveplayer(function(player) +minetest.register_on_leaveplayer(function(player) hud[player:get_player_name()] = nil end) diff --git a/init.lua b/init.lua index b769771..5f63c9e 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ -- default support (for use with MineClone2 and other [games] -if not core.global_exists("default") then +if not minetest.global_exists("default") then default = { node_sound_stone_defaults = function(table) return {} end, @@ -11,7 +11,7 @@ if not core.global_exists("default") then } end -if core.get_modpath("mcl_sounds") then +if minetest.get_modpath("mcl_sounds") then default.node_sound_stone_defaults = mcl_sounds.node_sound_stone_defaults default.node_sound_wood_defaults = mcl_sounds.node_sound_wood_defaults default.node_sound_metal_defaults = mcl_sounds.node_sound_metal_defaults @@ -19,45 +19,34 @@ end -- modpath, formspec helper and translator -local MP = core.get_modpath(core.get_current_modname()) -local F = core.formspec_escape -local S = core.get_translator("protector") +local MP = minetest.get_modpath(minetest.get_current_modname()) +local F = minetest.formspec_escape +local S = minetest.get_translator("protector") -- global table -protector = { - mod = "redo", - max_shares = 12, - radius = tonumber(core.settings:get("protector_radius")) or 5 -} - --- radius limiter (minetest cannot handle node volume of more than 4096000) - -if protector.radius > 30 then protector.radius = 30 end - --- playerfactions check - -local factions_available = core.global_exists("factions") - -if factions_available then protector.max_shares = 8 end - --- localize math - -local math_floor, math_pi = math.floor, math.pi +protector = { mod = "redo", modpath = MP } -- settings -local protector_flip = core.settings:get_bool("protector_flip") or false -local protector_hurt = tonumber(core.settings:get("protector_hurt")) or 0 -local protector_spawn = tonumber(core.settings:get("protector_spawn") - or core.settings:get("protector_pvp_spawn")) or 0 -local protector_show = tonumber(core.settings:get("protector_show_interval")) or 5 -local protector_recipe = core.settings:get_bool("protector_recipe") ~= false -local protector_msg = core.settings:get_bool("protector_msg") ~= false +local factions_available = minetest.global_exists("factions") +local protector_max_share_count = 12 +local protector_radius = tonumber(minetest.settings:get("protector_radius")) or 5 +local protector_flip = minetest.settings:get_bool("protector_flip") or false +local protector_hurt = tonumber(minetest.settings:get("protector_hurt")) or 0 +local protector_spawn = tonumber(minetest.settings:get("protector_spawn") + or minetest.settings:get("protector_pvp_spawn")) or 0 +local protector_show = tonumber(minetest.settings:get("protector_show_interval")) or 5 +local protector_recipe = minetest.settings:get_bool("protector_recipe") ~= false +local protector_msg = minetest.settings:get_bool("protector_msg") ~= false + +-- radius limiter (minetest cannot handle node volume of more than 4096000) + +if protector_radius > 30 then protector_radius = 30 end -- get static spawn position -local statspawn = core.string_to_pos(core.settings:get("static_spawnpoint")) +local statspawn = minetest.string_to_pos(minetest.settings:get("static_spawnpoint")) or {x = 0, y = 2, z = 0} -- return list of members as a table @@ -121,7 +110,7 @@ local function add_member(meta, name) local list = get_member_list(meta) - if #list >= protector.max_shares then return end + if #list >= protector_max_share_count then return end table.insert(list, name) @@ -146,7 +135,8 @@ local function del_member(meta, name) for i, n in pairs(list) do if n == name then - table.remove(list, i) ; break + table.remove(list, i) + break end end @@ -178,16 +168,19 @@ local function protector_formspec(meta) .. "field_close_on_enter[protector_add_member;false]" local members = get_member_list(meta) + local npp = protector_max_share_count -- max users added to protector list if factions_available then formspec = formspec .. "label[0,4.25;" .. F(S("Factions:")) .. "]" .. "field_close_on_enter[protector_add_faction;false]" + + if npp > 8 then npp = 8 end end local i = 0 for n = 1, #members do - if i < protector.max_shares then + if i < npp then -- show username formspec = formspec .. "button[" .. (i % 4 * 2) @@ -203,7 +196,7 @@ local function protector_formspec(meta) i = i + 1 end - if i < protector.max_shares then + if i < npp then -- user name entry field formspec = formspec .. "field[" .. (i % 4 * 2 + 1 / 3) .. "," @@ -258,14 +251,15 @@ end -- show protection message if enabled -local function show_msg(player_name, msg) +local function show_msg(player, msg) -- if messages disabled or no player name provided - if protector_msg == false or not player_name or player_name == "" then return end + if protector_msg == false or not player or player == "" then return end - core.chat_send_player(player_name, msg) + minetest.chat_send_player(player, msg) end + -- Infolevel: -- 0 for no info -- 1 for "This area is owned by !" if you can't dig @@ -278,7 +272,7 @@ function protector.can_dig(r, pos, digger, onlyowner, infolevel) -- protector_bypass privileged users can override protection if infolevel == 1 - and core.check_player_privs(digger, {protection_bypass = true}) then + and minetest.check_player_privs(digger, {protection_bypass = true}) then return true end @@ -289,13 +283,13 @@ function protector.can_dig(r, pos, digger, onlyowner, infolevel) if inside_spawn(pos, protector_spawn) then show_msg(digger, S("Spawn @1 has been protected up to a @2 block radius.", - core.pos_to_string(statspawn), protector_spawn)) + minetest.pos_to_string(statspawn), protector_spawn)) return false end -- find the protector nodes - local pos = core.find_nodes_in_area( + local pos = minetest.find_nodes_in_area( {x = pos.x - r, y = pos.y - r, z = pos.z - r}, {x = pos.x + r, y = pos.y + r, z = pos.z + r}, {"protector:protect", "protector:protect2", "protector:protect_hidden"}) @@ -304,7 +298,7 @@ function protector.can_dig(r, pos, digger, onlyowner, infolevel) for n = 1, #pos do - meta = core.get_meta(pos[n]) + meta = minetest.get_meta(pos[n]) owner = meta:get_string("owner") or "" members = meta:get_string("members") or "" @@ -323,14 +317,14 @@ function protector.can_dig(r, pos, digger, onlyowner, infolevel) -- when using protector as tool, show protector information if infolevel == 2 then - core.chat_send_player(digger, + minetest.chat_send_player(digger, S("This area is owned by @1", owner) .. ".") - core.chat_send_player(digger, - S("Protection located at: @1", core.pos_to_string(pos[n]))) + minetest.chat_send_player(digger, + S("Protection located at: @1", minetest.pos_to_string(pos[n]))) if members ~= "" then - core.chat_send_player(digger, S("Members: @1.", members)) + minetest.chat_send_player(digger, S("Members: @1.", members)) end return false @@ -342,10 +336,10 @@ function protector.can_dig(r, pos, digger, onlyowner, infolevel) if infolevel == 2 then if #pos < 1 then - core.chat_send_player(digger, S("This area is not protected.")) + minetest.chat_send_player(digger, S("This area is not protected.")) end - core.chat_send_player(digger, S("You can build here.")) + minetest.chat_send_player(digger, S("You can build here.")) end return true @@ -353,9 +347,9 @@ end -- add protector hurt and flip to protection violation function -core.register_on_protection_violation(function(pos, name) +minetest.register_on_protection_violation(function(pos, name) - local player = core.get_player_by_name(name) + local player = minetest.get_player_by_name(name) if player and player:is_player() then @@ -363,7 +357,7 @@ core.register_on_protection_violation(function(pos, name) if protector_hurt > 0 and player:get_hp() > 0 then -- This delay fixes item duplication bug (thanks luk3yx) - core.after(0.1, function(player) + minetest.after(0.1, function(player) player:set_hp(player:get_hp() - protector_hurt) end, player) end @@ -372,10 +366,10 @@ core.register_on_protection_violation(function(pos, name) if protector_flip then -- yaw + 180° - local yaw = player:get_look_horizontal() + math_pi + local yaw = player:get_look_horizontal() + math.pi - if yaw > 2 * math_pi then - yaw = yaw - 2 * math_pi + if yaw > 2 * math.pi then + yaw = yaw - 2 * math.pi end player:set_look_horizontal(yaw) @@ -395,16 +389,16 @@ end) -- backup old is_protected function -local old_is_protected = core.is_protected +local old_is_protected = minetest.is_protected -- check for protected area, return true if protected and digger isn't on list -function core.is_protected(pos, digger) +function minetest.is_protected(pos, digger) digger = digger or "" -- nil check -- is area protected against digger? - if not protector.can_dig(protector.radius, pos, digger, false, 1) then + if not protector.can_dig(protector_radius, pos, digger, false, 1) then return true end @@ -422,32 +416,32 @@ local function check_overlap(itemstack, placer, pointed_thing) local name = placer:get_player_name() -- make sure protector doesn't overlap onto protected spawn area - if inside_spawn(pos, protector_spawn + protector.radius) then + if inside_spawn(pos, protector_spawn + protector_radius) then - core.chat_send_player(name, + minetest.chat_send_player(name, S("Spawn @1 has been protected up to a @2 block radius.", - core.pos_to_string(statspawn), protector_spawn)) + minetest.pos_to_string(statspawn), protector_spawn)) return itemstack end -- make sure protector doesn't overlap any other player's area - if not protector.can_dig(protector.radius * 2, pos, name, true, 3) then + if not protector.can_dig(protector_radius * 2, pos, name, true, 3) then - core.chat_send_player(name, + minetest.chat_send_player(name, S("Overlaps into above players protected area")) return itemstack end - return core.item_place(itemstack, placer, pointed_thing) + return minetest.item_place(itemstack, placer, pointed_thing) end -- remove protector display entities local function del_display(pos) - local objects = core.get_objects_inside_radius(pos, 0.5) + local objects = minetest.get_objects_inside_radius(pos, 0.5) for _, v in ipairs(objects) do @@ -465,34 +459,35 @@ local player_pos = {} local stone_tex = "default_stone.png" -if core.get_modpath("nc_terrain") then +if minetest.get_modpath("nc_terrain") then stone_tex = "nc_terrain_stone.png" end --- protector default - -local def = { +-- protection node +minetest.register_node("protector:protect", { description = S("Protection Block") .. " (" .. S("USE for area check") .. ")", + drawtype = "nodebox", tiles = { stone_tex .. "^protector_overlay.png", stone_tex .. "^protector_overlay.png", stone_tex .. "^protector_overlay.png^protector_logo.png" }, - drawtype = "nodebox", - node_box = {type = "fixed", fixed = {{-0.499 ,-0.499, -0.499, 0.499, 0.499, 0.499}}}, sounds = default.node_sound_stone_defaults(), groups = {dig_immediate = 2, unbreakable = 1}, is_ground_content = false, paramtype = "light", light_source = 4, - walkable = true, + + node_box = { + type = "fixed", fixed = {{-0.499 ,-0.499, -0.499, 0.499, 0.499, 0.499}} + }, on_place = check_overlap, after_place_node = function(pos, placer) - local meta = core.get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") meta:set_string("members", "") @@ -504,28 +499,28 @@ local def = { if pointed_thing.type ~= "node" then return end - protector.can_dig(protector.radius, pointed_thing.under, + protector.can_dig(protector_radius, pointed_thing.under, user:get_player_name(), false, 2) end, on_rightclick = function(pos, node, clicker, itemstack) - local meta = core.get_meta(pos) + local meta = minetest.get_meta(pos) local name = clicker:get_player_name() if meta and protector.can_dig(1, pos, name, true, 1) then player_pos[name] = pos - core.show_formspec(name, "protector:node", protector_formspec(meta)) + minetest.show_formspec(name, "protector:node", protector_formspec(meta)) end end, on_punch = function(pos, node, puncher) - if core.is_protected(pos, puncher:get_player_name()) then return end + if minetest.is_protected(pos, puncher:get_player_name()) then return end - core.add_entity(pos, "protector:display") + minetest.add_entity(pos, "protector:display") end, can_dig = function(pos, player) @@ -536,11 +531,7 @@ local def = { on_blast = function() end, after_destruct = del_display -} - --- protection node - -core.register_node("protector:protect", table.copy(def)) +}) -- default recipe and alternative for MineClone2 @@ -549,12 +540,12 @@ if protector_recipe then local item_gold = "default:gold_ingot" local item_stone = "default:stone" - if core.get_modpath("mcl_core") then + if minetest.get_modpath("mcl_core") then item_gold = "mcl_core:gold_ingot" item_stone = "mcl_core:stone" end - core.register_craft({ + minetest.register_craft({ output = "protector:protect", recipe = { {item_stone, item_stone, item_stone}, @@ -566,37 +557,95 @@ end -- protection logo -def.description = S("Protection Logo") .. " (" .. S("USE for area check") .. ")" -def.tiles = {"protector_logo.png"} -def.wield_image = "protector_logo.png" -def.inventory_image = "protector_logo.png" -def.use_texture_alpha = "clip" -def.paramtype2 = "wallmounted" -def.legacy_wallmounted = true -def.sunlight_propagates = true -def.node_box = { - type = "wallmounted", - wall_top = {-0.375, 0.4375, -0.5, 0.375, 0.5, 0.5}, - wall_bottom = {-0.375, -0.5, -0.5, 0.375, -0.4375, 0.5}, - wall_side = {-0.5, -0.5, -0.375, -0.4375, 0.5, 0.375} -} -def.selection_box = {type = "wallmounted"} +minetest.register_node("protector:protect2", { + description = S("Protection Logo") .. " (" .. S("USE for area check") .. ")", + tiles = {"protector_logo.png"}, + wield_image = "protector_logo.png", + inventory_image = "protector_logo.png", + sounds = default.node_sound_stone_defaults(), + groups = {dig_immediate = 2, unbreakable = 1}, + is_ground_content = false, + use_texture_alpha = "clip", + paramtype = "light", + paramtype2 = "wallmounted", + legacy_wallmounted = true, + light_source = 4, + drawtype = "nodebox", + sunlight_propagates = true, + walkable = true, + node_box = { + type = "wallmounted", + wall_top = {-0.375, 0.4375, -0.5, 0.375, 0.5, 0.5}, + wall_bottom = {-0.375, -0.5, -0.5, 0.375, -0.4375, 0.5}, + wall_side = {-0.5, -0.5, -0.375, -0.4375, 0.5, 0.375} + }, + selection_box = {type = "wallmounted"}, -core.register_node("protector:protect2", table.copy(def)) + on_place = check_overlap, + + after_place_node = function(pos, placer) + + local meta = minetest.get_meta(pos) + + meta:set_string("owner", placer:get_player_name() or "") + meta:set_string("members", "") + meta:set_string("infotext", + S("Protection (owned by @1)", meta:get_string("owner"))) + end, + + on_use = function(itemstack, user, pointed_thing) + + if pointed_thing.type ~= "node" then return end + + protector.can_dig(protector_radius, pointed_thing.under, + user:get_player_name(), false, 2) + end, + + on_rightclick = function(pos, node, clicker, itemstack) + + local meta = minetest.get_meta(pos) + local name = clicker:get_player_name() + + if meta and protector.can_dig(1, pos, name, true, 1) then + + player_pos[name] = pos + + minetest.show_formspec(name, "protector:node", protector_formspec(meta)) + end + end, + + on_punch = function(pos, node, puncher) + + if minetest.is_protected(pos, puncher:get_player_name()) then return end + + minetest.add_entity(pos, "protector:display") + end, + + can_dig = function(pos, player) + + return player and protector.can_dig(1, pos, player:get_player_name(), true, 1) + end, + + on_blast = function() end, + + after_destruct = del_display +}) -- recipes to switch between protectors -core.register_craft({ - output = "protector:protect", recipe = {{"protector:protect2"}} +minetest.register_craft({ + output = "protector:protect", + recipe = {{"protector:protect2"}} }) -core.register_craft({ - output = "protector:protect2", recipe = {{"protector:protect"}} +minetest.register_craft({ + output = "protector:protect2", + recipe = {{"protector:protect"}} }) -- check formspec buttons or when name entered -core.register_on_player_receive_fields(function(player, formname, fields) +minetest.register_on_player_receive_fields(function(player, formname, fields) if formname ~= "protector:node" then return end @@ -620,14 +669,14 @@ core.register_on_player_receive_fields(function(player, formname, fields) end -- are we adding member to a protection node ? (csm protection) - local nod = core.get_node(pos).name + local nod = minetest.get_node(pos).name if nod ~= "protector:protect" and nod ~= "protector:protect2" then player_pos[name] = nil return end - local meta = core.get_meta(pos) ; if not meta then return end + local meta = minetest.get_meta(pos) ; if not meta then return end -- add faction members if factions_available then @@ -658,16 +707,17 @@ core.register_on_player_receive_fields(function(player, formname, fields) if string.sub(field, 0, string.len("protector_del_member_")) == "protector_del_member_" then - del_member(meta, string.sub(field,string.len("protector_del_member_") + 1)) + del_member(meta, + string.sub(field,string.len("protector_del_member_") + 1)) end end - core.show_formspec(name, formname, protector_formspec(meta)) + minetest.show_formspec(name, formname, protector_formspec(meta)) end) -- display entity shown when protector node is punched -core.register_entity("protector:display", { +minetest.register_entity("protector:display", { initial_properties = { physical = false, @@ -693,9 +743,9 @@ core.register_entity("protector:display", { -- Display-zone node, Do NOT place the display as a node, -- it is made to be used as an entity (see above) -local r = protector.radius +local x = protector_radius -core.register_node("protector:display_node", { +minetest.register_node("protector:display_node", { tiles = {"protector_display.png"}, use_texture_alpha = "clip", walkable = false, @@ -703,126 +753,40 @@ core.register_node("protector:display_node", { node_box = { type = "fixed", fixed = { - {-(r+.55), -(r+.55), -(r+.55), -(r+.45), (r+.55), (r+.55)}, -- sides - {-(r+.55), -(r+.55), (r+.45), (r+.55), (r+.55), (r+.55)}, - {(r+.45), -(r+.55), -(r+.55), (r+.55), (r+.55), (r+.55)}, - {-(r+.55), -(r+.55), -(r+.55), (r+.55), (r+.55), -(r+.45)}, - {-(r+.55), (r+.45), -(r+.55), (r+.55), (r+.55), (r+.55)}, -- top - {-(r+.55), -(r+.55), -(r+.55), (r+.55), -(r+.45), (r+.55)}, -- bottom + {-(x+.55), -(x+.55), -(x+.55), -(x+.45), (x+.55), (x+.55)}, -- sides + {-(x+.55), -(x+.55), (x+.45), (x+.55), (x+.55), (x+.55)}, + {(x+.45), -(x+.55), -(x+.55), (x+.55), (x+.55), (x+.55)}, + {-(x+.55), -(x+.55), -(x+.55), (x+.55), (x+.55), -(x+.45)}, + {-(x+.55), (x+.45), -(x+.55), (x+.55), (x+.55), (x+.55)}, -- top + {-(x+.55), -(x+.55), -(x+.55), (x+.55), -(x+.45), (x+.55)}, -- bottom {-.55,-.55,-.55, .55,.55,.55} -- middle (surrounding protector) } }, selection_box = {type = "regular"}, paramtype = "light", groups = {dig_immediate = 3, not_in_creative_inventory = 1}, - drop = "", - on_blast = function() end + drop = "" }) -- load mod sections -dofile(MP .. "/doors.lua") -dofile(MP .. "/chest.lua") +dofile(MP .. "/doors_chest.lua") dofile(MP .. "/pvp.lua") dofile(MP .. "/admin.lua") dofile(MP .. "/tool.lua") dofile(MP .. "/hud.lua") -if core.get_modpath("lucky_block") then +if minetest.get_modpath("lucky_block") then dofile(MP .. "/lucky_block.lua") end -- stop mesecon pistons from pushing protectors -if core.get_modpath("mesecons_mvps") then +if minetest.get_modpath("mesecons_mvps") then mesecon.register_mvps_stopper("protector:protect") mesecon.register_mvps_stopper("protector:protect2") mesecon.register_mvps_stopper("protector:protect_hidden") mesecon.register_mvps_stopper("protector:chest") end --- player command to add member names to local protection - -core.register_chatcommand("protector_add_member", { - params = "", - description = S("Add member names to local protection"), - privs = {interact = true}, - - func = function(name, param) - - if param == "" then return end - - local to_add = param:split(" ") - local player = core.get_player_by_name(name) - local pos = player:get_pos() - - -- find the protector nodes - local pos = core.find_nodes_in_area( - {x = pos.x - r, y = pos.y - r, z = pos.z - r}, - {x = pos.x + r, y = pos.y + r, z = pos.z + r}, - {"protector:protect", "protector:protect2", "protector:protect_hidden"}) - - local meta, owner - - for n = 1, #pos do - - meta = core.get_meta(pos[n]) - owner = meta:get_string("owner") or "" - - if owner == name - or core.check_player_privs(name, {protection_bypass = true}) then - - for m = 1, #to_add do - add_member(meta, to_add[m]) - end - - core.add_entity(pos[n], "protector:display") - end - end - end -}) - --- player command to remove member names from local protection - -core.register_chatcommand("protector_del_member", { - params = "", - description = S("Remove member names from local protection"), - privs = {interact = true}, - - func = function(name, param) - - if param == "" then return end - - local to_del = param:split(" ") - local player = core.get_player_by_name(name) - local pos = player:get_pos() - - -- find the protector nodes - local pos = core.find_nodes_in_area( - {x = pos.x - r, y = pos.y - r, z = pos.z - r}, - {x = pos.x + r, y = pos.y + r, z = pos.z + r}, - {"protector:protect", "protector:protect2", "protector:protect_hidden"}) - - local meta, owner - - for n = 1, #pos do - - meta = core.get_meta(pos[n]) - owner = meta:get_string("owner") or "" - - if owner == name - or core.check_player_privs(name, {protection_bypass = true}) then - - for m = 1, #to_del do - del_member(meta, to_del[m]) - end - - core.add_entity(pos[n], "protector:display") - end - end - end -}) - - print ("[MOD] Protector Redo loaded") - diff --git a/license.txt b/license.txt index c3380e0..8b84713 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2025 TenPlus1 +Copyright (c) 2016 TenPlus1 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/locale/protector.de.tr b/locale/protector.de.tr index ccf59fe..9656715 100644 --- a/locale/protector.de.tr +++ b/locale/protector.de.tr @@ -11,9 +11,6 @@ Replacing Protector name '@1' with '@2'=Ersetze Besitzer der Störschützer von Show protected areas of your nearby protectors=Zeige geschützte Bereiche der Störschützer in der Nähe Protector Names to remove: @1=Störschutznamen zum Entfernen: @1 Name List Reset=Namensliste zurückgesetzt -Invalid player name!= -Player name too long= -Player not found.= ### doors_chest.lua ### Protected Wooden Door=Geschützte Holztür @@ -33,7 +30,6 @@ Members:=Mitglieder: Close=Schließen Protection located at: @1=Störschutz befindet sich bei: @1 Members: @1.=Mitglieder: @1. -Allow faction access= This area is not protected.=Dieser Bereich ist nicht geschützt. You can build here.=Du kannst hier bauen. Overlaps into above players protected area=Überlappung im geschützen Bereich eines Spielers @@ -44,6 +40,11 @@ Protection Logo=Störschutzlogo Spawn @1 has been protected up to a @2 block radius.=Spawn @1 ist geschützt mit einem Radius von @2 Blöcke. This area is owned by @1=Dieser Bereich gehört @1 +### pvp.lua ### +[Protector] on_punchplayer called with nil objects=on_punchplayer wurde durch \"nil objects\" aufgerufen +[Protector] pvp_protect not active, update your version of Minetest=pvp_protect ist nicht aktiv, aktualisiere deine Minetestversion +[Protector] pvp_protect is disabled=pvp_protect ist ausgeschaltet + ### hud.lua ### Owner: @1=Besitzer: @1 @@ -52,6 +53,3 @@ Protector Placer Tool (stand near protector, face direction and use)=Störschutz Protector already in place!=Störschutz is bereits platziert! No protectors available to place!=Keine Störschützer mehr im Inventar! "Protector placed at @1"=Störschutz befindet sich bei: @1 -Out of bounds!= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= \ No newline at end of file diff --git a/locale/protector.es.tr b/locale/protector.es.tr index 4589165..117a4c3 100644 --- a/locale/protector.es.tr +++ b/locale/protector.es.tr @@ -11,9 +11,6 @@ Replacing Protector name '@1' with '@2'=Reemplazando el nombre del protector '@1 Show protected areas of your nearby protectors=Mostrar áreas protegidas de sus protectores cercanos Protector Names to remove: @1=Nombres de protectores para eliminar: @1 Name List Reset=Restablecer lista de nombres -Invalid player name!= -Player name too long= -Player not found.= ### doors_chest.lua ### Protected Wooden Door=Puerta de madera protegida @@ -33,7 +30,6 @@ Members:=Miembros: Close=Cerrar Protection located at: @1=Protección ubicada en: @1 Members: @1.=Miembros: @1. -Allow faction access= This area is not protected.=Esta área no está protegida. You can build here.=Puedes construir aquí. Overlaps into above players protected area=Se superpone en el área protegida de los jugadores anteriores @@ -44,6 +40,11 @@ Protection Logo=Logotipo de la protección Spawn @1 has been protected up to a @2 block radius.=Spawn @1 ha sido protegido hasta un radio de bloque @2. This area is owned by @1=Esta área es propiedad de @1 +### pvp.lua ### +[Protector] on_punchplayer called with nil objects=[Protector] on_punchplayer llamado con objetos nulos. +[Protector] pvp_protect not active, update your version of Minetest=[Protector] pvp_protect no está activo, actualiza tu versión de Minetest +[Protector] pvp_protect is disabled=[Protector] pvp_protect está deshabilitado + ### hud.lua ### Owner: @1=Propietario: @1 @@ -52,6 +53,3 @@ Protector Placer Tool (stand near protector, face direction and use)=Herramienta Protector already in place!=¡El protector ya está en este lugar! No protectors available to place!=¡No hay protectores disponibles para colocar! Protector placed at @1=Protector colocado en @1 -Out of bounds!= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= \ No newline at end of file diff --git a/locale/protector.fr.tr b/locale/protector.fr.tr index 38361e5..70141bc 100644 --- a/locale/protector.fr.tr +++ b/locale/protector.fr.tr @@ -11,9 +11,6 @@ Replacing Protector name '@1' with '@2'= Show protected areas of your nearby protectors=Affichez les zones protégées de vos protecteurs à proximité Protector Names to remove: @1=Noms de protecteurs à supprimer: @1 Name List Reset=Liste de noms réinitialiser -Invalid player name!= -Player name too long= -Player not found.= ### doors_chest.lua ### Protected Wooden Door=Porte en bois protégée @@ -33,7 +30,6 @@ Members:=Membres: Close=Fermer Protection located at: @1=Protection située à: @1 Members: @1.=Membres: @1. -Allow faction access= This area is not protected.=msgstr "Cette zone n'est pas protégée. You can build here.=Vous pouvez construire ici. Overlaps into above players protected area=Vous chevauché une zone protégé. @@ -44,6 +40,11 @@ Protection Logo=Logo de protection Spawn @1 has been protected up to a @2 block radius.= This area is owned by @1=Cette zone appartient à @1! +### pvp.lua ### +[Protector] on_punchplayer called with nil objects=[Protector] on_punchplayer appelé avec des objets nil +[Protector] pvp_protect not active, update your version of Minetest=[Protector] pvp_protect est désactivé, mettez à jour votre version de Minetest +[Protector] pvp_protect is disabled=[Protector] pvp_protect est désactivé + ### hud.lua ### Owner: @1=Propriétaire: @1 @@ -52,6 +53,3 @@ Protector Placer Tool (stand near protector, face direction and use)=Outil de pl Protector already in place!=Protecteur déjà en place! No protectors available to place!=Aucun protecteur disponible à placer! Protector placed at @1=Protection située à: @1 -Out of bounds!= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= \ No newline at end of file diff --git a/locale/protector.it.tr b/locale/protector.it.tr index 4c20264..e2f81c1 100644 --- a/locale/protector.it.tr +++ b/locale/protector.it.tr @@ -11,9 +11,6 @@ Replacing Protector name '@1' with '@2'=Sostituzione del nome del protettore '@1 Show protected areas of your nearby protectors=Mostra le aree protette dei protettori vicino a te Protector Names to remove: @1=Nomi dei protettori da eliminare: @1 Name List Reset=Azzera l'elenco dei nomi -Invalid player name!= -Player name too long= -Player not found.= ### doors_chest.lua ### Protected Wooden Door=Porta di legno protetta @@ -33,7 +30,6 @@ Members:=Membri: Close=Chiudi Protection located at: @1=Protezione collocata a: @1 Members: @1.=Membri: @1. -Allow faction access= This area is not protected.=Quest'area non è protetta. You can build here.=Qui puoi costruire. Overlaps into above players protected area=Si sovrappone ad un'area sovrastante protetta dai giocatori @@ -44,6 +40,11 @@ Protection Logo=Logo di protezione Spawn @1 has been protected up to a @2 block radius.=Lo spawn @1 è stato protetto fino a un raggio di @2 blocchi. This area is owned by @1=Quest'area è di proprietà di @1 +### pvp.lua ### +[Protector] on_punchplayer called with nil objects=[Protector] on_punchplayer chiamato con oggetti nil +[Protector] pvp_protect not active, update your version of Minetest=[Protector] pvp_protect non attiva, aggiorna la tua versione di Minetest +[Protector] pvp_protect is disabled=[Protector] pvp_protect è disattivato + ### hud.lua ### Owner: @1=Proprietario: @1 @@ -52,6 +53,3 @@ Protector Placer Tool (stand near protector, face direction and use)=Strumento d Protector already in place!=Protettore già presente! No protectors available to place!=Nessun protettore disponibile da posizionare! Protector placed at @1=Protettore posizionato a @1 -Out of bounds!= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= \ No newline at end of file diff --git a/locale/protector.ru.tr b/locale/protector.ru.tr index 2c6c904..fc6068e 100644 --- a/locale/protector.ru.tr +++ b/locale/protector.ru.tr @@ -1,62 +1,55 @@ # textdomain: protector -# author: SkyBuilder1717 -# last update: 2025/Jan/27 +# author: CodeXP +# last update: 2018/Jul/10 ### admin.lua ### -Remove Protectors around players (separate names with spaces)=Удалить Защитников вокруг игроков (отделяйте имена с помощью пробела) -=<игроки> -Replace Protector Owner with name provided=Заменить Владельца Защитника с доставленным именем - =<владелец> <новый владелец> -Replacing Protector name '@1' with '@2'=Замена Имени Защитника '@1' с '@2' -Show protected areas of your nearby protectors=Показать защищённые зоны Защитниками с вами неподалёку -Protector Names to remove: @1=Имена Защитников чтобы удалить: @1 -Name List Reset=Сброс Список Имён -Invalid player name!=Неправильное имя игрока! -Player name too long=Имя игрока слишком длинное -Player not found.=Игрок не найден. +Remove Protectors around players (separate names with spaces)=Удалить защиту рядом с игроками (перечислить имена, разделяя пробелами) +=<список имён> +Replace Protector Owner with name provided=Заменить владельца защиты новым владельцем + =<имя владельца> <имя нового владельца> +Replacing Protector name '@1' with '@2'=Заменяется владелец защиты с '@1' на '@2' +Show protected areas of your nearby protectors=Показать ближайшие защищённые территории +Protector Names to remove: @1=Имена, подлежащие удалению: @1 +Name List Reset=Очистить список имён ### doors_chest.lua ### -Protected Wooden Door=Защищённая Деревянная Дверь -Protected Steel Door=Защищённая Стальная Дверь -Protected Trapdoor=Защищённый Люк -Protected Steel Trapdoor=Защищённый Стальной Люк -Protected Chest=Защищённый Сундук -To Chest=В Сундук -To Inventory=В Инвентарь -Protected Chest (@1)=Защищённый Сундук (@1) +Protected Wooden Door=Защищённая яблоневая дверь +Protected Steel Door=Защищённая стальная дверь +Protected Trapdoor=Защищённый яблоневый люк +Protected Steel Trapdoor=Защищённый стальной люк +Protected Chest=Защищённый сундук +To Chest=В сундук +To Inventory=В инвентрарь +Protected Chest (@1)=Защищённый сундук (@1) ### init.lua ### --- Protector interface --=-- Интерфейс Защитника -- -PUNCH node to show protected area=УДАРЬТЕ по блоку чтобы показать защищённую зону -USE for area check=ИСПОЛЬЗУЙТЕ для проверки зоны +-- Protector interface --=-- Настройка защиты -- +PUNCH node to show protected area=СТУКНУТЬ узел для подсветки защищённой территории +USE for area check=ЛКМ для проверки защищённой территории Members:=Участники: Close=Закрыть -Allow faction access=Разрешить частичный доступ -Protection located at: @1=Защитник расположен на: @1 +Protection located at: @1=Защита находится на координатах @1 Members: @1.=Участники: @1. -This area is not protected.=Эта зона не защищена. -You can build here.=Вы можете здесь строить. -Overlaps into above players protected area=Перекрывает защищенную зону вышеперечисленных игроков -Protection Block=Блок Защиты -Protection (owned by @1)=Защита (владелец: @1) -Protection Logo=Логотип Защиты -[MOD] Protector Redo loaded=[MOD] Protector Redo загружен -Spawn @1 has been protected up to a @2 block radius.=Спавн @1 был защищён радиусом в блоках @2. -This area is owned by @1=Эта зона принадлежит @1. +This area is not protected.=Территория свободна. +You can build here.=Здесь можно ставить блоки. +Overlaps into above players protected area=Защитный блок не может быть установлен: пересечение с областями, защищёнными другими игроками +Protection Block=Защитный блок +Protection (owned by @1)=Защита игрока @1 +Protection Logo=Защитный знак +[MOD] Protector Redo loaded=[МОД] Protector Redo загружен +Spawn @1 has been protected up to a @2 block radius.=Спаун @1 защищён в радиусе @2 блока. +This area is owned by @1=Эта территория пренадлежит @1 ### pvp.lua ### -[Protector] on_punchplayer called with nil objects=on_punchplayer вызван на нулевом объекте -[Protector] pvp_protect not active, update your version of Luanti=[Protector] pvp_protect не активен, обновите версию Luanti -[Protector] pvp_protect is disabled=[Protector] pvp_protect выключен +[Protector] on_punchplayer called with nil objects=[Защита] on_punchplayer вызвана с нулевыми объектами +[Protector] pvp_protect not active, update your version of Minetest=[Защита] pvp_protect неактивен, обновите версию Minetest +[Protector] pvp_protect is disabled=[Защита] pvp_protect отключён ### hud.lua ### Owner: @1=Владелец: @1 ### tool.lua ### -Protector Placer Tool (stand near protector, face direction and use)=Инструмент Размещения Защитника (встаньте рядом с Защитником, повернитесь к нему и используйте предмет) -Protector already in place!=Защитник уже стоит на этом месте! -No protectors available to place!=Нет доступных Защитников чтобы поставить! -Out of bounds!=За пределами! -Protector placed at @1=Защитник размещён на @1 -Cannot place protector, already protected at @1=Нельзя поставить Защитник, другой Защитник уже на @1 -Cannot place protector, container at @1=Нельзя поставить Защитник, контейнер на @1 \ No newline at end of file +Protector Placer Tool (stand near protector, face direction and use)=Инструмент установки защиты (встаньте рядом с защитой, повернитесь в нужном направлении и используйте) +Protector already in place!=Защита уже установлена! +No protectors available to place!=У вас нет защитных блоков в инвентаре! +Protector placed at @1=Защита находится на координатах @1 diff --git a/locale/protector.tr.tr b/locale/protector.tr.tr index 97a0d84..368e624 100644 --- a/locale/protector.tr.tr +++ b/locale/protector.tr.tr @@ -11,9 +11,6 @@ Replacing Protector name '@1' with '@2'='@1' Koruyucu adını '@2' ile değişti Show protected areas of your nearby protectors=Yakındaki koruyucuların korunan alanlarını göster Protector Names to remove: @1=Silinecek korumaların isimleri: @1 Name List Reset=İsim listesini sıfırla -Invalid player name!= -Player name too long= -Player not found.= ### doors_chest.lua ### Protected Wooden Door=Korumalı ahşap kapı @@ -33,7 +30,6 @@ Members:=Üyeler Close=Kapat Protection located at: @1=Korumanın bulunduğu yer @1 Members: @1.=Üyeler @1. -Allow faction access= This area is not protected.=Bu alan korumalı değildir. You can build here.=Buraya inşaa edebilirsiniz. Overlaps into above players protected area=Yukarıdaki oyuncuların koruma alanı ile çakışıyor @@ -44,6 +40,11 @@ Protection Logo=Koruma arması Spawn @1 has been protected up to a @2 block radius.=Spawn @1, @2 blok yarıçapa kadar korunur. This area is owned by @1=Burasının sahibi @1! +### pvp.lua ### +[Protector] on_punchplayer called with nil objects=[Protector] on_punchplayer boş objelerle çağrıldı +[Protector] pvp_protect not active, update your version of Minetest=[Protector] pvp_protect aktif değil, Minetest sürümünüzü güncelleyin. +[Protector] pvp_protect is disabled=[Protector] pvp_protect kapatıldı. + ### hud.lua ### Owner: @1=Sahip: @1 @@ -52,6 +53,3 @@ Protector Placer Tool (stand near protector, face direction and use)=Koruyucu Ye Protector already in place!=Koruyucu zaten yerinde! No protectors available to place!=Yerleştirilecek koruyucu yok! Protector placed at @1=Korumanın bulunduğu yer @1 -Out of bounds!= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= \ No newline at end of file diff --git a/locale/protector.uk.tr b/locale/protector.uk.tr deleted file mode 100644 index fffab3a..0000000 --- a/locale/protector.uk.tr +++ /dev/null @@ -1,56 +0,0 @@ -# textdomain: protector - -Protector Redo=Захист -Lets players craft special blocks to protect their builds or disable PVP in areas.=Дозволяє гравцям створювати спеціальні блоки для захисту їхніх споруд або вимкнення PVP на певних територіях. - -### admin.lua ### -Remove Protectors around players (separate names with spaces)=Видалити захист поряд із гравцями (перечислити імена, розділяючи пробілами) -=<список імен> -Replace Protector Owner with name provided=Замінити власника захисту новим власником - =<ім'я власника> <ім'я нового власника> -Replacing Protector name '@1' with '@2'=Заміняється власник захисту із '@1' на '@2' -Show protected areas of your nearby protectors=Показати найближчі захищені території -Protector Names to remove: @1=Імена, які будуть видалені: @1 -Name List Reset=Очистити список імен - -### doors_chest.lua ### -Protected Wooden Door=Захищені дерев'яні двері -Protected Steel Door=Захищені сталеві двері -Protected Trapdoor=Захищений дерев'яний люк -Protected Steel Trapdoor=Захищений сталевий люк -Protected Chest=Захищена скриня -To Chest=В скриню -To Inventory=В інвентар -Protected Chest (@1)=Захищена скриня (@1) - -### init.lua ### --- Protector interface --=-- Налаштування захисту -- -PUNCH node to show protected area=ВДАРИТИ блок для підсвітки захищеної території -USE for area check=ЛКМ для перевірки захищеної території -Members:=Учасники: -Close=Закрити -Protection located at: @1=Захист знаходиться на координатах: @1 -Members: @1.=Учасники: @1. -This area is not protected.=Територія вільна. -You can build here.=Тут можна будувати. -Overlaps into above players protected area=Блок захисту не може бути встановлений тут, десь поруч є територія іншого гравця -Protection Block=Блок захисту території -Protection (owned by @1)=Захист території гравця @1 -Protection Logo=Захисний знак -[MOD] Protector Redo loaded=[МОД] Protector Redo завантажено -Spawn @1 has been protected up to a @2 block radius.=Спавн @1 захищений у радіусі @2 блока. -This area is owned by @1=Ця територія належить гравцю @1 - -### pvp.lua ### -[Protector] on_punchplayer called with nil objects=[Захист] on_punchplayer викликана із нульовими об'єктами -[Protector] pvp_protect not active, update your version of Minetest=[Захист] pvp_protect неактивний, оновіть версію Luanti -[Protector] pvp_protect is disabled=[Защита] pvp_protect вимкнений - -### hud.lua ### -Owner: @1=Територія належить @1 - -### tool.lua ### -Protector Placer Tool (stand near protector, face direction and use)=Інструмент встановлення захисту (встаньте поруч із захистом, поверніться в потрібному напрямку і використайте) -Protector already in place!=Захист уже встановлено! -No protectors available to place!=У вас немає блоків захисту території в інвентарю! -Protector placed at @1=Захист знаходиться на координатах @1 diff --git a/locale/template.txt b/locale/template.txt deleted file mode 100644 index 90ea1fc..0000000 --- a/locale/template.txt +++ /dev/null @@ -1,59 +0,0 @@ -# textdomain: protector -# author: ? -# last update: 2020/Jul/12 - -### admin.lua ### -Remove Protectors around players (separate names with spaces)= -= -Replace Protector Owner with name provided= - = -Replacing Protector name '@1' with '@2'= -Show protected areas of your nearby protectors= -Protector Names to remove: @1= -Name List Reset= -Invalid player name!= -Player name too long= -Player not found.= - -### doors_chest.lua ### -Protected Wooden Door= -Protected Steel Door= -Protected Trapdoor= -Protected Steel Trapdoor= -Protected Chest= -To Chest= -To Inventory= -Protected Chest (@1)= - -### init.lua ### --- Protector interface --= -PUNCH node to show protected area= -USE for area check= -Members:= -Close= -Protection located at: @1= -Members: @1.= -Allow faction access= -This area is not protected.= -You can build here.= -Overlaps into above players protected area= -Protection Block= -Protection (owned by @1)= -Protection Logo= -[MOD] Protector Redo loaded= -Spawn @1 has been protected up to a @2 block radius.= -This area is owned by @1= -Add member names to local protection -Remove member names from local protection - -### hud.lua ### -Owner: @1= - -### tool.lua ### -Protector Placer Tool (stand near protector, face direction and use)= -Protector already in place!= -Out of bounds!= -No protectors available to place!= -Protector placed at @1= -Cannot place protector, already protected at @1= -Cannot place protector, container at @1= diff --git a/lucky_block.lua b/lucky_block.lua index 7a69e81..b466c61 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -2,13 +2,13 @@ -- add lucky blocks lucky_block:add_blocks({ - {"dro", {"protector:protect"}, 2}, - {"dro", {"protector:protect2"}, 2}, - {"dro", {"protector:door_wood"}, 2}, - {"dro", {"protector:door_steel"}, 2}, + {"dro", {"protector:protect"}, 3}, + {"dro", {"protector:protect2"}, 3}, + {"dro", {"protector:door_wood"}, 1}, + {"dro", {"protector:door_steel"}, 1}, {"exp", 5, true}, - {"dro", {"protector:trapdoor"}, 2}, - {"dro", {"protector:trapdoor_steel"}, 2}, + {"dro", {"protector:trapdoor"}, 1}, + {"dro", {"protector:trapdoor_steel"}, 1}, {"dro", {"protector:tool"}, 1}, {"dro", {"protector:chest"}, 1}, {"exp"} diff --git a/pvp.lua b/pvp.lua index 5d22250..6860467 100644 --- a/pvp.lua +++ b/pvp.lua @@ -1,26 +1,26 @@ -- get static spawn position -local statspawn = core.string_to_pos(core.settings:get("static_spawnpoint")) +local statspawn = minetest.string_to_pos(minetest.settings:get("static_spawnpoint")) or {x = 0, y = 2, z = 0} -- is spawn protected -local protector_spawn = tonumber(core.settings:get("protector_spawn") - or core.settings:get("protector_pvp_spawn")) or 0 +local protector_spawn = tonumber(minetest.settings:get("protector_spawn") + or minetest.settings:get("protector_pvp_spawn")) or 0 -- is night-only pvp enabled -local protector_night_pvp = core.settings:get_bool("protector_night_pvp") +local protector_night_pvp = minetest.settings:get_bool("protector_night_pvp") -- disables PVP in your own protected areas -if core.settings:get_bool("enable_pvp") -and core.settings:get_bool("protector_pvp") then +if minetest.settings:get_bool("enable_pvp") +and minetest.settings:get_bool("protector_pvp") then - if core.register_on_punchplayer then + if minetest.register_on_punchplayer then - core.register_on_punchplayer(function(player, hitter, + minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage) if not player or not hitter then @@ -46,7 +46,7 @@ and core.settings:get_bool("protector_pvp") then if protector_night_pvp then -- get time of day - local tod = core.get_timeofday() or 0 + local tod = minetest.get_timeofday() or 0 if tod > 0.2 and tod < 0.8 then -- @@ -56,14 +56,16 @@ and core.settings:get_bool("protector_pvp") then end -- is player being punched inside a protected area ? - if core.is_protected(pos, hitter:get_player_name()) then + if minetest.is_protected(pos, hitter:get_player_name()) then return true end return false + end) else print("[MOD] Protector - pvp_protect not active, update your version of Minetest") + end else print("[MOD] Protector - pvp_protect is disabled") diff --git a/screenshot.jpg b/screenshot.jpg index 07cefc0..6d01d9c 100644 Binary files a/screenshot.jpg and b/screenshot.jpg differ diff --git a/tool.lua b/tool.lua index 53fab0d..541f5b9 100644 --- a/tool.lua +++ b/tool.lua @@ -1,15 +1,19 @@ -- protector placement tool (thanks to Shara for code and idea) -local S = core.get_translator("protector") +local S = minetest.get_translator("protector") -- get protection radius -local r = protector.radius +local r = tonumber(minetest.settings:get("protector_radius")) or 5 + +-- radius limiter (minetest cannot handle node volume of more than 4096000) + +if r > 30 then r = 30 end -- protector placement tool -core.register_craftitem("protector:tool", { +minetest.register_craftitem("protector:tool", { description = S("Protector Placer Tool (stand near protector, face direction and use)"), inventory_image = "protector_tool.png", stack_max = 1, @@ -20,7 +24,7 @@ core.register_craftitem("protector:tool", { -- check for protector near player (2 block radius) local pos = user:get_pos() - local pp = core.find_nodes_in_area( + local pp = minetest.find_nodes_in_area( vector.subtract(pos, 2), vector.add(pos, 2), {"protector:protect", "protector:protect2", "protector:protect_hidden"}) @@ -29,23 +33,28 @@ core.register_craftitem("protector:tool", { pos = pp[1] -- take position of first protector found -- get members on protector - local meta = core.get_meta(pos) + local meta = minetest.get_meta(pos) local members = meta:get_string("members") or "" - local faction = meta:get_int("faction_members") -- get direction player is facing - local dir = core.dir_to_facedir( user:get_look_dir() ) + local dir = minetest.dir_to_facedir( user:get_look_dir() ) local vec = {x = 0, y = 0, z = 0} local gap = (r * 2) + 1 local pit = user:get_look_vertical() -- set placement coords - if pit > 1.2 then vec.y = -gap -- up - elseif pit < -1.2 then vec.y = gap -- down - elseif dir == 0 then vec.z = gap -- north - elseif dir == 1 then vec.x = gap -- east - elseif dir == 2 then vec.z = -gap -- south - elseif dir == 3 then vec.x = -gap -- west + if pit > 1.2 then + vec.y = -gap -- up + elseif pit < -1.2 then + vec.y = gap -- down + elseif dir == 0 then + vec.z = gap -- north + elseif dir == 1 then + vec.x = gap -- east + elseif dir == 2 then + vec.z = -gap -- south + elseif dir == 3 then + vec.x = -gap -- west end -- new position @@ -56,26 +65,26 @@ core.register_craftitem("protector:tool", { -- does placing a protector overlap existing area if not protector.can_dig(r * 2, pos, user:get_player_name(), true, 3) then - core.chat_send_player(name, + minetest.chat_send_player(name, S("Overlaps into above players protected area")) return end -- does a protector already exist ? - if #core.find_nodes_in_area(vector.subtract(pos, 1), vector.add(pos, 1), + if #minetest.find_nodes_in_area(vector.subtract(pos, 1), vector.add(pos, 1), {"protector:protect", "protector:protect2", "protector:protect_hidden"}) > 0 then - core.chat_send_player(name, S("Protector already in place!")) + minetest.chat_send_player(name, S("Protector already in place!")) return end -- do not place protector out of map bounds or replace bedrock - if #core.find_nodes_in_area(pos, pos, {"ignore", "mcl_core:bedrock"}) > 0 then + if #minetest.find_nodes_in_area(pos, pos, {"ignore", "mcl_core:bedrock"}) > 0 then - core.chat_send_player(name, S("Out of bounds!")) + minetest.chat_send_player(name, S("Out of bounds!")) return end @@ -87,7 +96,7 @@ core.register_craftitem("protector:tool", { if not inv:contains_item("main", "protector:protect") and not inv:contains_item("main", "protector:protect2") then - core.chat_send_player(name, + minetest.chat_send_player(name, S("No protectors available to place!")) return @@ -108,29 +117,28 @@ core.register_craftitem("protector:tool", { end -- do not replace containers with inventory space - local inv = core.get_inventory({type = "node", pos = pos}) + local inv = minetest.get_inventory({type = "node", pos = pos}) if inv then - core.chat_send_player(name, - S("Cannot place protector, container at @1", - core.pos_to_string(pos))) + minetest.chat_send_player(name, S("Cannot place protector, container at") .. + " " .. minetest.pos_to_string(pos)) return end -- protection check for other mods like Areas - if core.is_protected(pos, name) then + if minetest.is_protected(pos, name) then - core.chat_send_player(name, - S("Cannot place protector, already protected at @1", - core.pos_to_string(pos))) + minetest.chat_send_player(name, + S("Cannot place protector, already protected at") + .. " " .. minetest.pos_to_string(pos)) return end -- place protector - core.set_node(pos, {name = nod, param2 = 1}) + minetest.set_node(pos, {name = nod, param2 = 1}) -- set protector metadata - local meta = core.get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("owner", name) meta:set_string("infotext", "Protection (owned by " .. name .. ")") @@ -138,13 +146,13 @@ core.register_craftitem("protector:tool", { -- copy members across if holding sneak when using tool if user:get_player_control().sneak then meta:set_string("members", members) - meta:set_int("faction_members", faction) else meta:set_string("members", "") end - core.chat_send_player(name, - S("Protector placed at @1", core.pos_to_string(pos))) + minetest.chat_send_player(name, + S("Protector placed at") .. + " " .. minetest.pos_to_string(pos)) end }) @@ -152,11 +160,11 @@ core.register_craftitem("protector:tool", { local df = "default:steel_ingot" -if core.get_modpath("mcl_core") then +if minetest.get_modpath("mcl_core") then df = "mcl_core:iron_ingot" end -core.register_craft({ +minetest.register_craft({ output = "protector:tool", recipe = { {df, df, df},