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/electric_furnace.lua | 137 ++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 83 deletions(-) diff --git a/technic/machines/register/electric_furnace.lua b/technic/machines/register/electric_furnace.lua index 7d57a59..36e4f6d 100644 --- a/technic/machines/register/electric_furnace.lua +++ b/technic/machines/register/electric_furnace.lua @@ -1,4 +1,20 @@ +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_electric_furnace(data) local tier = data.tier local ltier = string.lower(tier) @@ -6,26 +22,21 @@ local tube_side_texture = data.tube and "technic_"..ltier.."_electric_furnace_side_tube.png" or "technic_"..ltier.."_electric_furnace_side.png" - 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}, - } + local groups = {cracky=2} + local active_groups = {cracky=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 formspec = "invsize[8,10;]".. "list[current_name;src;3,1;1,1;]".. "list[current_name;dst;5,1;2,2;]".. "list[current_player;main;0,6;8,4;]".. - "label[0,0;"..tier.." Electric Furnace]" + "label[0,0;"..S("%s Electric Furnace"):format(tier).."]" if data.upgrade then formspec = formspec.. "list[current_name;upgrade1;1,4;1,1;]".. @@ -33,10 +44,8 @@ "label[1,5;Upgrade Slots]" end - data.formspec = formspec - minetest.register_node("technic:"..ltier.."_electric_furnace", { - description = tier.." Electric furnace", + description = S("%s Electric furnace"):format(tier), tiles = {"technic_"..ltier.."_electric_furnace_top.png", "technic_"..ltier.."_electric_furnace_bottom.png", tube_side_texture, @@ -44,36 +53,26 @@ "technic_"..ltier.."_electric_furnace_side.png", "technic_"..ltier.."_electric_furnace_front.png"}, paramtype2 = "facedir", - groups = {cracky=2, tubedevice=1, tubedevice_receiver=1}, + groups = groups, legacy_facedir_simple = true, sounds = default.node_sound_stone_defaults(), - tube = tube, - technic = data, + tube = data.tube and tube or nil, on_construct = function(pos) local meta = minetest.get_meta(pos) local name = minetest.get_node(pos).name - local data = minetest.registered_nodes[name].technic - meta:set_string("infotext", data.tier.." Electric furnace") + meta:set_string("infotext", S("%s Electric furnace"):format(tier)) meta:set_int("tube_time", 0) - meta:set_string("formspec", data.formspec) + meta:set_string("formspec", formspec) local inv = meta:get_inventory() inv:set_size("src", 1) inv:set_size("dst", 4) inv:set_size("upgrade1", 1) inv:set_size("upgrade2", 1) end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - 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(), - "Machine cannot be removed because it is not empty"); - return false - else - return true - end - end, + can_dig = technic.machine_can_dig, + 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_node("technic:"..ltier.."_electric_furnace_active", { @@ -85,55 +84,28 @@ "technic_"..ltier.."_electric_furnace_side.png", "technic_"..ltier.."_electric_furnace_front_active.png"}, paramtype2 = "facedir", - groups = {cracky=2, tubedevice=1, tubedevice_receiver=1, not_in_creative_inventory=1}, + groups = active_groups, light_source = 8, legacy_facedir_simple = true, sounds = default.node_sound_stone_defaults(), - tube = tube, - technic = data, + tube = data.tube and tube or nil, on_construct = function(pos) local meta = minetest.get_meta(pos) local name = minetest.get_node(pos).name local data = minetest.registered_nodes[name].technic - meta:set_string("infotext", data.tier.." Electric furnace") + meta:set_string("infotext", S("%s Electric furnace"):format(tier)) meta:set_int("tube_time", 0) - meta:set_string("formspec", data.formspec) + meta:set_string("formspec", formspec) local inv = meta:get_inventory() inv:set_size("src", 1) inv:set_size("dst", 4) inv:set_size("upgrade1", 1) inv:set_size("upgrade2", 1) end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - 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(), - "Machine cannot be removed because it is not empty"); - return false - else - return true - end - end, - -- These three makes sure upgrades are not moved in or out while the furnace is active. - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - if listname == "src" or listname == "dst" then - return stack:get_stack_max() - else - return 0 -- Disallow the move - end - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - if listname == "src" or listname == "dst" then - return stack:get_stack_max() - else - return 0 -- Disallow the move - end - end, - allow_metadata_inventory_move = function(pos, from_list, to_list, to_list, to_index, count, player) - return 0 - end, + can_dig = technic.machine_can_dig, + 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({ @@ -142,18 +114,17 @@ interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local data = minetest.registered_nodes[node.name].technic local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - local eu_input = meta:get_int(data.tier.."_EU_input") + local eu_input = meta:get_int(tier.."_EU_input") -- Machine information - local machine_name = data.tier.." Electric Furnace" - local machine_node = "technic:"..string.lower(data.tier).."_electric_furnace" + local machine_name = S("%s Electric Furnace"):format(tier) + local machine_node = "technic:"..ltier.."_electric_furnace" local machine_demand = data.demand -- Power off automatically if no longer connected to a switching station - technic.switching_station_timeout_count(pos, data.tier) + technic.switching_station_timeout_count(pos, tier) -- Check upgrade slots local EU_upgrade, tube_upgrade = 0, 0 @@ -170,24 +141,24 @@ items = inv:get_list("src")}) if not result or result.time == 0 or not inv:room_for_item("dst", result.item) then - meta:set_int(data.tier.."_EU_demand", 0) - hacky_swap_node(pos, machine_node) - meta:set_string("infotext", machine_name.." Idle") + meta:set_int(tier.."_EU_demand", 0) + technic.swap_node(pos, machine_node) + meta:set_string("infotext", S("%s Idle"):format(machine_name)) return end if eu_input < machine_demand[EU_upgrade+1] then -- Unpowered - go idle - hacky_swap_node(pos, machine_node) - meta:set_string("infotext", machine_name.." Unpowered") + technic.swap_node(pos, machine_node) + meta:set_string("infotext", S("%s Unpowered"):format(machine_name)) elseif eu_input >= machine_demand[EU_upgrade+1] then -- Powered - hacky_swap_node(pos, machine_node.."_active") - meta:set_string("infotext", machine_name.." Active") + technic.swap_node(pos, machine_node.."_active") + meta:set_string("infotext", S("%s Active"):format(machine_name)) technic.smelt_item(meta, result, data.speed) end - meta:set_int(data.tier.."_EU_demand", machine_demand[EU_upgrade+1]) + meta:set_int(tier.."_EU_demand", machine_demand[EU_upgrade+1]) end, }) -- Gitblit v1.8.0