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/alloy_furnace.lua | 60 +++++++++++++-----------------------------------------------
1 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/technic/machines/register/alloy_furnace.lua b/technic/machines/register/alloy_furnace.lua
index e2c2ff2..1195b50 100644
--- a/technic/machines/register/alloy_furnace.lua
+++ b/technic/machines/register/alloy_furnace.lua
@@ -6,11 +6,11 @@
-- Register recipe in a table
technic.register_alloy_recipe = function(metal1, count1, metal2, count2, result, count3)
- in1 = {
+ local in1 = {
name = metal1,
count = count1,
}
- in2 = {
+ local in2 = {
name = metal2,
count = count2,
}
@@ -134,18 +134,10 @@
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(),
- S("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.."_alloy_furnace_active",{
@@ -163,36 +155,10 @@
tube = data.tube and tube or nil,
legacy_facedir_simple = true,
sounds = default.node_sound_stone_defaults(),
- 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(),
- S("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_count()
- 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_count()
- 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({
@@ -239,7 +205,7 @@
end
if not result or
not inv:room_for_item("dst", result) then
- hacky_swap_node(pos, machine_node)
+ technic.swap_node(pos, machine_node)
meta:set_string("infotext", S("%s Idle"):format(machine_name))
meta:set_int(tier.."_EU_demand", 0)
return
@@ -247,11 +213,11 @@
if eu_input < machine_demand[EU_upgrade+1] then
-- Unpowered - go idle
- hacky_swap_node(pos, machine_node)
+ 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")
+ technic.swap_node(pos, machine_node.."_active")
meta:set_string("infotext", S("%s Active"):format(machine_name))
meta:set_int("src_time", meta:get_int("src_time") + 1)
if meta:get_int("src_time") == data.cook_time then
--
Gitblit v1.8.0