From 6194cf7610bbdc63ec635522ed81f0b1d798785e Mon Sep 17 00:00:00 2001 From: Cristiano Magro <cristiano.magro@vola.it> Date: Fri, 03 Sep 2021 15:27:47 +0200 Subject: [PATCH] Merge branch 'master' into xno_tree_trap --- technic/machines/other/injector.lua | 145 ++++++++++++++++++++++++++++++----------------- 1 files changed, 92 insertions(+), 53 deletions(-) diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index 14bc984..6bd5a83 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -1,8 +1,12 @@ local S = technic.getter +local fs_helpers = pipeworks.fs_helpers + +local tube_entry = "^pipeworks_tube_connection_metallic.png" + local function inject_items (pos) - local meta=minetest.env:get_meta(pos) + local meta=minetest.get_meta(pos) local inv = meta:get_inventory() local mode=meta:get_string("mode") if mode=="single items" then @@ -11,13 +15,10 @@ i=i+1 if stack then local item0=stack:to_table() - if item0 then - item0["count"]="1" - local item1=pipeworks.tube_item({x=pos.x,y=pos.y,z=pos.z},item0) - item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z} - item1:setvelocity({x=0, y=-1, z=0}) - item1:setacceleration({x=0, y=0, z=0}) - stack:take_item(1); + if item0 then + item0["count"] = 1 + technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) + stack:take_item(1) inv:set_stack("main", i, stack) return end @@ -30,11 +31,8 @@ i=i+1 if stack then local item0=stack:to_table() - if item0 then - local item1=pipeworks.tube_item({x=pos.x,y=pos.y,z=pos.z},item0) - item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z} - item1:setvelocity({x=0, y=-1, z=0}) - item1:setacceleration({x=0, y=0, z=0}) + if item0 then + technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) stack:clear() inv:set_stack("main", i, stack) return @@ -42,7 +40,7 @@ end end end - + end minetest.register_craft({ @@ -50,71 +48,112 @@ recipe = { {'', 'technic:control_logic_unit',''}, {'', 'default:chest',''}, - {'', 'pipeworks:tube_000000',''}, + {'', 'pipeworks:tube_1',''}, } }) +local function set_injector_formspec(meta) + local is_stack = meta:get_string("mode") == "whole stacks" + meta:set_string("formspec", + "size[8,9;]".. + "item_image[0,0;1,1;technic:injector]".. + "label[1,0;"..S("Self-Contained Injector").."]".. + (is_stack and + "button[0,1;2,1;mode_item;"..S("Stackwise").."]" or + "button[0,1;2,1;mode_stack;"..S("Itemwise").."]").. + (meta:get_int("public") == 1 and + "button[2,1;2,1;mode_private;"..S("Public").."]" or + "button[2,1;2,1;mode_public;"..S("Private").."]").. + "list[current_name;main;0,2;8,2;]".. + "list[current_player;main;0,5;8,4;]".. + "listring[]".. + fs_helpers.cycling_button( + meta, + pipeworks.button_base, + "splitstacks", + { + pipeworks.button_off, + pipeworks.button_on + } + )..pipeworks.button_label + ) +end + minetest.register_node("technic:injector", { - description = S("Injector"), - tiles = {"technic_injector_top.png", "technic_injector_bottom.png", "technic_injector_side.png", - "technic_injector_side.png", "technic_injector_side.png", "technic_injector_side.png"}, - groups = chest_groups1, - tube = tubes_properties, + description = S("Self-Contained Injector"), + tiles = { + "technic_injector_top.png"..tube_entry, + "technic_injector_bottom.png", + "technic_injector_side.png"..tube_entry, + "technic_injector_side.png"..tube_entry, + "technic_injector_side.png"..tube_entry, + "technic_injector_side.png" + }, + paramtype2 = "facedir", + groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice=1, tubedevice_receiver=1}, + tube = { + can_insert = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if meta:get_int("splitstacks") == 1 then + stack = stack:peek_item(1) + end + return inv:room_for_item("main", stack) + end, + insert_object = function(pos, node, stack, direction) + return minetest.get_meta(pos):get_inventory():add_item("main", stack) + end, + connect_sides = {left=1, right=1, back=1, top=1, bottom=1}, + }, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) - local meta = minetest.env:get_meta(pos) - meta:set_string("formspec", - "invsize[8,9;]".. - "label[0,0;"..S("Injector").."]".. - "button[0,1;.8,.8;mode;]".. - "label[.8,1;Mode: single items]".. - "list[current_name;main;0,2;8,2;]".. - "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", S("Injector")) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", S("Self-Contained Injector")) local inv = meta:get_inventory() - inv:set_size("main", 8*4) + inv:set_size("main", 8*2) meta:set_string("mode","single items") + set_injector_formspec(meta) end, can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); + local meta = minetest.get_meta(pos); local inv = meta:get_inventory() return inv:is_empty("main") end, on_receive_fields = function(pos, formanme, fields, sender) - local meta = minetest.env:get_meta(pos) - local mode=meta:get_string("mode") - if fields.mode then - if mode == "single items" then - mode = "whole stacks" - else - mode = "single items" - end - meta:set_string("mode", mode) + if minetest.is_protected(pos, sender:get_player_name()) then return end + + local meta = minetest.get_meta(pos) + if fields.mode_item then meta:set_string("mode", "single items") end + if fields.mode_stack then meta:set_string("mode", "whole stacks") end + + if fields.mode_private then meta:set_int("public", 0) end + if fields.mode_public then meta:set_int("public", 1) end + + if fields["fs_helpers_cycling:0:splitstacks"] + or fields["fs_helpers_cycling:1:splitstacks"] then + if not pipeworks.may_configure(pos, sender) then return end + fs_helpers.on_receive_fields(pos, fields) end - meta:set_string("formspec", - "invsize[8,9;]".. - "label[0,0;"..S("Injector").."]".. - "button[0,1;.8,.8;mode;]".. - "label[.8,1;Mode: "..mode.."]".. - "list[current_name;main;0,2;8,2;]".. - "list[current_player;main;0,5;8,4;]") + set_injector_formspec(meta) end, allow_metadata_inventory_put = technic.machine_inventory_put, allow_metadata_inventory_take = technic.machine_inventory_take, allow_metadata_inventory_move = technic.machine_inventory_move, + after_place_node = pipeworks.after_place, + after_dig_node = pipeworks.after_dig }) minetest.register_abm({ + label = "Machines: run injector", nodenames = {"technic:injector"}, interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local pos1={} - pos1.x = pos.x - pos1.y = pos.y-1 - pos1.z = pos.z - local meta=minetest.env:get_meta(pos1) - if meta:get_int("tubelike")==1 then inject_items (pos) end + local pos1 = vector.add(pos, vector.new(0, -1, 0)) + local node1 = minetest.get_node(pos1) + if minetest.get_item_group(node1.name, "tubedevice") > 0 then + inject_items(pos) + end end, }) -- Gitblit v1.8.0