From ebc114df71cc20868afbd3c6dea4039dc14c1a0e Mon Sep 17 00:00:00 2001
From: Carter Kolwey <fhrfuyduduf@gmail.com>
Date: Sat, 11 Jan 2014 18:30:10 +0100
Subject: [PATCH] Fixed music player
---
technic/machines/register/generator.lua | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua
index d3abe31..d253323 100644
--- a/technic/machines/register/generator.lua
+++ b/technic/machines/register/generator.lua
@@ -1,9 +1,31 @@
-
local S = technic.getter
+
+local tube = {
+ insert_object = function(pos, node, stack, direction)
+ local meta = minetest.get_meta(pos)
+ local inv = meta:get_inventory()
+ return inv:add_item("src", stack)
+ end,
+ can_insert = function(pos, node, stack, direction)
+ local meta = minetest.get_meta(pos)
+ local inv = meta:get_inventory()
+ return inv:room_for_item("src", stack)
+ end,
+ connect_sides = {left=1, right=1, back=1, top=1, bottom=1},
+}
function technic.register_generator(data)
local tier = data.tier
local ltier = string.lower(tier)
+
+ local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2}
+ local active_groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}
+ if data.tube then
+ groups.tubedevice = 1
+ groups.tubedevice_receiver = 1
+ active_groups.tubedevice = 1
+ active_groups.tubedevice_receiver = 1
+ end
local generator_formspec =
"invsize[8,9;]"..
@@ -19,14 +41,16 @@
"technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_side.png",
"technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_front.png"},
paramtype2 = "facedir",
- groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
+ groups = groups,
legacy_facedir_simple = true,
sounds = default.node_sound_wood_defaults(),
+ tube = data.tube and tube or nil,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", desc)
meta:set_int(data.tier.."_EU_supply", 0)
meta:set_int("burn_time", 0)
+ meta:set_int("tube_time", 0)
meta:set_string("formspec", generator_formspec)
local inv = meta:get_inventory()
inv:set_size("src", 1)
@@ -43,10 +67,10 @@
"technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_side.png",
"technic_"..ltier.."_generator_side.png", "technic_"..ltier.."_generator_front_active.png"},
paramtype2 = "facedir",
- groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
- not_in_creative_inventory=1},
+ groups = active_groups,
legacy_facedir_simple = true,
sounds = default.node_sound_wood_defaults(),
+ tube = data.tube and tube or nil,
drop = "technic:"..ltier.."_generator",
can_dig = technic.machine_can_dig,
allow_metadata_inventory_put = technic.machine_inventory_put,
@@ -63,7 +87,7 @@
local burn_totaltime = meta:get_int("burn_totaltime")
-- If more to burn and the energy produced was used: produce some more
if burn_time > 0 then
- meta:set_int(data.tier.."_EU_supply", data.supply)
+ meta:set_int(tier.."_EU_supply", data.supply)
burn_time = burn_time - 1
meta:set_int("burn_time", burn_time)
end
@@ -72,10 +96,12 @@
local inv = meta:get_inventory()
if not inv:is_empty("src") then
local fuellist = inv:get_list("src")
- fuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
+ local fuel = minetest.get_craft_result(
+ {method = "fuel", width = 1,
+ items = fuellist})
if not fuel or fuel.time == 0 then
meta:set_string("infotext", S("%s Out Of Fuel"):format(desc))
- hacky_swap_node(pos, "technic:"..ltier.."_generator")
+ technic.swap_node(pos, "technic:"..ltier.."_generator")
return
end
meta:set_int("burn_time", fuel.time)
@@ -83,11 +109,11 @@
local stack = inv:get_stack("src", 1)
stack:take_item()
inv:set_stack("src", 1, stack)
- hacky_swap_node(pos, "technic:"..ltier.."_generator_active")
- meta:set_int(data.tier.."_EU_supply", data.supply)
+ technic.swap_node(pos, "technic:"..ltier.."_generator_active")
+ meta:set_int(tier.."_EU_supply", data.supply)
else
- hacky_swap_node(pos, "technic:"..ltier.."_generator")
- meta:set_int(data.tier.."_EU_supply", 0)
+ technic.swap_node(pos, "technic:"..ltier.."_generator")
+ meta:set_int(tier.."_EU_supply", 0)
end
end
if burn_totaltime == 0 then burn_totaltime = 1 end
@@ -102,7 +128,7 @@
"list[current_player;main;0, 5;8, 4;]")
end
})
- technic.register_machine(data.tier, "technic:"..ltier.."_generator", technic.producer)
- technic.register_machine(data.tier, "technic:"..ltier.."_generator", technic.producer)
+ technic.register_machine(tier, "technic:"..ltier.."_generator", technic.producer)
+ technic.register_machine(tier, "technic:"..ltier.."_generator_active", technic.producer)
end
--
Gitblit v1.8.0