From 1d0687556a52891aeadc0e8d9a58e44c53cb826b Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Fri, 15 Aug 2014 13:25:46 +0200
Subject: [PATCH] Fix music player's sound management
---
technic/machines/other/injector.lua | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua
index c131470..eb63987 100644
--- a/technic/machines/other/injector.lua
+++ b/technic/machines/other/injector.lua
@@ -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
@@ -54,8 +48,21 @@
}
})
+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("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},
@@ -63,17 +70,11 @@
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;"..S("Mode: %s"):format("single items").."]"..
- "list[current_name;main;0,2;8,2;]"..
- "list[current_player;main;0,5;8,4;]")
- meta:set_string("infotext", S("Injector"))
+ 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);
@@ -82,22 +83,9 @@
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)
- end
- meta:set_string("formspec",
- "invsize[8,9;]"..
- "label[0,0;"..S("Injector").."]"..
- "button[0,1;.8,.8;mode;]"..
- "label[.8,1;"..S("Mode: %s"):format(S(mode)).."]"..
- "list[current_name;main;0,2;8,2;]"..
- "list[current_player;main;0,5;8,4;]")
+ 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,
--
Gitblit v1.8.0