From 623fcae4a4ad3ec12cc242b29b0d781357cff3f7 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sat, 24 May 2014 00:24:30 +0200
Subject: [PATCH] Fix supply converter
---
technic/machines/register/alloy_furnace.lua | 137 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/technic/machines/register/alloy_furnace.lua b/technic/machines/register/alloy_furnace.lua
index eb9d5b3..ac1cd05 100644
--- a/technic/machines/register/alloy_furnace.lua
+++ b/technic/machines/register/alloy_furnace.lua
@@ -1,16 +1,24 @@
local S = technic.getter
+if unified_inventory and unified_inventory.register_craft_type then
+ unified_inventory.register_craft_type("alloy", {
+ description = S("Alloy cooking"),
+ height = 2,
+ width = 1,
+ })
+end
+
-- Register alloy recipes
technic.alloy_recipes = {}
-- 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,
}
@@ -32,10 +40,40 @@
type = "alloy",
output = result.." "..count3,
items = {metal1.." "..count1, metal2.." "..count2},
- width = 2,
+ width = 0,
})
end
end
+
+minetest.after(0.01, function ()
+ for _, recipe in pairs(technic.alloy_recipes) do
+ local in1 = recipe.input[1]
+ local in2 = recipe.input[2]
+ local in1n = in1.name
+ local in2n = in2.name
+ while minetest.registered_aliases[in1n] do
+ in1n = minetest.registered_aliases[in1n]
+ end
+ while minetest.registered_aliases[in2n] do
+ in2n = minetest.registered_aliases[in2n]
+ end
+ if in1n > in2n then
+ local temp = in1
+ in1 = in2
+ in2 = temp
+ temp = in1n
+ in1n = in2n
+ in2n = temp
+ end
+ technic.alloy_recipes[in1n.." "..in2n] = {
+ input = {
+ { name = in1n, count = in1.count },
+ { name = in2n, count = in2.count },
+ },
+ output = recipe.output,
+ }
+ end
+end)
-- Retrieve a recipe given the input metals.
function technic.get_alloy_recipe(stack1, stack2)
@@ -57,8 +95,12 @@
technic.register_alloy_recipe("technic:copper_dust", 3, "technic:tin_dust", 1, "technic:bronze_dust", 4)
technic.register_alloy_recipe("default:copper_ingot", 3, "moreores:tin_ingot", 1, "moreores:bronze_ingot", 4)
-technic.register_alloy_recipe("technic:iron_dust", 3, "technic:chromium_dust", 1, "technic:stainless_steel_dust", 4)
-technic.register_alloy_recipe("default:steel_ingot", 3, "technic:chromium_ingot", 1, "technic:stainless_steel_ingot", 4)
+technic.register_alloy_recipe("technic:wrought_iron_dust", 1, "technic:coal_dust", 1, "technic:carbon_steel_dust", 1)
+technic.register_alloy_recipe("technic:wrought_iron_ingot", 1, "technic:coal_dust", 1, "technic:carbon_steel_ingot", 1)
+technic.register_alloy_recipe("technic:carbon_steel_dust", 1, "technic:coal_dust", 1, "technic:cast_iron_dust", 1)
+technic.register_alloy_recipe("technic:carbon_steel_ingot", 1, "technic:coal_dust", 1, "technic:cast_iron_ingot", 1)
+technic.register_alloy_recipe("technic:carbon_steel_dust", 3, "technic:chromium_dust", 1, "technic:stainless_steel_dust", 4)
+technic.register_alloy_recipe("technic:carbon_steel_ingot", 3, "technic:chromium_ingot", 1, "technic:stainless_steel_ingot", 4)
technic.register_alloy_recipe("technic:copper_dust", 2, "technic:zinc_dust", 1, "technic:brass_dust", 3)
technic.register_alloy_recipe("default:copper_ingot", 2, "technic:zinc_ingot", 1, "technic:brass_ingot", 3)
technic.register_alloy_recipe("default:sand", 2, "technic:coal_dust", 2, "technic:silicon_wafer", 1)
@@ -105,10 +147,8 @@
formspec = formspec..
"list[current_name;upgrade1;1,4;1,1;]"..
"list[current_name;upgrade2;2,4;1,1;]"..
- "label[1,5;Upgrade Slots]"
+ "label[1,5;"..S("Upgrade Slots").."]"
end
-
- data.formspec = formspec
minetest.register_node("technic:"..ltier.."_alloy_furnace", {
description = S("%s Alloy Furnace"):format(tier),
@@ -121,17 +161,14 @@
paramtype2 = "facedir",
groups = groups,
tube = data.tube and tube or nil,
- technic = data,
legacy_facedir_simple = true,
sounds = default.node_sound_stone_defaults(),
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", S("%s Alloy Furnace"):format(data.tier))
- meta:set_string("formspec", data.formspec)
+ meta:set_string("infotext", S("%s Alloy Furnace"):format(tier))
+ meta:set_string("formspec", formspec)
meta:set_int("tube_time", 0)
local inv = meta:get_inventory()
inv:set_size("src", 2)
@@ -139,18 +176,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",{
@@ -166,39 +195,12 @@
drop = "technic:"..ltier.."_alloy_furnace",
groups = active_groups,
tube = data.tube and tube or nil,
- technic = data,
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({
@@ -206,24 +208,23 @@
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 = S("%s Alloy Furnace"):format(data.tier)
- local machine_node = "technic:"..string.lower(data.tier).."_alloy_furnace"
+ local machine_name = S("%s Alloy Furnace"):format(tier)
+ local machine_node = "technic:"..ltier.."_alloy_furnace"
local machine_demand = data.demand
-- Setup meta data if it does not exist.
if not eu_input then
- meta:set_int(data.tier.."_EU_demand", machine_demand[1])
- meta:set_int(data.tier.."_EU_input", 0)
+ meta:set_int(tier.."_EU_demand", machine_demand[1])
+ meta:set_int(tier.."_EU_input", 0)
end
-- 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)
local EU_upgrade, tube_upgrade = 0, 0
if data.upgrade then
@@ -246,19 +247,19 @@
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(data.tier.."_EU_demand", 0)
+ meta:set_int(tier.."_EU_demand", 0)
return
end
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
@@ -277,7 +278,7 @@
end
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