From ec73a8508fc8458e10be6a93bbc3be2eba26595f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Mon, 19 Jan 2015 19:37:46 +0100 Subject: [PATCH] add custom collision and selection box handling to CNC machine also clean up formatting of surrounding code --- technic/machines/register/common.lua | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index 054d627..d68be14 100644 --- a/technic/machines/register/common.lua +++ b/technic/machines/register/common.lua @@ -37,23 +37,24 @@ end -function technic.send_items(pos, x_velocity, z_velocity) +function technic.send_items(pos, x_velocity, z_velocity, output_name) -- Send items on their way in the pipe system. + if output_name == nil then + output_name = "dst" + end + local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local i = 0 - for _, stack in ipairs(inv:get_list("dst")) do + for _, stack in ipairs(inv:get_list(output_name)) do i = i + 1 if stack then local item0 = stack:to_table() if item0 then item0["count"] = "1" - local item1 = 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=x_velocity, y=0, z=z_velocity}) - item1:setacceleration({x=0, y=0, z=0}) + technic.tube_inject_item(pos, pos, vector.new(x_velocity, 0, z_velocity), item0) stack:take_item(1) - inv:set_stack("dst", i, stack) + inv:set_stack(output_name, i, stack) return end end @@ -67,21 +68,25 @@ if meta:get_int("cook_time") < result.time / speed then return end - local result = minetest.get_craft_result({method = "cooking", width = 1, items = inv:get_list("src")}) + local result + local afterfuel + result, afterfuel = minetest.get_craft_result({method = "cooking", width = 1, items = inv:get_list("src")}) if result and result.item then meta:set_int("cook_time", 0) -- check if there's room for output in "dst" list if inv:room_for_item("dst", result.item) then - srcstack = inv:get_stack("src", 1) - srcstack:take_item() - inv:set_stack("src", 1, srcstack) + inv:set_stack("src", 1, afterfuel.items[1]) inv:add_item("dst", result.item) end end end -function technic.handle_machine_pipeworks(pos, tube_upgrade) +function technic.handle_machine_pipeworks(pos, tube_upgrade, send_function) + if send_function == nil then + send_function = technic.send_items + end + local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() @@ -96,16 +101,15 @@ if node.param2 == 0 then pos1.x = pos1.x + 1 x_velocity = 1 end local output_tube_connected = false - local meta1 = minetest.get_meta(pos1) - if meta1:get_int("tubelike") == 1 then + local node1 = minetest.get_node(pos1) + if minetest.get_item_group(node1.name, "tubedevice") > 0 then output_tube_connected = true end - tube_time = meta:get_int("tube_time") - tube_time = tube_time + tube_upgrade - if tube_time > 3 then + local tube_time = meta:get_int("tube_time") + tube_upgrade + if tube_time >= 2 then tube_time = 0 if output_tube_connected then - technic.send_items(pos, x_velocity, z_velocity) + send_function(pos, x_velocity, z_velocity) end end meta:set_int("tube_time", tube_time) @@ -117,8 +121,10 @@ local inv = meta:get_inventory() if not inv:is_empty("src") or not inv:is_empty("dst") or not inv:is_empty("upgrade1") or not inv:is_empty("upgrade2") then - minetest.chat_send_player(player:get_player_name(), - S("Machine cannot be removed because it is not empty")) + if player then + minetest.chat_send_player(player:get_player_name(), + S("Machine cannot be removed because it is not empty")) + end return false else return true -- Gitblit v1.8.0