From d6b0deb989e649e2800932d4a587c3ba9e3e24c7 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Sat, 17 Jan 2015 01:16:39 +0100 Subject: [PATCH] fix cnc stick formspec img (missed the border) --- technic/machines/other/injector.lua | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index 11c5455..e932854 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -2,7 +2,7 @@ local S = technic.getter 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 @@ -12,12 +12,9 @@ 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); + 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 @@ -31,10 +28,7 @@ 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}) + technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) stack:clear() inv:set_stack("main", i, stack) return @@ -75,7 +69,7 @@ tube = {connect_sides={bottom=1}}, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) - local meta = minetest.env:get_meta(pos) + 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) @@ -83,12 +77,12 @@ 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 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 set_injector_formspec(meta) @@ -103,12 +97,11 @@ 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