Add files via upload
This commit is contained in:
loosewheel
GitHub
14
camera.lua
14
camera.lua
@@ -7,18 +7,6 @@ if utils.digilines_supported then
|
||||
|
||||
|
||||
|
||||
local function is_drop (obj)
|
||||
if obj then
|
||||
local entity = obj.get_luaentity and obj:get_luaentity ()
|
||||
|
||||
return (entity and entity.name and entity.name == "__builtin:item")
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function get_entity_dims (obj)
|
||||
local dims = { -0.5, 0, -0.5, 0.5, 2, 0.5 }
|
||||
local found = false
|
||||
@@ -88,7 +76,7 @@ local function get_entity (pos)
|
||||
end
|
||||
end
|
||||
|
||||
if not is_drop (obj) then
|
||||
if not utils.is_drop (obj) then
|
||||
local epos = vector.new (obj:get_pos ())
|
||||
local dims = get_entity_dims (obj)
|
||||
|
||||
|
||||
@@ -144,3 +144,12 @@ v0.1.24
|
||||
* Fixed bug in utils.is_same_item ().
|
||||
* Added force field generators.
|
||||
* Removed immortal from cannon shells (shells test for same type of shell and ignore).
|
||||
|
||||
|
||||
v0.1.25
|
||||
* Added hoppers.
|
||||
* Added "inventory" message to conduits.
|
||||
* Removed digilines or mesecons requirement for conduits.
|
||||
* Improved unescaping item description.
|
||||
* Fixed custom item output from storage.
|
||||
* Added filtering to conduit forms.
|
||||
|
||||
421
conduit.lua
421
conduit.lua
@@ -3,17 +3,13 @@ local S = utils.S
|
||||
|
||||
|
||||
|
||||
if utils.digilines_supported or utils.mesecon_supported then
|
||||
|
||||
|
||||
|
||||
local transfer_rate = 0.1
|
||||
local conduit_interval = 1.0
|
||||
local conduit_connections = utils.connections:new (mod_storage, "conduit_connections")
|
||||
|
||||
|
||||
-- forward declare
|
||||
local run_initialize_forward = nil
|
||||
local run_initialize = nil
|
||||
|
||||
|
||||
|
||||
@@ -55,6 +51,34 @@ end
|
||||
|
||||
|
||||
|
||||
local function get_target_for_item (meta, inv, stack)
|
||||
if meta then
|
||||
if inv then
|
||||
local slots = inv:get_size ("filter")
|
||||
|
||||
for slot = 1, slots, 1 do
|
||||
local s = inv:get_stack ("filter", slot)
|
||||
|
||||
if s and not s:is_empty () and utils.is_same_item (s, stack) then
|
||||
local target = meta:get_string ("target"..slot)
|
||||
|
||||
if target ~= "" then
|
||||
return target
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if meta:get_string ("target") ~= "" then
|
||||
return meta:get_string ("target")
|
||||
end
|
||||
end
|
||||
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function deliver_slot (pos, slot)
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
@@ -222,7 +246,7 @@ local function add_to_send_list (pos, item, destpos, distance)
|
||||
|
||||
meta:set_string ("transfer_data", minetest.serialize (transfer_data))
|
||||
|
||||
run_initialize_forward (pos)
|
||||
run_initialize (pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -235,9 +259,7 @@ local function send_to_target (pos, target, slot)
|
||||
if meta then
|
||||
local inv = meta:get_inventory ()
|
||||
|
||||
target = (target and tostring (target)) or meta:get_string ("target")
|
||||
|
||||
if inv and target:len () > 0 then
|
||||
if inv then
|
||||
if not slot then
|
||||
local slots = inv:get_size ("main")
|
||||
|
||||
@@ -245,10 +267,12 @@ local function send_to_target (pos, target, slot)
|
||||
local stack = inv:get_stack ("main", i)
|
||||
|
||||
if not stack:is_empty () and stack:get_count () > 0 then
|
||||
if target or get_target_for_item (meta, inv, stack) then
|
||||
slot = i
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
elseif type (slot) == "string" then
|
||||
local name = slot
|
||||
@@ -275,11 +299,14 @@ local function send_to_target (pos, target, slot)
|
||||
if slot then
|
||||
local stack = inv:get_stack ("main", slot)
|
||||
|
||||
if not stack:is_empty () and stack:get_count () > 0 then
|
||||
if stack and not stack:is_empty () then
|
||||
local name = stack:get_name ()
|
||||
local item = ItemStack (stack)
|
||||
|
||||
if item then
|
||||
target = (target and tostring (target)) or
|
||||
get_target_for_item (meta, inv, stack)
|
||||
|
||||
if item and target then
|
||||
item:set_count (1)
|
||||
|
||||
local tpos, distance = conduit_connections:is_connected (pos, target)
|
||||
@@ -311,11 +338,50 @@ end
|
||||
|
||||
|
||||
|
||||
local function get_formspec (pos)
|
||||
local meta = minetest.get_meta (pos)
|
||||
local automatic = "false"
|
||||
local filters = ""
|
||||
|
||||
if meta then
|
||||
automatic = meta:get_string ("automatic")
|
||||
end
|
||||
|
||||
for i = 1, 8, 1 do
|
||||
filters = string.format ("%sfield[12.7,%0.2f;3.0,0.8;target%d;;${target%d}]"..
|
||||
"button[15.9,%0.2f;1.5,0.8;settarget%d;Set]",
|
||||
filters,
|
||||
(i * 1.25) + 0.35,
|
||||
i,
|
||||
i,
|
||||
(i * 1.25) + 0.35,
|
||||
i)
|
||||
end
|
||||
|
||||
return
|
||||
"formspec_version[3]"..
|
||||
"size[18.4,12.25;true]"..
|
||||
"field[1.0,1.5;3.0,0.8;channel;Channel;${channel}]"..
|
||||
"button[4.2,1.5;1.5,0.8;setchannel;Set]"..
|
||||
"field[1.0,3.0;3.0,0.8;target;Target;${target}]"..
|
||||
"button[4.2,3.0;1.5,0.8;settarget;Set]"..
|
||||
"checkbox[1.0,4.5;automatic;Automatic;"..automatic.."]"..
|
||||
"list[context;main;6.0,1.0;4,4;]"..
|
||||
"list[current_player;main;1.0,6.5;8,4;]"..
|
||||
"listring[]"..
|
||||
"label[11.5,1.25;Filter]"..
|
||||
"list[context;filter;11.5,1.5;1,8;]"..
|
||||
filters
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function run_conduit (pos, id)
|
||||
local node = utils.get_far_node (pos)
|
||||
|
||||
if node and (node.name == "lwcomponents:conduit" or
|
||||
node.name == "lwcomponents:conduit_locked") then
|
||||
if node then
|
||||
if node.name == "lwcomponents:conduit" or
|
||||
node.name == "lwcomponents:conduit_locked" then
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta and id == meta:get_int ("conduit_id") then
|
||||
@@ -331,12 +397,15 @@ local function run_conduit (pos, id)
|
||||
meta:set_int ("run_active", 0)
|
||||
end
|
||||
end
|
||||
else
|
||||
conduit_connections:remove_node (pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function run_initialize (pos)
|
||||
run_initialize = function (pos)
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta then
|
||||
@@ -346,29 +415,96 @@ local function run_initialize (pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
run_initialize_forward = run_initialize
|
||||
|
||||
|
||||
|
||||
local function get_formspec (pos)
|
||||
local meta = minetest.get_meta (pos)
|
||||
local automatic = "false"
|
||||
local function count_table_keys (t)
|
||||
local count = 0
|
||||
|
||||
if meta then
|
||||
automatic = meta:get_string ("automatic")
|
||||
for k, v in pairs (t) do
|
||||
count = count + 1
|
||||
end
|
||||
|
||||
return count
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function send_inventory_message (pos)
|
||||
if utils.digilines_supported then
|
||||
local meta = minetest.get_meta (pos)
|
||||
local inv = (meta and meta:get_inventory ()) or nil
|
||||
|
||||
if meta and inv then
|
||||
local channel = meta:get_string ("channel")
|
||||
|
||||
if channel:len () > 0 then
|
||||
local inventory = { }
|
||||
local slots = inv:get_size ("main")
|
||||
|
||||
for slot = 1, slots, 1 do
|
||||
local stack = inv:get_stack ("main", slot)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
local name = stack:get_name ()
|
||||
local description = nil
|
||||
local custom = false
|
||||
local pallet_index = nil
|
||||
local tstack = stack:to_table ()
|
||||
|
||||
if tstack and tstack.meta and count_table_keys (tstack.meta) > 0 then
|
||||
custom = true
|
||||
|
||||
pallet_index = tstack.meta.palette_index
|
||||
end
|
||||
|
||||
if stack:get_short_description () ~= "" then
|
||||
description = stack:get_short_description ()
|
||||
elseif stack:get_description () ~= "" then
|
||||
description = stack:get_description ()
|
||||
else
|
||||
description = name
|
||||
|
||||
local def = utils.find_item_def (name)
|
||||
|
||||
if def then
|
||||
if def.short_description then
|
||||
description = def.short_description
|
||||
elseif def.description then
|
||||
description = def.description
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
inventory[slot] =
|
||||
{
|
||||
name = stack:get_name (),
|
||||
description = utils.unescape_description (description),
|
||||
count = stack:get_count (),
|
||||
custom = custom,
|
||||
pallet_index = pallet_index,
|
||||
}
|
||||
else
|
||||
inventory[slot] =
|
||||
{
|
||||
name = "",
|
||||
description = "",
|
||||
count = 0,
|
||||
custom = false,
|
||||
pallet_index = nil,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
utils.digilines_receptor_send (pos,
|
||||
utils.digilines_default_rules,
|
||||
channel,
|
||||
{ action = "inventory",
|
||||
inventory = inventory })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
"formspec_version[3]\n"..
|
||||
"size[11.75,12.25;true]\n"..
|
||||
"field[1.0,1.5;3.0,0.8;channel;Channel;${channel}]\n"..
|
||||
"button[4.2,1.5;1.5,0.8;setchannel;Set]\n"..
|
||||
"field[1.0,3.0;3.0,0.8;target;Target;${target}]\n"..
|
||||
"button[4.2,3.0;1.5,0.8;settarget;Set]\n"..
|
||||
"checkbox[1.0,4.5;automatic;Automatic;"..automatic.."]\n"..
|
||||
"list[context;main;6.0,1.0;4,4;]\n"..
|
||||
"list[current_player;main;1.0,6.5;8,4;]\n"..
|
||||
"listring[]"
|
||||
end
|
||||
|
||||
|
||||
@@ -394,7 +530,7 @@ local function after_place_base (pos, placer, itemstack, pointed_thing)
|
||||
"field[0.5,1.0;6.0,0.8;channel;Channel;${channel}]"..
|
||||
"button[2.0,2.3;3.0,0.8;setchannel;Set]"
|
||||
|
||||
meta:set_string ("inventory", "{ main = { }, transfer = { } }")
|
||||
meta:set_string ("inventory", "{ main = { }, transfer = { }, filter = { } }")
|
||||
meta:set_string ("formspec", spec)
|
||||
meta:set_string ("transfer_data", minetest.serialize({ }))
|
||||
meta:set_string ("automatic", "false")
|
||||
@@ -407,6 +543,9 @@ local function after_place_base (pos, placer, itemstack, pointed_thing)
|
||||
|
||||
inv:set_size ("transfer", 32)
|
||||
inv:set_width ("transfer", 8)
|
||||
|
||||
inv:set_size ("filter", 8)
|
||||
inv:set_width ("filter", 1)
|
||||
end
|
||||
|
||||
|
||||
@@ -526,9 +665,25 @@ local function on_receive_fields (pos, formname, fields, sender)
|
||||
meta:set_string ("automatic", fields.automatic)
|
||||
meta:set_string ("formspec", get_formspec (pos))
|
||||
|
||||
if fields.automatic == "true" then
|
||||
meta:set_int ("run_active", 0)
|
||||
end
|
||||
|
||||
run_initialize (pos)
|
||||
end
|
||||
end
|
||||
|
||||
for i = 1, 8, 1 do
|
||||
if fields[string.format ("settarget%d", i)] then
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta then
|
||||
local name = string.format ("target%d", i)
|
||||
|
||||
meta:set_string (name, fields[name])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -622,6 +777,87 @@ end
|
||||
|
||||
|
||||
|
||||
local function allow_metadata_inventory_put (pos, listname, index, stack, player)
|
||||
if listname == "filter" then
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta then
|
||||
local inv = meta:get_inventory ()
|
||||
|
||||
if inv then
|
||||
inv:set_stack ("filter", index, ItemStack (stack:get_name ()))
|
||||
end
|
||||
end
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
return stack:get_stack_max ()
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function allow_metadata_inventory_take (pos, listname, index, stack, player)
|
||||
if listname == "filter" then
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta then
|
||||
local inv = meta:get_inventory ()
|
||||
|
||||
if inv then
|
||||
inv:set_stack ("filter", index, nil)
|
||||
end
|
||||
end
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
return stack:get_stack_max ()
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function allow_metadata_inventory_move (pos, from_list, from_index,
|
||||
to_list, to_index, count, player)
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
if meta then
|
||||
local inv = meta:get_inventory ()
|
||||
|
||||
if inv then
|
||||
if from_list == "filter" then
|
||||
if to_list == "filter" then
|
||||
return 1
|
||||
end
|
||||
|
||||
inv:set_stack ("filter", from_index, nil)
|
||||
|
||||
return 0
|
||||
|
||||
elseif to_list == "filter" then
|
||||
local stack = inv:get_stack (from_list, from_index)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
inv:set_stack ("filter", to_index, ItemStack (stack:get_name ()))
|
||||
end
|
||||
|
||||
return 0
|
||||
|
||||
else
|
||||
local stack = inv:get_stack (from_list, from_index)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
return stack:get_stack_max ()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return utils.settings.default_stack_max
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function digilines_support ()
|
||||
if utils.digilines_supported then
|
||||
return
|
||||
@@ -655,6 +891,9 @@ local function digilines_support ()
|
||||
elseif m[1] == "transfer" then
|
||||
send_to_target (pos)
|
||||
|
||||
elseif m[1] == "inventory" then
|
||||
send_inventory_message (pos)
|
||||
|
||||
end
|
||||
|
||||
elseif type (msg) == "table" then
|
||||
@@ -797,12 +1036,48 @@ end
|
||||
|
||||
minetest.register_node("lwcomponents:conduit", {
|
||||
description = S("Conduit"),
|
||||
drawtype = "glasslike_framed",
|
||||
tiles = { "lwconduit_edge.png", "lwconduit.png" },
|
||||
tiles = { "lwconduit.png" },
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
connect_sides = { "top", "bottom", "front", "back", "left", "right" },
|
||||
connects_to = { "lwcomponents:conduit", "lwcomponents:conduit_locked",
|
||||
"lwcomponents:hopper", "lwcomponents:hopper_horz",
|
||||
"hopper:hopper", "hopper:hopper_side",
|
||||
"group:tube", "pipeworks:filter", "pipeworks:mese_filter",
|
||||
"pipeworks:digiline_filter" },
|
||||
selection_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
collision_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
is_ground_content = false,
|
||||
groups = table.copy (conduit_groups),
|
||||
sounds = default.node_sound_stone_defaults (),
|
||||
paramtype = "none",
|
||||
paramtype = "light",
|
||||
param1 = 0,
|
||||
paramtype2 = "none",
|
||||
param2 = 0,
|
||||
@@ -820,19 +1095,59 @@ minetest.register_node("lwcomponents:conduit", {
|
||||
can_dig = can_dig,
|
||||
after_dig_node = utils.pipeworks_after_dig,
|
||||
on_blast = on_blast,
|
||||
on_rightclick = on_rightclick
|
||||
on_rightclick = on_rightclick,
|
||||
allow_metadata_inventory_put = allow_metadata_inventory_put,
|
||||
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
||||
allow_metadata_inventory_move = allow_metadata_inventory_move
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
||||
minetest.register_node("lwcomponents:conduit_locked", {
|
||||
description = S("Conduit (locked)"),
|
||||
drawtype = "glasslike_framed",
|
||||
tiles = { "lwconduit_edge.png", "lwconduit.png" },
|
||||
tiles = { "lwconduit.png" },
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
connect_sides = { "top", "bottom", "front", "back", "left", "right" },
|
||||
connects_to = { "lwcomponents:conduit", "lwcomponents:conduit_locked",
|
||||
"lwcomponents:hopper", "lwcomponents:hopper_horz",
|
||||
"hopper:hopper", "hopper:hopper_side",
|
||||
"group:tube", "pipeworks:filter", "pipeworks:mese_filter",
|
||||
"pipeworks:digiline_filter" },
|
||||
selection_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
collision_box = {
|
||||
type = "connected",
|
||||
fixed = { -0.375, -0.375, -0.375, 0.375, 0.375, 0.375 }, -- body
|
||||
connect_top = { -0.3125, 0.3125, -0.3125, 0.3125, 0.5, 0.3125 }, -- top
|
||||
connect_bottom = {-0.3125, -0.5, -0.3125, 0.3125, -0.3125, 0.3125}, -- down
|
||||
connect_front = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, -0.3125 }, -- front
|
||||
connect_back = { -0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125 }, -- back
|
||||
connect_left = { -0.5, -0.3125, -0.3125, -0.3125, 0.3125, 0.3125 }, -- left
|
||||
connect_right = { 0.3125, -0.3125, -0.3125, 0.5, 0.3125, 0.3125 }, -- right
|
||||
},
|
||||
is_ground_content = false,
|
||||
groups = table.copy (conduit_groups),
|
||||
sounds = default.node_sound_stone_defaults (),
|
||||
paramtype = "none",
|
||||
paramtype = "light",
|
||||
param1 = 0,
|
||||
paramtype2 = "none",
|
||||
param2 = 0,
|
||||
@@ -850,7 +1165,10 @@ minetest.register_node("lwcomponents:conduit_locked", {
|
||||
can_dig = can_dig,
|
||||
after_dig_node = utils.pipeworks_after_dig,
|
||||
on_blast = on_blast,
|
||||
on_rightclick = on_rightclick
|
||||
on_rightclick = on_rightclick,
|
||||
allow_metadata_inventory_put = allow_metadata_inventory_put,
|
||||
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
||||
allow_metadata_inventory_move = allow_metadata_inventory_move
|
||||
})
|
||||
|
||||
|
||||
@@ -896,6 +1214,25 @@ local function convert_conduits ()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- added v0.1.25 (2-3-22)
|
||||
local tmeta = meta:to_table ()
|
||||
|
||||
if tmeta and tmeta.inventory then
|
||||
if not tmeta.inventory.filter then
|
||||
tmeta.inventory.filter =
|
||||
{
|
||||
[1] = "", [2] = "", [3] = "", [4] = "",
|
||||
[5] = "", [6] = "", [7] = "", [8] = ""
|
||||
}
|
||||
|
||||
meta:from_table (tmeta)
|
||||
|
||||
if meta:get_string ("channel") ~= "" then
|
||||
meta:set_string ("formspec", get_formspec (data.pos))
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -912,7 +1249,7 @@ local function restart_conduits ()
|
||||
local meta = minetest.get_meta (data.pos)
|
||||
|
||||
if meta and meta:get_int ("run_active") ~= 0 then
|
||||
minetest.after (conduit_interval + (math.random (9) / 10),
|
||||
minetest.after (conduit_interval + (math.random (10) / 10),
|
||||
run_conduit, data.pos, meta:get_int ("conduit_id"))
|
||||
end
|
||||
end
|
||||
@@ -927,4 +1264,4 @@ end)
|
||||
|
||||
|
||||
|
||||
end -- utils.digilines_supported or utils.mesecon_supported
|
||||
--
|
||||
|
||||
54
crafting.lua
54
crafting.lua
@@ -81,6 +81,26 @@ minetest.register_craft( {
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:conduit 5",
|
||||
recipe = {
|
||||
{ "default:stone", "", "default:stone" },
|
||||
{ "", "default:chest", "" },
|
||||
{ "default:stone", "default:steel_ingot", "default:stone" },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:conduit_locked 5",
|
||||
recipe = {
|
||||
{ "default:stone", "", "default:stone" },
|
||||
{ "", "default:chest_locked", "" },
|
||||
{ "default:stone", "default:steel_ingot", "default:stone" },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:cannon_shell 10",
|
||||
recipe = {
|
||||
@@ -100,6 +120,7 @@ minetest.register_craft( {
|
||||
|
||||
|
||||
if minetest.global_exists ("fire") then
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:cannon_fire_shell 10",
|
||||
recipe = {
|
||||
@@ -107,6 +128,7 @@ minetest.register_craft( {
|
||||
{ "default:iron_lump", "default:coalblock" },
|
||||
},
|
||||
})
|
||||
|
||||
end -- minetest.global_exists ("fire")
|
||||
|
||||
|
||||
@@ -124,6 +146,18 @@ minetest.register_craft( {
|
||||
end -- utils.mesecon_supported
|
||||
|
||||
|
||||
if utils.hopper_supported then
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:hopper",
|
||||
recipe = {
|
||||
{ "default:stone", "default:steel_ingot", "default:stone" },
|
||||
{ "", "default:stone", "" },
|
||||
},
|
||||
})
|
||||
|
||||
end
|
||||
|
||||
|
||||
if utils.digilines_supported or utils.mesecon_supported then
|
||||
|
||||
@@ -271,26 +305,6 @@ minetest.register_craft( {
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:conduit 5",
|
||||
recipe = {
|
||||
{ "default:stone", "", "default:stone" },
|
||||
{ "", "default:chest", "" },
|
||||
{ "default:stone", "default:steel_ingot", "default:stone" },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "lwcomponents:conduit_locked 5",
|
||||
recipe = {
|
||||
{ "default:stone", "", "default:stone" },
|
||||
{ "", "default:chest_locked", "" },
|
||||
{ "default:stone", "default:steel_ingot", "default:stone" },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft({
|
||||
output = "lwcomponents:piston 2",
|
||||
recipe = {
|
||||
|
||||
438
dummy_player.lua
Normal file
438
dummy_player.lua
Normal file
@@ -0,0 +1,438 @@
|
||||
|
||||
|
||||
local function get_dummy_player (as_player, name, pos, look_dir, controls, velocity,
|
||||
hp, armor_groups, properties, nametag, breath)
|
||||
local obj_as_player = as_player ~= false
|
||||
local obj_name = name or ""
|
||||
local obj_pos = vector.new (pos or { x = 0, y = 0, z = 0 })
|
||||
local obj_look_dir = vector.new (look_dir or { x = 0, y = 0, z = 0 })
|
||||
local obj_controls = table.copy (controls or { })
|
||||
local obj_velocity = vector.new (velocity or { x = 0, y = 0, z = 0 })
|
||||
local obj_hp = hp or 20
|
||||
local obj_armor_groups = table.copy (armor_groups or { })
|
||||
local obj_properties = table.copy (properties or { })
|
||||
local obj_nametag = table.copy (nametag or { })
|
||||
local obj_breath = breath or 20
|
||||
|
||||
local object = { }
|
||||
|
||||
-- common
|
||||
object.get_pos = function (self)
|
||||
return vector.new (obj_pos)
|
||||
end
|
||||
|
||||
|
||||
object.set_pos = function (self, pos)
|
||||
obj_pos = vector.new (pos)
|
||||
end
|
||||
|
||||
|
||||
object.get_velocity = function (self)
|
||||
return vector.new (obj_velocity)
|
||||
end
|
||||
|
||||
|
||||
object.add_velocity = function (self, vel)
|
||||
obj_velocity = vector.add (obj_velocity, vel)
|
||||
end
|
||||
|
||||
|
||||
object.move_to = function (self, pos, continuous)
|
||||
obj_pos = vector.new (pos)
|
||||
end
|
||||
|
||||
|
||||
object.punch = function (self, puncher, time_from_last_punch, tool_capabilities, direction)
|
||||
end
|
||||
|
||||
|
||||
object.right_click = function (self, clicker)
|
||||
end
|
||||
|
||||
|
||||
object.get_hp = function (self)
|
||||
return obj_hp
|
||||
end
|
||||
|
||||
|
||||
object.set_hp = function (self, hp, reason)
|
||||
obj_hp = hp
|
||||
end
|
||||
|
||||
|
||||
object.get_inventory = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.get_wield_list = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.get_wield_index = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.get_wielded_item = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_wielded_item = function (self, item)
|
||||
end
|
||||
|
||||
|
||||
object.set_armor_groups = function (self, groups)
|
||||
obj_armor_groups = groups
|
||||
end
|
||||
|
||||
|
||||
object.get_armor_groups = function (self)
|
||||
return table.copy (obj_armor_groups)
|
||||
end
|
||||
|
||||
|
||||
object.set_animation = function (self, frame_range, frame_speed, frame_blend, frame_loop)
|
||||
end
|
||||
|
||||
|
||||
object.get_animation = function (self)
|
||||
return { x = 1, y = 1 }, 15.0, 0.0, true
|
||||
end
|
||||
|
||||
|
||||
object.set_animation_frame_speed = function (self, frame_speed)
|
||||
end
|
||||
|
||||
|
||||
object.set_attach = function (self, parent, bone, position, rotation, forced_visible)
|
||||
end
|
||||
|
||||
|
||||
object.get_attach = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.get_children = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.set_detach = function (self)
|
||||
end
|
||||
|
||||
|
||||
object.set_bone_position = function (self, bone, position, rotation)
|
||||
end
|
||||
|
||||
|
||||
object.get_bone_position = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_properties = function (self, properties)
|
||||
obj_properties = table.copy (properties or { })
|
||||
end
|
||||
|
||||
|
||||
object.get_properties = function (self)
|
||||
return table.copy (obj_properties)
|
||||
end
|
||||
|
||||
|
||||
object.is_player = function (self)
|
||||
return obj_as_player
|
||||
end
|
||||
|
||||
|
||||
object.get_nametag_attributes = function (self)
|
||||
return obj_nametag
|
||||
end
|
||||
|
||||
|
||||
object.set_nametag_attributes = function (self, attributes)
|
||||
obj_nametag = table.copy (attributes)
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- player
|
||||
object.get_player_name = function (self)
|
||||
return obj_name
|
||||
end
|
||||
|
||||
|
||||
object.get_player_velocity = function (self)
|
||||
return table.copy (obj_velocity)
|
||||
end
|
||||
|
||||
|
||||
object.add_player_velocity = function (self, vel)
|
||||
obj_velocity = vector.add (obj_velocity, vel)
|
||||
end
|
||||
|
||||
|
||||
object.get_look_dir = function (self)
|
||||
return table.copy (obj_look_dir)
|
||||
end
|
||||
|
||||
|
||||
object.get_look_vertical = function (self)
|
||||
return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).x
|
||||
end
|
||||
|
||||
|
||||
object.get_look_horizontal = function (self)
|
||||
return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).y
|
||||
end
|
||||
|
||||
|
||||
object.set_look_vertical = function (self, radians)
|
||||
obj_look_dir = vector.new ({ x = radians, y = obj_look_dir.y, z = obj_look_dir.z })
|
||||
end
|
||||
|
||||
|
||||
object.set_look_horizontal = function (self, radians)
|
||||
obj_look_dir = vector.new ({ x = obj_look_dir.x, y = radians, z = obj_look_dir.z })
|
||||
end
|
||||
|
||||
|
||||
object.get_look_pitch = function (self)
|
||||
return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).x
|
||||
end
|
||||
|
||||
|
||||
object.get_look_yaw = function (self)
|
||||
return vector.dir_to_rotation (obj_look_dir, { x = 0, y = 1, z = 0 }).y
|
||||
end
|
||||
|
||||
|
||||
object.set_look_pitch = function (self, radians)
|
||||
obj_look_dir = vector.new ({ x = radians, y = obj_look_dir.y, z = obj_look_dir.z })
|
||||
end
|
||||
|
||||
|
||||
object.set_look_yaw = function (self, radians)
|
||||
obj_look_dir = vector.new ({ x = obj_look_dir.x, y = radians, z = obj_look_dir.z })
|
||||
end
|
||||
|
||||
|
||||
object.get_breath = function (self)
|
||||
return obj_breath
|
||||
end
|
||||
|
||||
|
||||
object.set_breath = function (self, value)
|
||||
obj_breath = value
|
||||
end
|
||||
|
||||
|
||||
object.get_fov = function (self)
|
||||
return 0, false, 0
|
||||
end
|
||||
|
||||
|
||||
object.set_fov = function (self, fov, is_multiplier, transition_time)
|
||||
obj_breath = value
|
||||
end
|
||||
|
||||
|
||||
object.get_attribute = function (self, attribute)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_attribute = function (self, attribute, value)
|
||||
end
|
||||
|
||||
|
||||
object.get_meta = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_inventory_formspec = function (self, formspec)
|
||||
end
|
||||
|
||||
|
||||
object.get_inventory_formspec = function (self)
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
object.set_formspec_prepend = function (self, formspec)
|
||||
end
|
||||
|
||||
|
||||
object.get_formspec_prepend = function (self)
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
object.get_player_control = function (self)
|
||||
return table.copy (obj_controls)
|
||||
end
|
||||
|
||||
|
||||
object.set_physics_override = function (self, override_table)
|
||||
end
|
||||
|
||||
|
||||
object.get_physics_override = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.hud_add = function (self, definition)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.hud_remove = function (self, id)
|
||||
end
|
||||
|
||||
|
||||
object.hud_change = function (self, id, stat, value)
|
||||
end
|
||||
|
||||
|
||||
object.hud_get = function (self, id)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.hud_set_flags = function (self, flags)
|
||||
end
|
||||
|
||||
|
||||
object.hud_get_flags = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.hud_set_hotbar_itemcount = function (self, count)
|
||||
end
|
||||
|
||||
|
||||
object.hud_get_hotbar_itemcount = function (self)
|
||||
return 0
|
||||
end
|
||||
|
||||
|
||||
object.hud_set_hotbar_image = function (self, texturename)
|
||||
end
|
||||
|
||||
|
||||
object.hud_get_hotbar_image = function (self)
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
object.hud_set_hotbar_selected_image = function (self, texturename)
|
||||
end
|
||||
|
||||
|
||||
object.hud_get_hotbar_selected_image = function (self)
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
object.set_minimap_modes = function (self, modes, selected_mode)
|
||||
end
|
||||
|
||||
|
||||
object.set_sky = function (self, sky_parameters)
|
||||
end
|
||||
|
||||
|
||||
object.get_sky = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.get_sky_color = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_sun = function (self, sun_parameters)
|
||||
end
|
||||
|
||||
|
||||
object.get_sun = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.set_moon = function (self, moon_parameters)
|
||||
end
|
||||
|
||||
|
||||
object.get_moon = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.set_stars = function (self, star_parameters)
|
||||
end
|
||||
|
||||
|
||||
object.get_stars = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.set_clouds = function (self, cloud_parameters)
|
||||
end
|
||||
|
||||
|
||||
object.get_clouds = function (self)
|
||||
return { }
|
||||
end
|
||||
|
||||
|
||||
object.override_day_night_ratio = function (self, ratio)
|
||||
end
|
||||
|
||||
|
||||
object.get_day_night_ratio = function (self)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
object.set_local_animation = function (self, idle, walk, dig, walk_while_dig, frame_speed)
|
||||
end
|
||||
|
||||
|
||||
object.get_local_animation = function (self)
|
||||
return { x = 0, y = 0 }, { x = 0, y = 0 }, { x = 0, y = 0 }, { x = 0, y = 0 }, 30
|
||||
end
|
||||
|
||||
|
||||
object.set_eye_offset = function (self, firstperson, thirdperson)
|
||||
end
|
||||
|
||||
|
||||
object.get_eye_offset = function (self)
|
||||
return { x = 0, y = 0, z = 0 }, { x = 0, y = 0, z = 0 }
|
||||
end
|
||||
|
||||
|
||||
object.send_mapblock = function (self, blockpos)
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
return object
|
||||
end
|
||||
|
||||
|
||||
|
||||
return get_dummy_player
|
||||
|
||||
|
||||
--
|
||||
@@ -232,18 +232,6 @@ end
|
||||
|
||||
|
||||
|
||||
local function is_drop (obj)
|
||||
if obj then
|
||||
local entity = obj.get_luaentity and obj:get_luaentity ()
|
||||
|
||||
return (entity and entity.name and entity.name == "__builtin:item")
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function run_zap (pos)
|
||||
minetest.sound_play ("lwforce_field_zap", { pos = pos, max_hear_distance = 10, gain = 1.0 })
|
||||
|
||||
@@ -290,7 +278,7 @@ local function run_field (pos, elapsed)
|
||||
local obj_pos = (obj.get_pos and obj:get_pos ()) or nil
|
||||
|
||||
if obj_pos and not obj:get_armor_groups ().immortal then
|
||||
if not is_drop (obj) and not minetest.is_protected (obj_pos, owner) then
|
||||
if not utils.is_drop (obj) and not minetest.is_protected (obj_pos, owner) then
|
||||
|
||||
if obj:is_player () then
|
||||
if not exclude[obj:get_player_name ()] then
|
||||
|
||||
425
hopper.lua
Normal file
425
hopper.lua
Normal file
@@ -0,0 +1,425 @@
|
||||
local utils, mod_storage = ...
|
||||
local S = utils.S
|
||||
|
||||
|
||||
|
||||
if utils.hopper_supported then
|
||||
|
||||
|
||||
|
||||
local hopper_interval = 1.0
|
||||
|
||||
|
||||
|
||||
local hopper_list = minetest.deserialize (mod_storage:get_string ("hopper_list"))
|
||||
if type (hopper_list) ~= "table" then
|
||||
hopper_list = {}
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function add_hopper_to_list (pos)
|
||||
hopper_list[minetest.pos_to_string (pos, 0)] = true
|
||||
|
||||
mod_storage:set_string ("hopper_list", minetest.serialize (hopper_list))
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function remove_hopper_from_list (pos)
|
||||
hopper_list[minetest.pos_to_string (pos, 0)] = nil
|
||||
|
||||
mod_storage:set_string ("hopper_list", minetest.serialize (hopper_list))
|
||||
end
|
||||
|
||||
|
||||
|
||||
local input_dir =
|
||||
{
|
||||
[0] = { x = 0, y = 1, z = 0 },
|
||||
{ x = 0, y = 0, z = 1 },
|
||||
{ x = 0, y = 0, z = -1 },
|
||||
{ x = 1, y = 0, z = 0 },
|
||||
{ x = -1, y = 0, z = 0 },
|
||||
{ x = 0, y = -1, z = 0 }
|
||||
}
|
||||
|
||||
local function get_input_dir (node)
|
||||
return input_dir[math.floor (node.param2 / 4)]
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function get_output_dir (node)
|
||||
if node then
|
||||
if node.name == "lwcomponents:hopper" then
|
||||
return vector.multiply (get_input_dir (node), -1)
|
||||
elseif node.name == "lwcomponents:hopper_horz" then
|
||||
return minetest.facedir_to_dir (node.param2)
|
||||
end
|
||||
end
|
||||
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function get_drop (pos)
|
||||
local objs = minetest.get_objects_inside_radius (pos, 1)
|
||||
|
||||
for _, obj in pairs (objs) do
|
||||
local obj_pos = (obj.get_pos and obj:get_pos ())
|
||||
|
||||
if obj_pos and utils.is_drop (obj) then
|
||||
obj_pos = vector.round (obj_pos)
|
||||
|
||||
if vector.equals (pos, obj_pos) then
|
||||
local stack = ItemStack (obj:get_luaentity ().itemstring)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
stack:set_count (1)
|
||||
|
||||
return stack, obj
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function take_drop (obj)
|
||||
if utils.is_drop (obj) then
|
||||
local stack = ItemStack (obj:get_luaentity ().itemstring)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
stack:set_count (stack:get_count () - 1)
|
||||
|
||||
if stack:is_empty () then
|
||||
obj:get_luaentity().itemstring = ""
|
||||
obj:remove()
|
||||
else
|
||||
obj:get_luaentity().itemstring = stack:to_string ()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function next_item_to_take (src_pos, src_node, src_inv_name)
|
||||
if not src_inv_name or not minetest.registered_nodes[src_node.name] then
|
||||
return
|
||||
end
|
||||
|
||||
local src_meta = minetest.get_meta (src_pos)
|
||||
local src_inv = (src_meta and src_meta:get_inventory ()) or nil
|
||||
|
||||
if src_inv then
|
||||
local slots = src_inv:get_size (src_inv_name)
|
||||
|
||||
for slot = 1, slots, 1 do
|
||||
local stack = src_inv:get_stack (src_inv_name, slot)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
stack:set_count (1)
|
||||
|
||||
return stack, slot
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function take_item (src_pos, src_inv_name, slot)
|
||||
local src_meta = minetest.get_meta (src_pos)
|
||||
local src_inv = (src_meta and src_meta:get_inventory ()) or nil
|
||||
|
||||
if src_inv then
|
||||
local stack = src_inv:get_stack (src_inv_name, slot)
|
||||
|
||||
if stack and not stack:is_empty () then
|
||||
stack:set_count (stack:get_count () - 1)
|
||||
|
||||
src_inv:set_stack (src_inv_name, slot, stack)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function place_item (dest_pos, dest_node, dest_inv_name, stack, placer)
|
||||
local dest_def = minetest.registered_nodes[dest_node.name]
|
||||
|
||||
if not dest_inv_name or not dest_def then
|
||||
return
|
||||
end
|
||||
|
||||
local dest_meta = minetest.get_meta (dest_pos)
|
||||
local dest_inv = (dest_meta and dest_meta:get_inventory ()) or nil
|
||||
|
||||
if dest_inv then
|
||||
local slots = dest_inv:get_size (dest_inv_name)
|
||||
|
||||
-- find existing stack
|
||||
for slot = 1, slots, 1 do
|
||||
local inv_stack = dest_inv:get_stack (dest_inv_name, slot)
|
||||
|
||||
if inv_stack and not inv_stack:is_empty () and
|
||||
utils.is_same_item (inv_stack, stack) and
|
||||
inv_stack:get_count () < inv_stack:get_stack_max () and
|
||||
(dest_def.allow_metadata_inventory_put == nil or
|
||||
placer == nil or
|
||||
dest_def.allow_metadata_inventory_put(dest_pos, dest_inv_name, slot, stack, placer) > 0) then
|
||||
|
||||
inv_stack:set_count (inv_stack:get_count () + 1)
|
||||
dest_inv:set_stack (dest_inv_name, slot, inv_stack)
|
||||
|
||||
if dest_def.on_metadata_inventory_put and placer then
|
||||
dest_def.on_metadata_inventory_put (dest_pos, dest_inv_name, slot, stack, placer)
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
-- find empty slot
|
||||
for slot = 1, slots, 1 do
|
||||
local inv_stack = dest_inv:get_stack (dest_inv_name, slot)
|
||||
|
||||
if not inv_stack or inv_stack:is_empty () and
|
||||
(dest_def.allow_metadata_inventory_put == nil or
|
||||
placer == nil or
|
||||
dest_def.allow_metadata_inventory_put(dest_pos, dest_inv_name, slot, stack, placer) > 0) then
|
||||
|
||||
dest_inv:set_stack (dest_inv_name, slot, stack)
|
||||
|
||||
if dest_def.on_metadata_inventory_put and placer then
|
||||
dest_def.on_metadata_inventory_put (dest_pos, dest_inv_name, slot, stack, placer)
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function run_hopper_action (pos)
|
||||
local node = utils.get_far_node (pos)
|
||||
local dest_dir = get_output_dir (node)
|
||||
|
||||
if dest_dir then
|
||||
local dest_pos = vector.add (pos, dest_dir)
|
||||
local dest_node = utils.get_far_node (dest_pos)
|
||||
|
||||
if dest_node then
|
||||
local registered_dest_invs = hopper.get_registered_inventories_for (dest_node.name)
|
||||
|
||||
if registered_dest_invs then
|
||||
local meta = minetest.get_meta (pos)
|
||||
local placer_name = (meta and meta:get_string ("placer_name")) or nil
|
||||
local placer = (placer_name and minetest.get_player_by_name (placer_name)) or
|
||||
utils.get_dummy_player (true, placer_name or "<unknown>")
|
||||
local src_pos = vector.add (pos, get_input_dir (node))
|
||||
local drop = nil
|
||||
local stack = nil
|
||||
local slot = nil
|
||||
local src_inv_name = nil
|
||||
|
||||
stack, drop = get_drop (src_pos)
|
||||
|
||||
if not stack then
|
||||
local src_node = utils.get_far_node (src_pos)
|
||||
|
||||
if src_node then
|
||||
local registered_src_invs = hopper.get_registered_inventories_for (src_node.name)
|
||||
|
||||
if registered_src_invs then
|
||||
src_inv_name = registered_src_invs["top"]
|
||||
stack, slot = next_item_to_take (src_pos, src_node, src_inv_name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if stack then
|
||||
local dest_side = (node.name == "lwcomponents:hopper" and "bottom") or "side"
|
||||
local dest_inv_name = registered_dest_invs[dest_side]
|
||||
|
||||
if place_item (dest_pos, dest_node, dest_inv_name, stack, placer) then
|
||||
if drop then
|
||||
take_drop (drop)
|
||||
else
|
||||
take_item (src_pos, src_inv_name, slot)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function on_construct (pos)
|
||||
add_hopper_to_list (pos)
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function on_destruct (pos)
|
||||
remove_hopper_from_list (pos)
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function after_place_node (pos, placer, itemstack, pointed_thing)
|
||||
local meta = minetest.get_meta (pos)
|
||||
|
||||
meta:set_string ("placer_name", (placer and placer:get_player_name ()) or "")
|
||||
|
||||
-- If return true no item is taken from itemstack
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function on_place (itemstack, placer, pointed_thing)
|
||||
if pointed_thing and pointed_thing.type == "node" then
|
||||
local stack = ItemStack (itemstack)
|
||||
local dir = vector.direction (pointed_thing.above, pointed_thing.under)
|
||||
|
||||
if dir.y == 0 then
|
||||
minetest.item_place (ItemStack ("lwcomponents:hopper_horz"), placer, pointed_thing)
|
||||
|
||||
if not utils.is_creative (placer) then
|
||||
stack:set_count (stack:get_count () - 1)
|
||||
end
|
||||
|
||||
return stack
|
||||
end
|
||||
end
|
||||
|
||||
return minetest.item_place (itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
|
||||
|
||||
minetest.register_node ("lwcomponents:hopper", {
|
||||
description = S("Hopper"),
|
||||
tiles = { "lwcomponents_hopper_top.png", "lwcomponents_hopper_vert_spout.png",
|
||||
"lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png",
|
||||
"lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png" },
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.3125, -0.5, -0.3125, 0.3125, -0.25, 0.3125}, -- spout_vert
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, -- funnel_1
|
||||
{-0.5, 0, 0.3125, 0.5, 0.5, 0.5}, -- funnel_2
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, -0.3125}, -- funnel_3
|
||||
{0.3125, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel_4
|
||||
}
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.3125, -0.5, -0.3125, 0.3125, -0.25, 0.3125}, -- spout_vert
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
|
||||
}
|
||||
},
|
||||
collision_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
|
||||
{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
|
||||
}
|
||||
},
|
||||
paramtype = "light",
|
||||
param1 = 0,
|
||||
paramtype2 = "facedir",
|
||||
param2 = 0,
|
||||
drop = "lwcomponents:hopper",
|
||||
groups = { cracky = 3 },
|
||||
sounds = default.node_sound_stone_defaults (),
|
||||
|
||||
on_construct = on_construct,
|
||||
on_destruct = on_destruct,
|
||||
after_place_node = after_place_node,
|
||||
on_place = on_place,
|
||||
})
|
||||
|
||||
|
||||
|
||||
minetest.register_node ("lwcomponents:hopper_horz", {
|
||||
description = S("Hopper"),
|
||||
tiles = { "lwcomponents_hopper_top.png", "lwcomponents_hopper_bottom.png",
|
||||
"lwcomponents_hopper_side.png", "lwcomponents_hopper_side.png",
|
||||
"lwcomponents_hopper_side_spout.png", "lwcomponents_hopper_side.png" },
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, -0.3125, 0.5, 0.5}, -- funnel_1
|
||||
{-0.5, 0, 0.3125, 0.5, 0.5, 0.5}, -- funnel_2
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, -0.3125}, -- funnel_3
|
||||
{0.3125, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel_4
|
||||
{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
|
||||
}
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
|
||||
{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
|
||||
}
|
||||
},
|
||||
collision_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.375, -0.375, -0.375, 0.375, 0.3125, 0.375}, -- body
|
||||
{-0.5, 0, -0.5, 0.5, 0.5, 0.5}, -- funnel
|
||||
{-0.3125, -0.3125, 0.5, 0.3125, 0.3125, 0.3125}, -- spout_side
|
||||
}
|
||||
},
|
||||
paramtype = "light",
|
||||
param1 = 0,
|
||||
paramtype2 = "facedir",
|
||||
param2 = 0,
|
||||
drop = "lwcomponents:hopper",
|
||||
groups = { cracky = 3, not_in_creative_inventory = 1 },
|
||||
sounds = default.node_sound_stone_defaults (),
|
||||
|
||||
on_construct = on_construct,
|
||||
on_destruct = on_destruct,
|
||||
after_place_node = after_place_node,
|
||||
})
|
||||
|
||||
|
||||
|
||||
local function run_hoppers ()
|
||||
for spos, _ in pairs (hopper_list) do
|
||||
run_hopper_action (minetest.string_to_pos (spos))
|
||||
end
|
||||
|
||||
minetest.after (hopper_interval, run_hoppers)
|
||||
end
|
||||
|
||||
|
||||
|
||||
minetest.register_on_mods_loaded (function ()
|
||||
minetest.after (3.0, run_hoppers)
|
||||
end)
|
||||
|
||||
|
||||
|
||||
end -- utils.hopper_supported
|
||||
2
init.lua
2
init.lua
@@ -16,6 +16,7 @@ local utils = { }
|
||||
local modpath = minetest.get_modpath ("lwcomponents")
|
||||
|
||||
loadfile (modpath.."/settings.lua") (utils)
|
||||
utils.get_dummy_player = loadfile (modpath.."/dummy_player.lua") ()
|
||||
loadfile (modpath.."/utils.lua") (utils, mod_storage)
|
||||
loadfile (modpath.."/explode.lua") (utils)
|
||||
loadfile (modpath.."/api.lua") (utils)
|
||||
@@ -32,6 +33,7 @@ loadfile (modpath.."/breaker.lua") (utils)
|
||||
loadfile (modpath.."/deployer.lua") (utils)
|
||||
loadfile (modpath.."/fan.lua") (utils)
|
||||
loadfile (modpath.."/conduit.lua") (utils, mod_storage)
|
||||
loadfile (modpath.."/hopper.lua") (utils, mod_storage)
|
||||
loadfile (modpath.."/cannon.lua") (utils)
|
||||
loadfile (modpath.."/cannon_shell.lua") (utils)
|
||||
loadfile (modpath.."/pistons.lua") (utils)
|
||||
|
||||
BIN
screenshot.png
BIN
screenshot.png
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 84 KiB |
36
storage.lua
36
storage.lua
@@ -200,20 +200,6 @@ local consolidation_interval = 20
|
||||
|
||||
|
||||
|
||||
local function unescape_description (description)
|
||||
if description:sub (1, 4) == string.char (27, 40, 84, 64) then
|
||||
local last = description:find (")", 5, true)
|
||||
|
||||
if last then
|
||||
description = description:sub (last + 1, -1)
|
||||
end
|
||||
end
|
||||
|
||||
return description:gsub (string.char (27, 70), ""):gsub (string.char (27, 69), "")
|
||||
end
|
||||
|
||||
|
||||
|
||||
local function unit_inventory (pos, owner, inv_list)
|
||||
local node = utils.get_far_node (pos)
|
||||
|
||||
@@ -333,15 +319,14 @@ local function get_stock_list (pos)
|
||||
|
||||
if tstack and tstack.meta and count_table_keys (tstack.meta) > 0 then
|
||||
custom = true
|
||||
|
||||
if stack:get_meta ():get_string ("description") ~= "" then
|
||||
description = stack:get_meta ():get_string ("description")
|
||||
end
|
||||
|
||||
pallet_index = tstack.meta.palette_index
|
||||
end
|
||||
|
||||
if not description then
|
||||
if stack:get_short_description () ~= "" then
|
||||
description = stack:get_short_description ()
|
||||
elseif stack:get_description () ~= "" then
|
||||
description = stack:get_description ()
|
||||
else
|
||||
description = name
|
||||
|
||||
local def = utils.find_item_def (name)
|
||||
@@ -358,7 +343,7 @@ local function get_stock_list (pos)
|
||||
list[#list + 1] =
|
||||
{
|
||||
name = stack:get_name (),
|
||||
description = unescape_description (description),
|
||||
description = utils.unescape_description (description),
|
||||
id = k,
|
||||
count = v.count,
|
||||
custom = custom,
|
||||
@@ -721,8 +706,11 @@ local function get_formspec_list (pos)
|
||||
local stack = ItemStack (k)
|
||||
local smeta = stack:get_meta ()
|
||||
|
||||
if smeta and smeta:get_string ("description") ~= "" then
|
||||
description = smeta:get_string ("description")
|
||||
|
||||
if stack:get_short_description () ~= "" then
|
||||
description = stack:get_short_description ()
|
||||
elseif stack:get_description () ~= "" then
|
||||
description = stack:get_description ()
|
||||
else
|
||||
local def = utils.find_item_def (stack:get_name ())
|
||||
|
||||
@@ -738,7 +726,7 @@ local function get_formspec_list (pos)
|
||||
list[#list + 1] =
|
||||
{
|
||||
item = k,
|
||||
description = unescape_description (description),
|
||||
description = utils.unescape_description (description),
|
||||
count = v.count
|
||||
}
|
||||
end
|
||||
|
||||
71
utils.lua
71
utils.lua
@@ -225,6 +225,40 @@ end
|
||||
|
||||
|
||||
|
||||
function utils.table_equal (t1, t2)
|
||||
for k, v in pairs (t1) do
|
||||
if type (t2[k]) ~= type (v) then
|
||||
return false
|
||||
end
|
||||
|
||||
if type (v) == "table" then
|
||||
if not utils.table_equal (v, t2[k]) then
|
||||
return false
|
||||
end
|
||||
elseif v ~= t2[k] then
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
for k, v in pairs (t2) do
|
||||
if type (t1[k]) ~= type (v) then
|
||||
return false
|
||||
end
|
||||
|
||||
if type (v) == "table" then
|
||||
if not utils.table_equal (v, t1[k]) then
|
||||
return false
|
||||
end
|
||||
elseif v ~= t1[k] then
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
|
||||
|
||||
function utils.is_same_item (item1, item2)
|
||||
local copy1 = ItemStack (item1)
|
||||
local copy2 = ItemStack (item2)
|
||||
@@ -233,7 +267,42 @@ function utils.is_same_item (item1, item2)
|
||||
copy1:set_count (1)
|
||||
copy2:set_count (1)
|
||||
|
||||
return copy1:to_string () == copy2:to_string ()
|
||||
return utils.table_equal (copy1:to_table (), copy2:to_table ())
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
function utils.unescape_description (description)
|
||||
description = description:gsub (string.char (27, 70), ""):
|
||||
gsub (string.char (27, 69), ""):
|
||||
gsub ("\n", " ")
|
||||
|
||||
local first = description:find (string.char (27, 40, 84, 64), 1, true)
|
||||
while first do
|
||||
local last = description:find (")", first + 4, true)
|
||||
|
||||
if not last then
|
||||
last = first + 3
|
||||
end
|
||||
|
||||
description = description:sub (1, first - 1)..description:sub (last + 1)
|
||||
|
||||
first = description:find (string.char (27, 40, 84, 64), 1, true)
|
||||
end
|
||||
|
||||
return description
|
||||
end
|
||||
|
||||
|
||||
|
||||
function utils.is_drop (obj)
|
||||
if obj then
|
||||
local entity = obj.get_luaentity and obj:get_luaentity ()
|
||||
|
||||
return (entity and entity.name and entity.name == "__builtin:item")
|
||||
end
|
||||
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user