summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeija <norrepli@gmail.com>2016-02-15 23:05:21 +0100
committerJeija <norrepli@gmail.com>2016-02-15 23:05:21 +0100
commit7b84105512c6cf38e70f014457d238adf030460d (patch)
tree70d94e87b944188524a13cf1781823798c37269c
parent80f72b26218b2a647dbcb4e413efccfcb6e74347 (diff)
downloadmesecons-7b84105512c6cf38e70f014457d238adf030460d.tar
mesecons-7b84105512c6cf38e70f014457d238adf030460d.tar.gz
mesecons-7b84105512c6cf38e70f014457d238adf030460d.tar.bz2
mesecons-7b84105512c6cf38e70f014457d238adf030460d.tar.xz
mesecons-7b84105512c6cf38e70f014457d238adf030460d.zip
Consistently use UNIX line endings (LF instead of CR LF)
-rw-r--r--mesecons/settings.lua30
-rw-r--r--mesecons_commandblock/init.lua390
2 files changed, 210 insertions, 210 deletions
diff --git a/mesecons/settings.lua b/mesecons/settings.lua
index 50240c3..1ebbfde 100644
--- a/mesecons/settings.lua
+++ b/mesecons/settings.lua
@@ -1,15 +1,15 @@
--- SETTINGS
-function mesecon.setting(setting, default)
- if type(default) == "boolean" then
- local read = minetest.setting_getbool("mesecon."..setting)
- if read == nil then
- return default
- else
- return read
- end
- elseif type(default) == "string" then
- return minetest.setting_get("mesecon."..setting) or default
- elseif type(default) == "number" then
- return tonumber(minetest.setting_get("mesecon."..setting) or default)
- end
-end
+-- SETTINGS
+function mesecon.setting(setting, default)
+ if type(default) == "boolean" then
+ local read = minetest.setting_getbool("mesecon."..setting)
+ if read == nil then
+ return default
+ else
+ return read
+ end
+ elseif type(default) == "string" then
+ return minetest.setting_get("mesecon."..setting) or default
+ elseif type(default) == "number" then
+ return tonumber(minetest.setting_get("mesecon."..setting) or default)
+ end
+end
diff --git a/mesecons_commandblock/init.lua b/mesecons_commandblock/init.lua
index 8fd23f6..9cf9b13 100644
--- a/mesecons_commandblock/init.lua
+++ b/mesecons_commandblock/init.lua
@@ -1,195 +1,195 @@
-minetest.register_chatcommand("say", {
- params = "<text>",
- description = "Say <text> as the server",
- privs = {server=true},
- func = function(name, param)
- minetest.chat_send_all(name .. ": " .. param)
- end
-})
-
-minetest.register_chatcommand("tell", {
- params = "<name> <text>",
- description = "Say <text> to <name> privately",
- func = function(name, param)
- local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")
- if found == nil then
- minetest.chat_send_player(name, "Invalid usage: " .. param)
- return
- end
- if not minetest.get_player_by_name(target) then
- minetest.chat_send_player(name, "Invalid target: " .. target)
- end
- minetest.chat_send_player(target, name .. " whispers: " .. message, false)
- end
-})
-
-minetest.register_chatcommand("hp", {
- params = "<name> <value>",
- description = "Set health of <name> to <value> hitpoints",
- privs = {ban=true},
- func = function(name, param)
- local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")
- if found == nil then
- minetest.chat_send_player(name, "Invalid usage: " .. param)
- return
- end
- local player = minetest.get_player_by_name(target)
- if player then
- player:set_hp(value)
- else
- minetest.chat_send_player(name, "Invalid target: " .. target)
- end
- end
-})
-
-local function initialize_data(meta)
- local commands = meta:get_string("commands")
- meta:set_string("formspec",
- "invsize[9,5;]" ..
- "textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
- "label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..
- "button_exit[3.3,4.5;2,1;submit;Submit]")
- local owner = meta:get_string("owner")
- if owner == "" then
- owner = "not owned"
- else
- owner = "owned by " .. owner
- end
- meta:set_string("infotext", "Command Block\n" ..
- "(" .. owner .. ")\n" ..
- "Commands: "..commands)
-end
-
-local function construct(pos)
- local meta = minetest.get_meta(pos)
-
- meta:set_string("commands", "tell @nearest Commandblock unconfigured")
-
- meta:set_string("owner", "")
-
- initialize_data(meta)
-end
-
-local function after_place(pos, placer)
- if placer then
- local meta = minetest.get_meta(pos)
- meta:set_string("owner", placer:get_player_name())
- initialize_data(meta)
- end
-end
-
-local function receive_fields(pos, formname, fields, sender)
- if not fields.submit then
- return
- end
- local meta = minetest.get_meta(pos)
- local owner = meta:get_string("owner")
- if owner ~= "" and sender:get_player_name() ~= owner then
- return
- end
- meta:set_string("commands", fields.commands)
-
- initialize_data(meta)
-end
-
-local function resolve_commands(commands, pos)
- local nearest, farthest = nil, nil
- local min_distance, max_distance = math.huge, -1
- local players = minetest.get_connected_players()
- for index, player in pairs(players) do
- local distance = vector.distance(pos, player:getpos())
- if distance < min_distance then
- min_distance = distance
- nearest = player:get_player_name()
- end
- if distance > max_distance then
- max_distance = distance
- farthest = player:get_player_name()
- end
- end
- local random = players[math.random(#players)]:get_player_name()
- commands = commands:gsub("@nearest", nearest)
- commands = commands:gsub("@farthest", farthest)
- commands = commands:gsub("@random", random)
- return commands
-end
-
-local function commandblock_action_on(pos, node)
- if node.name ~= "mesecons_commandblock:commandblock_off" then
- return
- end
-
- minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})
-
- local meta = minetest.get_meta(pos)
- local owner = meta:get_string("owner")
- if owner == "" then
- return
- end
-
- local commands = resolve_commands(meta:get_string("commands"), pos)
- for _, command in pairs(commands:split("\n")) do
- local pos = command:find(" ")
- local cmd, param = command, ""
- if pos then
- cmd = command:sub(1, pos - 1)
- param = command:sub(pos + 1)
- end
- local cmddef = minetest.chatcommands[cmd]
- if not cmddef then
- minetest.chat_send_player(owner, "The command "..cmd.." does not exist")
- return
- end
- local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs)
- if not has_privs then
- minetest.chat_send_player(owner, "You don't have permission "
- .."to run "..cmd
- .." (missing privileges: "
- ..table.concat(missing_privs, ", ")..")")
- return
- end
- cmddef.func(owner, param)
- end
-end
-
-local function commandblock_action_off(pos, node)
- if node.name == "mesecons_commandblock:commandblock_on" then
- minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})
- end
-end
-
-local function can_dig(pos, player)
- local meta = minetest.get_meta(pos)
- local owner = meta:get_string("owner")
- return owner == "" or owner == player:get_player_name()
-end
-
-minetest.register_node("mesecons_commandblock:commandblock_off", {
- description = "Command Block",
- tiles = {"jeija_commandblock_off.png"},
- inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
- groups = {cracky=2, mesecon_effector_off=1},
- on_construct = construct,
- after_place_node = after_place,
- on_receive_fields = receive_fields,
- can_dig = can_dig,
- sounds = default.node_sound_stone_defaults(),
- mesecons = {effector = {
- action_on = commandblock_action_on
- }}
-})
-
-minetest.register_node("mesecons_commandblock:commandblock_on", {
- tiles = {"jeija_commandblock_on.png"},
- groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},
- light_source = 10,
- drop = "mesecons_commandblock:commandblock_off",
- on_construct = construct,
- after_place_node = after_place,
- on_receive_fields = receive_fields,
- can_dig = can_dig,
- sounds = default.node_sound_stone_defaults(),
- mesecons = {effector = {
- action_off = commandblock_action_off
- }}
-})
+minetest.register_chatcommand("say", {
+ params = "<text>",
+ description = "Say <text> as the server",
+ privs = {server=true},
+ func = function(name, param)
+ minetest.chat_send_all(name .. ": " .. param)
+ end
+})
+
+minetest.register_chatcommand("tell", {
+ params = "<name> <text>",
+ description = "Say <text> to <name> privately",
+ func = function(name, param)
+ local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")
+ if found == nil then
+ minetest.chat_send_player(name, "Invalid usage: " .. param)
+ return
+ end
+ if not minetest.get_player_by_name(target) then
+ minetest.chat_send_player(name, "Invalid target: " .. target)
+ end
+ minetest.chat_send_player(target, name .. " whispers: " .. message, false)
+ end
+})
+
+minetest.register_chatcommand("hp", {
+ params = "<name> <value>",
+ description = "Set health of <name> to <value> hitpoints",
+ privs = {ban=true},
+ func = function(name, param)
+ local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")
+ if found == nil then
+ minetest.chat_send_player(name, "Invalid usage: " .. param)
+ return
+ end
+ local player = minetest.get_player_by_name(target)
+ if player then
+ player:set_hp(value)
+ else
+ minetest.chat_send_player(name, "Invalid target: " .. target)
+ end
+ end
+})
+
+local function initialize_data(meta)
+ local commands = meta:get_string("commands")
+ meta:set_string("formspec",
+ "invsize[9,5;]" ..
+ "textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
+ "label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..
+ "button_exit[3.3,4.5;2,1;submit;Submit]")
+ local owner = meta:get_string("owner")
+ if owner == "" then
+ owner = "not owned"
+ else
+ owner = "owned by " .. owner
+ end
+ meta:set_string("infotext", "Command Block\n" ..
+ "(" .. owner .. ")\n" ..
+ "Commands: "..commands)
+end
+
+local function construct(pos)
+ local meta = minetest.get_meta(pos)
+
+ meta:set_string("commands", "tell @nearest Commandblock unconfigured")
+
+ meta:set_string("owner", "")
+
+ initialize_data(meta)
+end
+
+local function after_place(pos, placer)
+ if placer then
+ local meta = minetest.get_meta(pos)
+ meta:set_string("owner", placer:get_player_name())
+ initialize_data(meta)
+ end
+end
+
+local function receive_fields(pos, formname, fields, sender)
+ if not fields.submit then
+ return
+ end
+ local meta = minetest.get_meta(pos)
+ local owner = meta:get_string("owner")
+ if owner ~= "" and sender:get_player_name() ~= owner then
+ return
+ end
+ meta:set_string("commands", fields.commands)
+
+ initialize_data(meta)
+end
+
+local function resolve_commands(commands, pos)
+ local nearest, farthest = nil, nil
+ local min_distance, max_distance = math.huge, -1
+ local players = minetest.get_connected_players()
+ for index, player in pairs(players) do
+ local distance = vector.distance(pos, player:getpos())
+ if distance < min_distance then
+ min_distance = distance
+ nearest = player:get_player_name()
+ end
+ if distance > max_distance then
+ max_distance = distance
+ farthest = player:get_player_name()
+ end
+ end
+ local random = players[math.random(#players)]:get_player_name()
+ commands = commands:gsub("@nearest", nearest)
+ commands = commands:gsub("@farthest", farthest)
+ commands = commands:gsub("@random", random)
+ return commands
+end
+
+local function commandblock_action_on(pos, node)
+ if node.name ~= "mesecons_commandblock:commandblock_off" then
+ return
+ end
+
+ minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})
+
+ local meta = minetest.get_meta(pos)
+ local owner = meta:get_string("owner")
+ if owner == "" then
+ return
+ end
+
+ local commands = resolve_commands(meta:get_string("commands"), pos)
+ for _, command in pairs(commands:split("\n")) do
+ local pos = command:find(" ")
+ local cmd, param = command, ""
+ if pos then
+ cmd = command:sub(1, pos - 1)
+ param = command:sub(pos + 1)
+ end
+ local cmddef = minetest.chatcommands[cmd]
+ if not cmddef then
+ minetest.chat_send_player(owner, "The command "..cmd.." does not exist")
+ return
+ end
+ local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs)
+ if not has_privs then
+ minetest.chat_send_player(owner, "You don't have permission "
+ .."to run "..cmd
+ .." (missing privileges: "
+ ..table.concat(missing_privs, ", ")..")")
+ return
+ end
+ cmddef.func(owner, param)
+ end
+end
+
+local function commandblock_action_off(pos, node)
+ if node.name == "mesecons_commandblock:commandblock_on" then
+ minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})
+ end
+end
+
+local function can_dig(pos, player)
+ local meta = minetest.get_meta(pos)
+ local owner = meta:get_string("owner")
+ return owner == "" or owner == player:get_player_name()
+end
+
+minetest.register_node("mesecons_commandblock:commandblock_off", {
+ description = "Command Block",
+ tiles = {"jeija_commandblock_off.png"},
+ inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
+ groups = {cracky=2, mesecon_effector_off=1},
+ on_construct = construct,
+ after_place_node = after_place,
+ on_receive_fields = receive_fields,
+ can_dig = can_dig,
+ sounds = default.node_sound_stone_defaults(),
+ mesecons = {effector = {
+ action_on = commandblock_action_on
+ }}
+})
+
+minetest.register_node("mesecons_commandblock:commandblock_on", {
+ tiles = {"jeija_commandblock_on.png"},
+ groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},
+ light_source = 10,
+ drop = "mesecons_commandblock:commandblock_off",
+ on_construct = construct,
+ after_place_node = after_place,
+ on_receive_fields = receive_fields,
+ can_dig = can_dig,
+ sounds = default.node_sound_stone_defaults(),
+ mesecons = {effector = {
+ action_off = commandblock_action_off
+ }}
+})