diff --git a/releasenotes.md b/releasenotes.md index 67a7bf4..932dc9a 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -2,6 +2,19 @@ +## V2.03.05 (2019-08-06) + +### Additions +- Tubelib_addons3 "HighPerf Funnel" added (see isssue #36) + +### Removals + +### Changes + +### Fixes + + + ## V2.03.04 (2019-07-20) ### Additions diff --git a/tubelib_addons3/funnel.lua b/tubelib_addons3/funnel.lua new file mode 100644 index 0000000..860dafc --- /dev/null +++ b/tubelib_addons3/funnel.lua @@ -0,0 +1,168 @@ +--[[ + + Tubelib Addons 3 + ================ + + Copyright (C) 2019 Joachim Stolberg + + LGPLv2.1+ + See LICENSE.txt for more information + + funnel.lua + + A high performance funnel + +]]-- + +local function allow_metadata_inventory_put(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + minetest.log("action", player:get_player_name().." moves "..stack:get_name().. + " to HighPerf funnel at "..minetest.pos_to_string(pos)) + return stack:get_count() +end + +local function allow_metadata_inventory_take(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + minetest.log("action", player:get_player_name().." takes "..stack:get_name().. + " from HighPerf funnel at "..minetest.pos_to_string(pos)) + return stack:get_count() +end + +local function formspec() + return "size[9,7]".. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. + "list[context;main;0.5,0;8,2;]".. + "list[current_player;main;0.5,3.3;8,4;]".. + "listring[context;main]".. + "listring[current_player;main]" +end + +local function scan_for_objects(pos, elapsed) + local meta = minetest.get_meta(pos) + for _, object in pairs(minetest.get_objects_inside_radius(pos, 1)) do + local lua_entity = object:get_luaentity() + if not object:is_player() and lua_entity and lua_entity.name == "__builtin:item" then + local obj_pos = object:getpos() + if lua_entity.itemstring ~= "" and ((obj_pos.y - pos.y) >= 0.4) then + if tubelib.put_item(meta, "main", lua_entity.itemstring) then + lua_entity.itemstring = "" + object:remove() + end + end + + end + end + return true +end + +minetest.register_node("tubelib_addons3:funnel", { + description = "HighPerf Funnel", + tiles = { + -- up, down, right, left, back, front + 'tubelib_addons1_funnel_top.png^tubelib_addons3_node_frame4.png', + 'tubelib_addons1_funnel_top.png^tubelib_addons3_node_frame4.png', + 'tubelib_addons1_funnel.png^tubelib_addons3_node_frame4.png', + }, + + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-8/16, -8/16, -8/16, 8/16, 8/16, -6/16}, + {-8/16, -8/16, 6/16, 8/16, 8/16, 8/16}, + {-8/16, -8/16, -8/16, -6/16, 8/16, 8/16}, + { 6/16, -8/16, -8/16, 8/16, 8/16, 8/16}, + {-6/16, -8/16, -6/16, 6/16, 4/16, 6/16}, + }, + }, + selection_box = { + type = "fixed", + fixed = {-8/16, -8/16, -8/16, 8/16, 8/16, 8/16}, + }, + + on_construct = function(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + inv:set_size('main', 16) + end, + + after_place_node = function(pos, placer) + tubelib.add_node(pos, "tubelib_addons3:funnel") + local meta = minetest.get_meta(pos) + meta:set_string("formspec", formspec()) + minetest.get_node_timer(pos):start(1) + end, + + on_timer = scan_for_objects, + on_rotate = screwdriver.disallow, + + can_dig = function(pos, player) + if minetest.is_protected(pos, player:get_player_name()) then + return false + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + + after_dig_node = function(pos, oldnode, oldmetadata, digger) + tubelib.remove_node(pos) + end, + + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + + paramtype = "light", + sunlight_propagates = true, + paramtype2 = "facedir", + groups = {choppy=2, cracky=2, crumbly=2}, + is_ground_content = false, + sounds = default.node_sound_wood_defaults(), +}) + + +minetest.register_craft({ + output = "tubelib_addons3:funnel 2", + recipe = { + {"default:tin_ingot", "tubelib_addons1:funnel", ""}, + {"tubelib_addons1:funnel", "default:gold_ingot", ""}, + {"", "", ""}, + }, +}) + + +tubelib.register_node("tubelib_addons3:funnel", {}, { + on_pull_stack = function(pos, side) + local meta = minetest.get_meta(pos) + return tubelib.get_stack(meta, "main") + end, + on_pull_item = function(pos, side) + local meta = minetest.get_meta(pos) + return tubelib.get_item(meta, "main") + end, + on_unpull_item = function(pos, side, item) + local meta = minetest.get_meta(pos) + return tubelib.put_item(meta, "main", item) + end, + + on_recv_message = function(pos, topic, payload) + if topic == "state" then + local meta = minetest.get_meta(pos) + return tubelib.get_inv_state(meta, "main") + else + return "unsupported" + end + end, + on_node_load = function(pos) + minetest.get_node_timer(pos):start(1) + end, + +}) + + diff --git a/tubelib_addons3/init.lua b/tubelib_addons3/init.lua index 93a20cf..a6d584a 100644 --- a/tubelib_addons3/init.lua +++ b/tubelib_addons3/init.lua @@ -14,4 +14,5 @@ dofile(minetest.get_modpath("tubelib_addons3") .. '/chest.lua') dofile(minetest.get_modpath("tubelib_addons3") .. '/pusher.lua') dofile(minetest.get_modpath("tubelib_addons3") .. '/distributor.lua') dofile(minetest.get_modpath("tubelib_addons3") .. '/pushing_chest.lua') -dofile(minetest.get_modpath("tubelib_addons3") .. '/teleporter.lua') \ No newline at end of file +dofile(minetest.get_modpath("tubelib_addons3") .. '/teleporter.lua') +dofile(minetest.get_modpath("tubelib_addons3") .. '/funnel.lua')