From 29881ec85e87e5bc186aded048af596e36e84597 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Wed, 12 Apr 2017 03:11:48 -0400 Subject: updated technic and pipeworks --- technic/machines/register/machine_base.lua | 99 +++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 17 deletions(-) (limited to 'technic/machines/register/machine_base.lua') diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index d479773..0c6a6b3 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -1,6 +1,9 @@ local S = technic.getter +local fs_helpers = pipeworks.fs_helpers +local tube_entry = "^pipeworks_tube_connection_metallic.png" + local tube = { insert_object = function(pos, node, stack, direction) local meta = minetest.get_meta(pos) @@ -10,8 +13,10 @@ local tube = { can_insert = function(pos, node, stack, direction) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - local onestack = stack:peek_item(1) - return inv:room_for_item("src", onestack) + if meta:get_int("splitstacks") == 1 then + stack = stack:peek_item(1) + end + return inv:room_for_item("src", stack) end, connect_sides = {left = 1, right = 1, back = 1, top = 1, bottom = 1}, } @@ -134,15 +139,21 @@ function technic.register_base_machine(data) inv:set_list("dst", inv:get_list("dst_tmp")) end end - + + local tentry = tube_entry + if ltier == "lv" then + tentry = "" + end minetest.register_node("technic:"..ltier.."_"..machine_name, { description = machine_desc:format(tier), - tiles = {"technic_"..ltier.."_"..machine_name.."_top.png", - "technic_"..ltier.."_"..machine_name.."_bottom.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_front.png"}, + tiles = { + "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_bottom.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_front.png" + }, paramtype2 = "facedir", groups = groups, tube = data.tube and tube or nil, @@ -152,9 +163,23 @@ function technic.register_base_machine(data) on_construct = function(pos) local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) + + local form_buttons = "" + if not string.find(node.name, ":lv_") then + form_buttons = fs_helpers.cycling_button( + meta, + pipeworks.button_base, + "splitstacks", + { + pipeworks.button_off, + pipeworks.button_on + } + )..pipeworks.button_label + end + meta:set_string("infotext", machine_desc:format(tier)) meta:set_int("tube_time", 0) - meta:set_string("formspec", formspec) + meta:set_string("formspec", formspec..form_buttons) local inv = meta:get_inventory() inv:set_size("src", input_size) inv:set_size("dst", 4) @@ -167,17 +192,38 @@ function technic.register_base_machine(data) allow_metadata_inventory_move = technic.machine_inventory_move, technic_run = run, after_place_node = data.tube and pipeworks.after_place, - after_dig_node = technic.machine_after_dig_node + after_dig_node = technic.machine_after_dig_node, + on_receive_fields = function(pos, formname, fields, sender) + local node = minetest.get_node(pos) + if not pipeworks.may_configure(pos, sender) then return end + fs_helpers.on_receive_fields(pos, fields) + local meta = minetest.get_meta(pos) + local form_buttons = "" + if not string.find(node.name, ":lv_") then + form_buttons = fs_helpers.cycling_button( + meta, + pipeworks.button_base, + "splitstacks", + { + pipeworks.button_off, + pipeworks.button_on + } + )..pipeworks.button_label + end + meta:set_string("formspec", formspec..form_buttons) + end, }) minetest.register_node("technic:"..ltier.."_"..machine_name.."_active",{ description = machine_desc:format(tier), - tiles = {"technic_"..ltier.."_"..machine_name.."_top.png", - "technic_"..ltier.."_"..machine_name.."_bottom.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_side.png", - "technic_"..ltier.."_"..machine_name.."_front_active.png"}, + tiles = { + "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_bottom.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_front_active.png" + }, paramtype2 = "facedir", drop = "technic:"..ltier.."_"..machine_name, groups = active_groups, @@ -191,6 +237,25 @@ function technic.register_base_machine(data) allow_metadata_inventory_move = technic.machine_inventory_move, technic_run = run, technic_disabled_machine_name = "technic:"..ltier.."_"..machine_name, + on_receive_fields = function(pos, formname, fields, sender) + local node = minetest.get_node(pos) + if not pipeworks.may_configure(pos, sender) then return end + fs_helpers.on_receive_fields(pos, fields) + local meta = minetest.get_meta(pos) + local form_buttons = "" + if not string.find(node.name, ":lv_") then + form_buttons = fs_helpers.cycling_button( + meta, + pipeworks.button_base, + "splitstacks", + { + pipeworks.button_off, + pipeworks.button_on + } + )..pipeworks.button_label + end + meta:set_string("formspec", formspec..form_buttons) + end, }) technic.register_machine(tier, "technic:"..ltier.."_"..machine_name, technic.receiver) -- cgit v1.2.3