From a793747d92d9b1d93153c7fb4e0c82fe90624c78 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Thu, 18 Jun 2015 04:16:47 +0200
Subject: [PATCH] Move coal furnaces to other/

---
 technic/machines/register/generator.lua |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua
index d481242..31c1cef 100644
--- a/technic/machines/register/generator.lua
+++ b/technic/machines/register/generator.lua
@@ -32,7 +32,8 @@
 		"label[0,0;"..S("Fuel-Fired %s Generator"):format(tier).."]"..
 		"list[current_name;src;3,1;1,1;]"..
 		"image[4,1;1,1;default_furnace_fire_bg.png]"..
-		"list[current_player;main;0,5;8,4;]"
+		"list[current_player;main;0,5;8,4;]"..
+		"listring[]"
 	
 	local desc = S("Fuel-Fired %s Generator"):format(tier)
 	
@@ -51,19 +52,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
@@ -80,7 +82,8 @@
 				"list[current_name;src;3, 1;1, 1;]"..
 				"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;]")
+				"list[current_player;main;0, 5;8, 4;]"..
+				"listring[]")
 	end
 	
 	minetest.register_node("technic:"..ltier.."_generator", {
@@ -108,6 +111,8 @@
 		allow_metadata_inventory_take = technic.machine_inventory_take,
 		allow_metadata_inventory_move = technic.machine_inventory_move,
 		technic_run = run,
+		after_place_node = data.tube and pipeworks.after_place,
+		after_dig_node = technic.machine_after_dig_node
 	})
 
 	minetest.register_node("technic:"..ltier.."_generator_active", {
@@ -126,7 +131,40 @@
 		allow_metadata_inventory_take = technic.machine_inventory_take,
 		allow_metadata_inventory_move = technic.machine_inventory_move,
 		technic_run = run,
-		technic_disabled_machine_name = "technic:"..ltier.."_generator",
+		technic_on_disable = function(pos, node)
+			local timer = minetest.get_node_timer(pos)
+        		timer:start(1)
+        	end,
+		on_timer = function(pos, node)
+			local meta = minetest.get_meta(pos)
+			
+			-- Connected back?
+			if meta:get_int(tier.."_EU_timeout") > 0 then return false end
+			
+			local burn_time = meta:get_int("burn_time") or 0
+
+			if burn_time <= 0 then
+				meta:set_int(tier.."_EU_supply", 0)
+				meta:set_int("burn_time", 0)
+				technic.swap_node(pos, "technic:"..ltier.."_generator")
+				return false
+			end
+
+			local burn_totaltime = meta:get_int("burn_totaltime") or 0
+			if burn_totaltime == 0 then burn_totaltime = 1 end
+			burn_time = burn_time - 1
+			meta:set_int("burn_time", burn_time)
+			local percent = math.floor(burn_time / burn_totaltime * 100)
+			meta:set_string("formspec", 
+				"size[8, 9]"..
+				"label[0, 0;"..minetest.formspec_escape(desc).."]"..
+				"list[current_name;src;3, 1;1, 1;]"..
+				"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;]"..
+				"listring[]")
+			return true
+		end,
 	})
 
 	technic.register_machine(tier, "technic:"..ltier.."_generator",        technic.producer)

--
Gitblit v1.8.0