From d0efa15b983f7a0a96e1a7abcdad713715dfeeeb Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 18 Aug 2014 16:14:15 +0200
Subject: [PATCH] In quarry, skip past undiggable nodes
---
technic/machines/other/injector.lua | 156 ++++++++++++++++++++++++---------------------------
1 files changed, 73 insertions(+), 83 deletions(-)
diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua
index c493744..36c2592 100644
--- a/technic/machines/other/injector.lua
+++ b/technic/machines/other/injector.lua
@@ -1,78 +1,7 @@
-minetest.register_craftitem("technic:injector", {
- description = "Injector",
- stack_max = 99,
-})
-minetest.register_craft({
- output = 'technic:injector 1',
- recipe = {
- {'', 'technic:control_logic_unit',''},
- {'', 'default:chest',''},
- {'', 'pipeworks:tube_000000',''},
- }
-})
+local S = technic.getter
-minetest.register_node("technic:injector", {
- description = "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,
- 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;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", "Injector")
- local inv = meta:get_inventory()
- inv:set_size("main", 8*4)
- meta:set_string("mode","single items")
- end,
- can_dig = function(pos,player)
- local meta = minetest.env: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
- local mode=meta:set_string("mode",mode)
- end
- meta:set_string("formspec",
- "invsize[8,9;]"..
- "label[0,0;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;]")
- end,
-})
-
-minetest.register_abm({
- 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
- end,
-})
-
-function inject_items (pos)
+local function inject_items (pos)
local meta=minetest.env:get_meta(pos)
local inv = meta:get_inventory()
local mode=meta:get_string("mode")
@@ -83,12 +12,9 @@
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=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
@@ -102,10 +28,7 @@
if stack then
local item0=stack:to_table()
if item0 then
- 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=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
@@ -115,3 +38,70 @@
end
end
+
+minetest.register_craft({
+ output = 'technic:injector 1',
+ recipe = {
+ {'', 'technic:control_logic_unit',''},
+ {'', 'default:chest',''},
+ {'', 'pipeworks:tube_1',''},
+ }
+})
+
+local function set_injector_formspec(meta)
+ local is_stack = meta:get_string("mode") == "whole stacks"
+ meta:set_string("formspec",
+ "invsize[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").."]")..
+ "list[current_name;main;0,2;8,2;]"..
+ "list[current_player;main;0,5;8,4;]")
+end
+
+minetest.register_node("technic:injector", {
+ description = S("Self-Contained 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 = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice=1},
+ tube = {connect_sides={bottom=1}},
+ sounds = default.node_sound_wood_defaults(),
+ on_construct = function(pos)
+ local meta = minetest.env:get_meta(pos)
+ meta:set_string("infotext", S("Self-Contained Injector"))
+ local inv = meta:get_inventory()
+ inv:set_size("main", 8*4)
+ meta:set_string("mode","single items")
+ set_injector_formspec(meta)
+ end,
+ can_dig = function(pos,player)
+ local meta = minetest.env: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)
+ 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)
+ 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,
+})
+
+minetest.register_abm({
+ nodenames = {"technic:injector"},
+ interval = 1,
+ chance = 1,
+ action = function(pos, node, active_object_count, active_object_count_wider)
+ 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