From 00f61dfb81100094b64de06ca4e1ef73ef8bcd47 Mon Sep 17 00:00:00 2001 From: Tim <t4im@users.noreply.github.com> Date: Fri, 30 Jan 2015 05:09:20 +0100 Subject: [PATCH] rewrite extractor dye recipes, adding a few dyes and making it work better with the dye mod also preventing any issues if it is being run in a game without it --- technic/machines/register/generator.lua | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua index ec1ea79..694c675 100644 --- a/technic/machines/register/generator.lua +++ b/technic/machines/register/generator.lua @@ -51,19 +51,20 @@ local inv = meta:get_inventory() if not inv:is_empty("src") then local fuellist = inv:get_list("src") - local fuel = minetest.get_craft_result( + local fuel + local afterfuel + fuel, afterfuel = 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)) technic.swap_node(pos, "technic:"..ltier.."_generator") + meta:set_int(tier.."_EU_supply", 0) return end meta:set_int("burn_time", fuel.time) meta:set_int("burn_totaltime", fuel.time) - local stack = inv:get_stack("src", 1) - stack:take_item() - inv:set_stack("src", 1, stack) + inv:set_stack("src", 1, afterfuel.items[1]) technic.swap_node(pos, "technic:"..ltier.."_generator_active") meta:set_int(tier.."_EU_supply", data.supply) else @@ -134,7 +135,7 @@ local meta = minetest.get_meta(pos) -- Connected back? - if meta:get_int(tier.."_EU_timeout") > 0 then return end + if meta:get_int(tier.."_EU_timeout") > 0 then return false end local burn_time = meta:get_int("burn_time") or 0 @@ -142,7 +143,7 @@ meta:set_int(tier.."_EU_supply", 0) meta:set_int("burn_time", 0) technic.swap_node(pos, "technic:"..ltier.."_generator") - return + return false end local burn_totaltime = meta:get_int("burn_totaltime") or 0 @@ -157,8 +158,7 @@ "image[4, 1;1, 1;default_furnace_fire_bg.png^[lowpart:".. (percent)..":default_furnace_fire_fg.png]".. "list[current_player;main;0, 5;8, 4;]") - local timer = minetest.get_node_timer(pos) - timer:start(1) + return true end, }) -- Gitblit v1.8.0