blocky_portaling/lwcomponents
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
loosewheel
2022-03-08 20:07:00 +10:00
committed by GitHub
parent dcc13da758
commit 78f9fe2ef0
27 changed files with 335 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
breaker.lua
View File

@@ -12,7 +12,7 @@ local break_interval = 1.0
local function get_breaker_side (pos, param2, side) local function get_breaker_side (pos, param2, side)
local base = nil local base
if side == "left" then if side == "left" then
base = { x = -1, y = pos.y, z = 0 } base = { x = -1, y = pos.y, z = 0 }
@@ -138,7 +138,7 @@ local function can_break_node (pos, breakpos)
if node_def then if node_def then
-- try tool first -- try tool first
local tool = get_tool (pos) local tool = get_tool (pos)
local dig_params = nil local dig_params
if tool then if tool then
local tool_def = minetest.registered_items[tool:get_name ()] local tool_def = minetest.registered_items[tool:get_name ()]
@@ -516,7 +516,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

7
camera.lua
View File

@@ -121,7 +121,7 @@ local function camera_scan (pos, resolution, distance)
local horz = (x - (resolution / 2)) * scale * view local horz = (x - (resolution / 2)) * scale * view
local vert = (y - (resolution / 2)) * scale * view local vert = (y - (resolution / 2)) * scale * view
local tpos = nil local tpos
if dir.x ~= 0 then if dir.x ~= 0 then
tpos = vector.round ({ x = (dist * dir.x) + pos.x, y = pos.y - vert, z = horz + pos.z }) tpos = vector.round ({ x = (dist * dir.x) + pos.x, y = pos.y - vert, z = horz + pos.z })
else else
@@ -146,9 +146,9 @@ local function camera_scan (pos, resolution, distance)
last_color = string.format ("0000%02X", color) last_color = string.format ("0000%02X", color)
image[y][x] = last_color image[y][x] = last_color
else else
local node = utils.get_far_node (tpos) local tnode = utils.get_far_node (tpos)
if node and node.name ~= "air" then if tnode and tnode.name ~= "air" then
local color = (((distance - dist) / distance) * 98) + 30 local color = (((distance - dist) / distance) * 98) + 30
last_color = string.format ("%02X%02X%02X", color, color, color) last_color = string.format ("%02X%02X%02X", color, color, color)
@@ -293,7 +293,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

26
cannon.lua
View File

@@ -29,18 +29,6 @@ end
local function get_barrel_pos (pos)
local barrel = get_cannon_barrel (pos)
if barrel then
return barrel:get_pos ()
end
return nil
end
local function get_barrel_angle (pos) local function get_barrel_angle (pos)
local node = minetest.get_node_or_nil (pos) local node = minetest.get_node_or_nil (pos)
local barrel = get_cannon_barrel (pos) local barrel = get_cannon_barrel (pos)
@@ -181,11 +169,7 @@ end
local function aim_barrel_delayed (pos, aimpos) local function aim_barrel_delayed (pos, aimpos)
local x = tonumber (aimpos.x) or 0 if (tonumber (aimpos.z) or 0) < 1 then
local y = tonumber (aimpos.y) or 0
local z = tonumber (aimpos.z) or 0
if z < 1 then
return return
end end
@@ -230,7 +214,8 @@ local function fire_cannon (pos)
if ammo_pos and ammo_angle then if ammo_pos and ammo_angle then
local dir = vector.rotate ({ x = 0, y = 0, z = -1 }, ammo_angle) local dir = vector.rotate ({ x = 0, y = 0, z = -1 }, ammo_angle)
local owner = meta:get_string ("owner") local owner = meta:get_string ("owner")
local obj, cancel = nil, false local obj = nil
local cancel
local spawn_pos = { x = ammo_pos.x + dir.x, local spawn_pos = { x = ammo_pos.x + dir.x,
y = ammo_pos.y + dir.y, y = ammo_pos.y + dir.y,
z = ammo_pos.z + dir.z } z = ammo_pos.z + dir.z }
@@ -464,7 +449,7 @@ local function on_place (itemstack, placer, pointed_thing)
minetest.set_node (pos, { name = "lwcomponents:cannon", param1 = 0, param2 = param2 }) minetest.set_node (pos, { name = "lwcomponents:cannon", param1 = 0, param2 = param2 })
after_place_node (pos, placer, itemstack, pointed_thing) after_place_node (pos, placer, itemstack, pointed_thing)
if not utils.is_creative (player) then if not utils.is_creative (placer) then
itemstack:set_count (itemstack:get_count () - 1) itemstack:set_count (itemstack:get_count () - 1)
end end
end end
@@ -499,7 +484,7 @@ local function on_place_locked (itemstack, placer, pointed_thing)
minetest.set_node (pos, { name = "lwcomponents:cannon_locked", param1 = 0, param2 = param2 }) minetest.set_node (pos, { name = "lwcomponents:cannon_locked", param1 = 0, param2 = param2 })
after_place_node_locked (pos, placer, itemstack, pointed_thing) after_place_node_locked (pos, placer, itemstack, pointed_thing)
if not utils.is_creative (player) then if not utils.is_creative (placer) then
itemstack:set_count (itemstack:get_count () - 1) itemstack:set_count (itemstack:get_count () - 1)
end end
end end
@@ -621,7 +606,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)

6
change.log
View File

@@ -161,3 +161,9 @@ v0.1.26
* Added destroyer. * Added destroyer.
* Cleaned up hopper code. * Cleaned up hopper code.
* Fixed recipe for solid conductor blocks. * Fixed recipe for solid conductor blocks.
v0.1.27
* Bug fixes and code cleanup.
* Fixed receptor state in detector.
* Improved receptor state in digiswitch.

1
collector.lua
View File

@@ -316,7 +316,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)

4
conduit.lua
View File

@@ -300,7 +300,6 @@ local function send_to_target (pos, target, slot)
local stack = inv:get_stack ("main", slot) local stack = inv:get_stack ("main", slot)
if stack and not stack:is_empty () then if stack and not stack:is_empty () then
local name = stack:get_name ()
local item = ItemStack (stack) local item = ItemStack (stack)
target = (target and tostring (target)) or target = (target and tostring (target)) or
@@ -447,7 +446,7 @@ local function send_inventory_message (pos)
if stack and not stack:is_empty () then if stack and not stack:is_empty () then
local name = stack:get_name () local name = stack:get_name ()
local description = nil local description
local custom = false local custom = false
local pallet_index = nil local pallet_index = nil
local tstack = stack:to_table () local tstack = stack:to_table ()
@@ -737,7 +736,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)

1
crafting.lua
View File

@@ -1,5 +1,4 @@
local utils = ... local utils = ...
local S = utils.S

5
deployer.lua
View File

@@ -145,7 +145,7 @@ local function place_node (item, pos)
if not result then if not result then
if utils.settings.alert_handler_errors then if utils.settings.alert_handler_errors then
minetest.log ("error", "after_place_node handler for "..nodename.." crashed - "..msg) minetest.log ("error", "after_place_node handler for "..stack:get_name ().." crashed - "..msg)
end end
end end
end end
@@ -262,7 +262,7 @@ end
local function deployer_on (pos, node, slot, range) local function deployer_on (pos, _node, slot, range)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
range = tonumber (range) or 1 range = tonumber (range) or 1
@@ -428,7 +428,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

132
detector.lua
View File

@@ -21,7 +21,12 @@ local function mesecons_on (pos)
local node = utils.get_far_node (pos) local node = utils.get_far_node (pos)
if node then if node then
node.param1 = 1 if node.name == "lwcomponents:detector_locked_on" then
node.name = "lwcomponents:detector_locked_on_on"
elseif node.name == "lwcomponents:detector_on" then
node.name = "lwcomponents:detector_on_on"
end
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end end
end end
@@ -40,7 +45,12 @@ local function mesecons_off (pos)
local node = utils.get_far_node (pos) local node = utils.get_far_node (pos)
if node then if node then
node.param1 = 0 if node.name == "lwcomponents:detector_locked_on_on" then
node.name = "lwcomponents:detector_locked_on"
elseif node.name == "lwcomponents:detector_on_on" then
node.name = "lwcomponents:detector_on"
end
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end end
end end
@@ -145,7 +155,7 @@ local function get_entity_height (objref)
local entity = objref:get_luaentity () local entity = objref:get_luaentity ()
if entity and entity.name then if entity and entity.name then
def = minetest.registered_entities[entity.name] local def = minetest.registered_entities[entity.name]
if def and type (def.collisionbox) == "table" and if def and type (def.collisionbox) == "table" and
type (def.collisionbox[5]) == "number" then type (def.collisionbox[5]) == "number" then
@@ -343,30 +353,21 @@ end
local function start_detector (pos) local function start_detector (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:detector" then if node.name == "lwcomponents:detector" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:detector_on" node.name = "lwcomponents:detector_on"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
minetest.get_node_timer (pos):start (detect_interval) minetest.get_node_timer (pos):start (detect_interval)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:detector_locked" then elseif node.name == "lwcomponents:detector_locked" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:detector_locked_on" node.name = "lwcomponents:detector_locked_on"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
minetest.get_node_timer (pos):start (detect_interval) minetest.get_node_timer (pos):start (detect_interval)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -376,32 +377,25 @@ end
local function stop_detector (pos) local function stop_detector (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:detector_on" then if node.name == "lwcomponents:detector_on" or
local meta = minetest.get_meta (pos) node.name == "lwcomponents:detector_on_on" then
if meta then
node.name = "lwcomponents:detector" node.name = "lwcomponents:detector"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
mesecons_off (pos) mesecons_off (pos)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:detector_locked_on" then elseif node.name == "lwcomponents:detector_locked_on" or
local meta = minetest.get_meta (pos) node.name == "lwcomponents:detector_locked_on_on" then
if meta then
node.name = "lwcomponents:detector_locked" node.name = "lwcomponents:detector_locked"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
mesecons_off (pos) mesecons_off (pos)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -565,7 +559,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)
@@ -698,16 +691,31 @@ end
local function mesecon_support () local function mesecon_support_on ()
if utils.mesecon_supported then if utils.mesecon_supported then
return return
{ {
receptor = receptor =
{ {
state = utils.mesecon_state_on, state = utils.mesecon_state_on,
rules = function (node) rules = utils.mesecon_default_rules
return (node.param1 == 0 and { }) or utils.mesecon_default_rules }
}
end end
return nil
end
local function mesecon_support_off ()
if utils.mesecon_supported then
return
{
receptor =
{
state = utils.mesecon_state_off,
rules = utils.mesecon_default_rules
} }
} }
end end
@@ -732,7 +740,7 @@ minetest.register_node("lwcomponents:detector", {
drop = "lwcomponents:detector", drop = "lwcomponents:detector",
_digistuff_channelcopier_fieldname = "channel", _digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support (), mesecons = mesecon_support_off (),
digiline = digilines_support (), digiline = digilines_support (),
on_destruct = on_destruct, on_destruct = on_destruct,
@@ -761,7 +769,7 @@ minetest.register_node("lwcomponents:detector_locked", {
drop = "lwcomponents:detector_locked", drop = "lwcomponents:detector_locked",
_digistuff_channelcopier_fieldname = "channel", _digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support (), mesecons = mesecon_support_off (),
digiline = digilines_support (), digiline = digilines_support (),
on_destruct = on_destruct, on_destruct = on_destruct,
@@ -790,7 +798,7 @@ minetest.register_node("lwcomponents:detector_on", {
drop = "lwcomponents:detector", drop = "lwcomponents:detector",
_digistuff_channelcopier_fieldname = "channel", _digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support (), mesecons = mesecon_support_off (),
digiline = digilines_support (), digiline = digilines_support (),
on_destruct = on_destruct, on_destruct = on_destruct,
@@ -819,7 +827,65 @@ minetest.register_node("lwcomponents:detector_locked_on", {
drop = "lwcomponents:detector_locked", drop = "lwcomponents:detector_locked",
_digistuff_channelcopier_fieldname = "channel", _digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support (), mesecons = mesecon_support_off (),
digiline = digilines_support (),
on_destruct = on_destruct,
on_receive_fields = on_receive_fields,
can_dig = can_dig,
after_place_node = after_place_node_locked,
on_blast = on_blast,
on_timer = on_timer,
on_rightclick = on_rightclick
})
minetest.register_node("lwcomponents:detector_on_on", {
description = S("Detector"),
tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
"lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
is_ground_content = false,
groups = { cracky = 3, not_in_creative_inventory = 1 },
sounds = default.node_sound_stone_defaults (),
paramtype = "none",
param1 = 0,
paramtype2 = "facedir",
param2 = 1,
floodable = false,
drop = "lwcomponents:detector",
_digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support_on (),
digiline = digilines_support (),
on_destruct = on_destruct,
on_receive_fields = on_receive_fields,
can_dig = can_dig,
after_place_node = after_place_node,
on_blast = on_blast,
on_timer = on_timer,
on_rightclick = on_rightclick
})
minetest.register_node("lwcomponents:detector_locked_on_on", {
description = S("Detector (locked)"),
tiles = { "lwdetector_face_on.png", "lwdetector_face_on.png", "lwdetector.png",
"lwdetector.png", "lwdetector.png", "lwdetector_face_on.png"},
is_ground_content = false,
groups = { cracky = 3, not_in_creative_inventory = 1 },
sounds = default.node_sound_stone_defaults (),
paramtype = "none",
param1 = 0,
paramtype2 = "facedir",
param2 = 1,
floodable = false,
drop = "lwcomponents:detector_locked",
_digistuff_channelcopier_fieldname = "channel",
mesecons = mesecon_support_on (),
digiline = digilines_support (), digiline = digilines_support (),
on_destruct = on_destruct, on_destruct = on_destruct,

137
digiswitch.lua
View File

@@ -8,8 +8,6 @@ if utils.digilines_supported and utils.mesecon_supported then
local function get_mesecon_rule_for_side (side) local function get_mesecon_rule_for_side (side)
local base = nil
if side == "white" then if side == "white" then
return { { x = 0, y = 1, z = 0 } } return { { x = 0, y = 1, z = 0 } }
elseif side == "black" then elseif side == "black" then
@@ -108,12 +106,59 @@ end
local function get_powered_rules (node)
local rules = { }
if is_side_on (node.param1, "switch") then
rules = table.copy (utils.mesecon_default_rules)
if is_side_on (node.param1, "white") then
rules[#rules + 1] = get_mesecon_rule_for_side ("white")[1]
end
if is_side_on (node.param1, "black") then
rules[#rules + 1] = get_mesecon_rule_for_side ("black")[1]
end
else
local sides =
{
"white",
"black",
"red",
"green",
"blue",
"yellow",
}
for _, side in ipairs (sides) do
if is_side_on (node.param1, side) then
rules[#rules + 1] = get_mesecon_rule_for_side (side)[1]
end
end
end
return rules
end
local function get_node_name (node)
if node.param1 ~= 0 then
return "lwcomponents:digiswitch_on"
end
return "lwcomponents:digiswitch"
end
local function switch_on (pos, side) local function switch_on (pos, side)
utils.mesecon_receptor_on (pos, get_mesecon_rule_for_side (side)) utils.mesecon_receptor_on (pos, get_mesecon_rule_for_side (side))
local node = utils.get_far_node (pos) local node = utils.get_far_node (pos)
if node then if node then
node.param1 = set_side_bit (node.param1, side, true) node.param1 = set_side_bit (node.param1, side, true)
node.name = get_node_name (node)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end end
end end
@@ -126,6 +171,7 @@ local function switch_off (pos, side)
local node = utils.get_far_node (pos) local node = utils.get_far_node (pos)
if node then if node then
node.param1 = set_side_bit (node.param1, side, false) node.param1 = set_side_bit (node.param1, side, false)
node.name = get_node_name (node)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end end
end end
@@ -192,32 +238,37 @@ local function mesecon_support ()
{ {
receptor = receptor =
{ {
state = mesecon.state.on, state = mesecon.state.off,
rules =
rules = function (node)
if is_side_on (node.param1, "switch") then
return utils.mesecon_default_rules
end
local r = { }
local sides =
{ {
"white", { x = 0, y = 0, z = -1 },
"black", { x = 1, y = 0, z = 0 },
"red", { x = -1, y = 0, z = 0 },
"green", { x = 0, y = 0, z = 1 },
"blue", { x = 1, y = 1, z = 0 },
"yellow", { x = 1, y = -1, z = 0 },
{ x = -1, y = 1, z = 0 },
{ x = -1, y = -1, z = 0 },
{ x = 0, y = 1, z = 1 },
{ x = 0, y = -1, z = 1 },
{ x = 0, y = 1, z = -1 },
{ x = 0, y = -1, z = -1 },
{ x = 0, y = 1, z = 0 },
{ x = 0, y = -1, z = 0 }
} }
},
}
end
for _, side in ipairs (sides) do
if is_side_on (node.param1, side) then
r[#r + 1] = get_mesecon_rule_for_side (side)[1]
end
end
return r
end local function mesecon_support_on ()
return
{
receptor =
{
state = mesecon.state.on,
rules = get_powered_rules
}, },
} }
end end
@@ -243,7 +294,15 @@ end
local function on_destruct (pos) local function on_destruct (pos)
utils.mesecon_receptor_off (pos, get_mesecon_rule_for_side ()) local node = utils.get_far_node (pos)
if node then
local rules = get_powered_rules (node)
if #rules > 0 then
utils.mesecon_receptor_off (pos, rules)
end
end
end end
@@ -288,4 +347,32 @@ minetest.register_node ("lwcomponents:digiswitch", {
minetest.register_node ("lwcomponents:digiswitch_on", {
description = S("Digilines Switch"),
tiles = { "lwdigiswitch_white.png", "lwdigiswitch_black.png",
"lwdigiswitch_green.png", "lwdigiswitch_red.png",
"lwdigiswitch_yellow.png", "lwdigiswitch_blue.png" },
sunlight_propagates = false,
drawtype = "normal",
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
}
},
paramtype = "none",
param1 = 0,
groups = { cracky = 2, oddly_breakable_by_hand = 2, not_in_creative_inventory = 1 },
sounds = default.node_sound_stone_defaults (),
mesecons = mesecon_support_on (),
digiline = digilines_support (),
_digistuff_channelcopier_fieldname = "channel",
on_construct = on_construct,
on_destruct = on_destruct,
on_receive_fields = on_receive_fields,
})
end -- utils.digilines_supported and utils.mesecon_supported end -- utils.digilines_supported and utils.mesecon_supported

4
dispenser.lua
View File

@@ -139,7 +139,8 @@ local function dispense_item (pos, node, slot)
item:set_count (1) item:set_count (1)
local spawn_pos = dispense_pos (pos, node) local spawn_pos = dispense_pos (pos, node)
local owner = meta:get_string ("owner") local owner = meta:get_string ("owner")
local obj, cancel = nil, false local obj = nil
local cancel
if utils.settings.spawn_mobs then if utils.settings.spawn_mobs then
obj, cancel = utils.spawn_registered (name, obj, cancel = utils.spawn_registered (name,
@@ -318,7 +319,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

1
dropper.lua
View File

@@ -254,7 +254,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

17
dummy_player.lua
View File

@@ -22,8 +22,8 @@ local function get_dummy_player (as_player, name, pos, look_dir, controls, veloc
end end
object.set_pos = function (self, pos) object.set_pos = function (self, _pos)
obj_pos = vector.new (pos) obj_pos = vector.new (_pos)
end end
@@ -37,8 +37,8 @@ local function get_dummy_player (as_player, name, pos, look_dir, controls, veloc
end end
object.move_to = function (self, pos, continuous) object.move_to = function (self, _pos, continuous)
obj_pos = vector.new (pos) obj_pos = vector.new (_pos)
end end
@@ -55,8 +55,8 @@ local function get_dummy_player (as_player, name, pos, look_dir, controls, veloc
end end
object.set_hp = function (self, hp, reason) object.set_hp = function (self, _hp, reason)
obj_hp = hp obj_hp = _hp
end end
@@ -134,8 +134,8 @@ local function get_dummy_player (as_player, name, pos, look_dir, controls, veloc
end end
object.set_properties = function (self, properties) object.set_properties = function (self, _properties)
obj_properties = table.copy (properties or { }) obj_properties = table.copy (_properties or { })
end end
@@ -237,7 +237,6 @@ local function get_dummy_player (as_player, name, pos, look_dir, controls, veloc
object.set_fov = function (self, fov, is_multiplier, transition_time) object.set_fov = function (self, fov, is_multiplier, transition_time)
obj_breath = value
end end

3
explode.lua
View File

@@ -249,9 +249,6 @@ local function explode_entities (pos, radius, damage, drops)
if def and def.on_rightclick then if def and def.on_rightclick then
def.on_rightclick (obj:get_pos (), ItemStack (), child) def.on_rightclick (obj:get_pos (), ItemStack (), child)
local ent_damage = ((radius - dist) / radius * damage / 2) + (damage / 2)
local reason = { type = "set_hp", from = "lwcomponents" }
child:add_velocity (vel) child:add_velocity (vel)
child:set_hp (child:get_hp () - ent_damage, reason) child:set_hp (child:get_hp () - ent_damage, reason)
end end

2
fan.lua
View File

@@ -45,7 +45,6 @@ end
local function blow (pos) local function blow (pos)
local meta = minetest.get_meta (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local dir = direction_vector (node) local dir = direction_vector (node)
local reach = 5 local reach = 5
@@ -211,7 +210,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

2
force_field.lua
View File

@@ -136,7 +136,6 @@ local function check_fuel (pos, used)
end end
if used > power then if used > power then
power = 0
meta:set_float ("power", 0) meta:set_float ("power", 0)
return false return false
@@ -598,7 +597,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)

7
hologram.lua
View File

@@ -126,14 +126,14 @@ local function draw_map (pos, map)
end end
if draw then if draw then
local holonode = hologram_block[line[z]] local colornode = hologram_block[line[z]]
if node then if node then
utils.destroy_node (holopos) utils.destroy_node (holopos)
end end
if holonode then if colornode then
minetest.set_node (holopos, { name = holonode.node }) minetest.set_node (holopos, { name = colornode.node })
local nodemeta = minetest.get_meta (holopos) local nodemeta = minetest.get_meta (holopos)
@@ -231,7 +231,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

4
hopper.lua
View File

@@ -260,8 +260,8 @@ local function run_hopper_action (pos)
if registered_dest_invs then if registered_dest_invs then
local placer = get_player_object (pos) local placer = get_player_object (pos)
local src_pos = vector.add (pos, get_input_dir (node)) local src_pos = vector.add (pos, get_input_dir (node))
local drop = nil local drop
local stack = nil local stack
local slot = nil local slot = nil
local src_inv_name = nil local src_inv_name = nil

4
init.lua
View File

@@ -1,4 +1,4 @@
local version = "0.1.26" local version = "0.1.27"
local mod_storage = minetest.get_mod_storage () local mod_storage = minetest.get_mod_storage ()
@@ -17,7 +17,7 @@ local modpath = minetest.get_modpath ("lwcomponents")
loadfile (modpath.."/settings.lua") (utils) loadfile (modpath.."/settings.lua") (utils)
utils.get_dummy_player = loadfile (modpath.."/dummy_player.lua") () utils.get_dummy_player = loadfile (modpath.."/dummy_player.lua") ()
loadfile (modpath.."/utils.lua") (utils, mod_storage) loadfile (modpath.."/utils.lua") (utils)
loadfile (modpath.."/explode.lua") (utils) loadfile (modpath.."/explode.lua") (utils)
loadfile (modpath.."/api.lua") (utils) loadfile (modpath.."/api.lua") (utils)
utils.connections = loadfile (modpath.."/connections.lua") () utils.connections = loadfile (modpath.."/connections.lua") ()

6
movefloor.lua
View File

@@ -237,7 +237,7 @@ local function move_entities (list, move, players)
for _, entry in ipairs (list) do for _, entry in ipairs (list) do
if entry.obj then if entry.obj then
if players or not entry.obj:is_player () then if players or not entry.obj:is_player () then
local pos = nil local pos
if entry.obj:is_player () then if entry.obj:is_player () then
pos = vector.add (entry.pos, { x = move.x, y = move.y + 0.1, z = move.z }) pos = vector.add (entry.pos, { x = move.x, y = move.y + 0.1, z = move.z })
@@ -311,7 +311,7 @@ local function move_nodes (list, move)
end end
if list[i].timeout > 0 then if list[i].timeout > 0 then
timer = minetest.get_node_timer (pos) local timer = minetest.get_node_timer (pos)
if timer then if timer then
timer:set (list[i].timeout, list[i].elapsed) timer:set (list[i].timeout, list[i].elapsed)
@@ -334,7 +334,7 @@ local function move_nodes (list, move)
end end
if list[i].timeout > 0 then if list[i].timeout > 0 then
timer = minetest.get_node_timer (pos) local timer = minetest.get_node_timer (pos)
if timer then if timer then
timer:set (list[i].timeout, list[i].elapsed) timer:set (list[i].timeout, list[i].elapsed)

4
pistons.lua
View File

@@ -884,7 +884,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end
@@ -1070,7 +1069,7 @@ minetest.register_node("lwcomponents:piston_blank_1", {
minetest.register_node("lwcomponents:piston_blank_2", { minetest.register_node("lwcomponents:piston_blank_2", {
description = S("Piston blank"), description = S("Piston blank"),
drawtype = "airlike", drawtype = "airlike",
paramtype = "none", paramtype = "light",
param1 = 0, param1 = 0,
paramtype2 = "facedir", paramtype2 = "facedir",
param2 = 0, param2 = 0,
@@ -1092,7 +1091,6 @@ minetest.register_node("lwcomponents:piston_blank_2", {
is_ground_content = false, is_ground_content = false,
drop = "", drop = "",
groups = { not_in_creative_inventory = 1 }, groups = { not_in_creative_inventory = 1 },
paramtype = "light",
-- unaffected by explosions -- unaffected by explosions
on_blast = function() end, on_blast = function() end,
}) })

7
player_button.lua
View File

@@ -69,7 +69,6 @@ end
local function player_button_turnoff (pos) local function player_button_turnoff (pos)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos)
if node.name == "lwcomponents:player_button_on" then if node.name == "lwcomponents:player_button_on" then
node.name = "lwcomponents:player_button_off" node.name = "lwcomponents:player_button_off"
@@ -85,7 +84,7 @@ end
minetest.register_node ("lwcomponents:player_button", { minetest.register_node ("lwcomponents:player_button", {
description = "Player Button", description = S("Player Button"),
drawtype = "nodebox", drawtype = "nodebox",
tiles = { tiles = {
"lwplayer_button_side.png", "lwplayer_button_side.png",
@@ -134,7 +133,7 @@ minetest.register_node ("lwcomponents:player_button", {
minetest.register_node ("lwcomponents:player_button_off", { minetest.register_node ("lwcomponents:player_button_off", {
description = "Player Button", description = S("Player Button"),
drawtype = "nodebox", drawtype = "nodebox",
tiles = { tiles = {
"lwplayer_button_side.png", "lwplayer_button_side.png",
@@ -184,7 +183,7 @@ minetest.register_node ("lwcomponents:player_button_off", {
minetest.register_node ("lwcomponents:player_button_on", { minetest.register_node ("lwcomponents:player_button_on", {
description = "Player Button", description = S("Player Button"),
drawtype = "nodebox", drawtype = "nodebox",
tiles = { tiles = {
"lwplayer_button_side.png", "lwplayer_button_side.png",

32
puncher.lua
View File

@@ -97,13 +97,8 @@ local function punch (pos)
punched = true punched = true
end end
elseif object[i].get_luaentity and object[i]:get_luaentity () and elseif not utils.is_drop (object[i]) and object[i].get_pos
object[i]:get_luaentity ().name and and object[i]:get_pos () then
object[i]:get_luaentity ().name == "__builtin:item" then
-- don't punch drops
elseif object[i].get_pos and object[i]:get_pos () then
-- entity -- entity
if meta:get_string ("entities") == "true" then if meta:get_string ("entities") == "true" then
@@ -180,28 +175,19 @@ end
local function start_puncher (pos) local function start_puncher (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:puncher" then if node.name == "lwcomponents:puncher" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:puncher_on" node.name = "lwcomponents:puncher_on"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:puncher_locked" then elseif node.name == "lwcomponents:puncher_locked" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:puncher_locked_on" node.name = "lwcomponents:puncher_locked_on"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -211,28 +197,19 @@ end
local function stop_puncher (pos) local function stop_puncher (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:puncher_on" then if node.name == "lwcomponents:puncher_on" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:puncher" node.name = "lwcomponents:puncher"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:puncher_locked_on" then elseif node.name == "lwcomponents:puncher_locked_on" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:puncher_locked" node.name = "lwcomponents:puncher_locked"
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -365,7 +342,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end

2
readme.txt
View File

@@ -13,7 +13,7 @@ CC BY-SA 3.0
Version Version
======= =======
0.1.26 0.1.27
Minetest Version Minetest Version

45
siren.lua
View File

@@ -103,30 +103,21 @@ end
local function start_siren (pos) local function start_siren (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:siren" then if node.name == "lwcomponents:siren" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_on" node.name = "lwcomponents:siren_on"
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:siren_locked" then elseif node.name == "lwcomponents:siren_locked" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_locked_on" node.name = "lwcomponents:siren_locked_on"
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -136,34 +127,25 @@ end
local function stop_siren (pos) local function stop_siren (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:siren_on" or if node.name == "lwcomponents:siren_on" or
node.name == "lwcomponents:siren_alarm" then node.name == "lwcomponents:siren_alarm" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren" node.name = "lwcomponents:siren"
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
elseif node.name == "lwcomponents:siren_locked_on" or elseif node.name == "lwcomponents:siren_locked_on" or
node.name == "lwcomponents:siren_locked_alarm" then node.name == "lwcomponents:siren_locked_alarm" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_locked" node.name = "lwcomponents:siren_locked"
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
update_form_spec (pos) update_form_spec (pos)
end
end end
end end
@@ -173,30 +155,21 @@ end
local function start_alarm (pos) local function start_alarm (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:siren_on" then if node.name == "lwcomponents:siren_on" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_alarm" node.name = "lwcomponents:siren_alarm"
minetest.get_node_timer (pos):start (sound_interval) minetest.get_node_timer (pos):start (sound_interval)
start_sound (pos) start_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end
elseif node.name == "lwcomponents:siren_locked_on" then elseif node.name == "lwcomponents:siren_locked_on" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_locked_alarm" node.name = "lwcomponents:siren_locked_alarm"
minetest.get_node_timer (pos):start (sound_interval) minetest.get_node_timer (pos):start (sound_interval)
start_sound (pos) start_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end
end end
end end
@@ -206,30 +179,21 @@ end
local function stop_alarm (pos) local function stop_alarm (pos)
local node = minetest.get_node (pos) local node = minetest.get_node (pos)
local meta = minetest.get_meta (pos)
if node and meta then if node then
if node.name == "lwcomponents:siren_alarm" then if node.name == "lwcomponents:siren_alarm" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_on" node.name = "lwcomponents:siren_on"
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end
elseif node.name == "lwcomponents:siren_locked_alarm" then elseif node.name == "lwcomponents:siren_locked_alarm" then
local meta = minetest.get_meta (pos)
if meta then
node.name = "lwcomponents:siren_locked_on" node.name = "lwcomponents:siren_locked_on"
minetest.get_node_timer (pos):stop () minetest.get_node_timer (pos):stop ()
stop_sound (pos) stop_sound (pos)
minetest.swap_node (pos, node) minetest.swap_node (pos, node)
end
end end
end end
@@ -365,7 +329,6 @@ local function on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos) on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)

10
storage.lua
View File

@@ -87,7 +87,6 @@ local function unit_on_blast (pos, intensity)
end end
end end
on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)
else -- intensity < 1.0 else -- intensity < 1.0
@@ -113,9 +112,7 @@ local function unit_on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end
end end
@@ -312,7 +309,7 @@ local function get_stock_list (pos)
for k, v in pairs (inv_list) do for k, v in pairs (inv_list) do
local stack = ItemStack (k) local stack = ItemStack (k)
local name = stack:get_name () local name = stack:get_name ()
local description = nil local description
local custom = false local custom = false
local pallet_index = nil local pallet_index = nil
local tstack = stack:to_table () local tstack = stack:to_table ()
@@ -704,8 +701,6 @@ local function get_formspec_list (pos)
for k, v in pairs (inv_list) do for k, v in pairs (inv_list) do
local description = k local description = k
local stack = ItemStack (k) local stack = ItemStack (k)
local smeta = stack:get_meta ()
if stack:get_short_description () ~= "" then if stack:get_short_description () ~= "" then
description = stack:get_short_description () description = stack:get_short_description ()
@@ -942,7 +937,6 @@ local function indexer_on_blast (pos, intensity)
end end
end end
on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)
else -- intensity < 1.0 else -- intensity < 1.0
@@ -978,9 +972,7 @@ local function indexer_on_blast (pos, intensity)
local stack = ItemStack (items[1]) local stack = ItemStack (items[1])
if stack then if stack then
preserve_metadata (pos, node, meta, { stack })
utils.item_drop (stack, nil, pos) utils.item_drop (stack, nil, pos)
on_destruct (pos)
minetest.remove_node (pos) minetest.remove_node (pos)
end end
end end

2
utils.lua
View File

@@ -1,4 +1,4 @@
local utils, mod_storage = ... local utils = ...