forked from mtcontrib/homedecor_modpack
		
	Fixed missing cooking ABM code for locked ovens.
This commit is contained in:
		@@ -41,6 +41,7 @@ end
 | 
			
		||||
  |   If <infotext> is not specified (or is nil), the infotext will be the
 | 
			
		||||
  |   base node's description prefixed by "Locked ".
 | 
			
		||||
  |
 | 
			
		||||
  |   The ABM for the locked oven is defined in oven.lua.
 | 
			
		||||
  ]]
 | 
			
		||||
local function create_locked ( name, infotext )
 | 
			
		||||
    local def = { }
 | 
			
		||||
@@ -143,6 +144,8 @@ local items = {
 | 
			
		||||
      "Nightstand" },
 | 
			
		||||
    { "oven",
 | 
			
		||||
      "Oven" },
 | 
			
		||||
    { "oven_active",
 | 
			
		||||
      "Oven (active)" }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
for _,item in ipairs(items) do
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										101
									
								
								oven.lua
									
									
									
									
									
								
							
							
						
						
									
										101
									
								
								oven.lua
									
									
									
									
									
								
							@@ -195,3 +195,104 @@ minetest.register_abm({
 | 
			
		||||
		inv:set_stack("fuel", 1, stack)
 | 
			
		||||
	end,
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_abm({
 | 
			
		||||
	nodenames = {"homedecor:oven_locked","homedecor:oven_active_locked"},
 | 
			
		||||
	interval = 1.0,
 | 
			
		||||
	chance = 1,
 | 
			
		||||
	action = function(pos, node, active_object_count, active_object_count_wider)
 | 
			
		||||
		local meta = minetest.env:get_meta(pos)
 | 
			
		||||
		for i, name in ipairs({
 | 
			
		||||
				"fuel_totaltime",
 | 
			
		||||
				"fuel_time",
 | 
			
		||||
				"src_totaltime",
 | 
			
		||||
				"src_time"
 | 
			
		||||
		}) do
 | 
			
		||||
			if meta:get_string(name) == "" then
 | 
			
		||||
				meta:set_float(name, 0.0)
 | 
			
		||||
			end
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
		local inv = meta:get_inventory()
 | 
			
		||||
 | 
			
		||||
		local srclist = inv:get_list("src")
 | 
			
		||||
		local cooked = nil
 | 
			
		||||
		
 | 
			
		||||
		if srclist then
 | 
			
		||||
			cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
 | 
			
		||||
		end
 | 
			
		||||
		
 | 
			
		||||
		local was_active = false
 | 
			
		||||
		
 | 
			
		||||
		if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
 | 
			
		||||
			was_active = true
 | 
			
		||||
			meta:set_float("fuel_time", meta:get_float("fuel_time") + 1)
 | 
			
		||||
			meta:set_float("src_time", meta:get_float("src_time") + 1)
 | 
			
		||||
			if cooked and cooked.item and meta:get_float("src_time") >= cooked.time then
 | 
			
		||||
				-- check if there's room for output in "dst" list
 | 
			
		||||
				if inv:room_for_item("dst",cooked.item) then
 | 
			
		||||
					-- Put result in "dst" list
 | 
			
		||||
					inv:add_item("dst", cooked.item)
 | 
			
		||||
					-- take stuff from "src" list
 | 
			
		||||
					srcstack = inv:get_stack("src", 1)
 | 
			
		||||
					srcstack:take_item()
 | 
			
		||||
					inv:set_stack("src", 1, srcstack)
 | 
			
		||||
				else
 | 
			
		||||
					print(S("Could not insert '%s'"):format(cooked.item:to_string()))
 | 
			
		||||
				end
 | 
			
		||||
				meta:set_string("src_time", 0)
 | 
			
		||||
			end
 | 
			
		||||
		end
 | 
			
		||||
		
 | 
			
		||||
		if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
 | 
			
		||||
			local percent = math.floor(meta:get_float("fuel_time") /
 | 
			
		||||
					meta:get_float("fuel_totaltime") * 100)
 | 
			
		||||
			meta:set_string("infotext",S("Locked oven active: %d%%"):format(percent))
 | 
			
		||||
			hacky_swap_node(pos,"homedecor:oven_active_locked")
 | 
			
		||||
			meta:set_string("formspec",
 | 
			
		||||
				"size[8,9]"..
 | 
			
		||||
				"image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:"..
 | 
			
		||||
						(100-percent)..":default_furnace_fire_fg.png]"..
 | 
			
		||||
				"list[current_name;fuel;2,3;1,1;]"..
 | 
			
		||||
				"list[current_name;src;2,1;1,1;]"..
 | 
			
		||||
				"list[current_name;dst;5,1;2,2;]"..
 | 
			
		||||
				"list[current_player;main;0,5;8,4;]")
 | 
			
		||||
			return
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
		local fuel = nil
 | 
			
		||||
		local cooked = nil
 | 
			
		||||
		local fuellist = inv:get_list("fuel")
 | 
			
		||||
		local srclist = inv:get_list("src")
 | 
			
		||||
		
 | 
			
		||||
		if srclist then
 | 
			
		||||
			cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
 | 
			
		||||
		end
 | 
			
		||||
		if fuellist then
 | 
			
		||||
			fuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
		if fuel.time <= 0 then
 | 
			
		||||
			meta:set_string("infotext",S("Locked oven out of fuel"))
 | 
			
		||||
			hacky_swap_node(pos,"homedecor:oven_locked")
 | 
			
		||||
			meta:set_string("formspec", default.oven_inactive_formspec)
 | 
			
		||||
			return
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
		if cooked.item:is_empty() then
 | 
			
		||||
			if was_active then
 | 
			
		||||
				meta:set_string("infotext",S("Locked oven is empty"))
 | 
			
		||||
				hacky_swap_node(pos,"homedecor:oven_locked")
 | 
			
		||||
				meta:set_string("formspec", default.oven_inactive_formspec)
 | 
			
		||||
			end
 | 
			
		||||
			return
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
		meta:set_string("fuel_totaltime", fuel.time)
 | 
			
		||||
		meta:set_string("fuel_time", 0)
 | 
			
		||||
		
 | 
			
		||||
		local stack = inv:get_stack("fuel", 1)
 | 
			
		||||
		stack:take_item()
 | 
			
		||||
		inv:set_stack("fuel", 1, stack)
 | 
			
		||||
	end,
 | 
			
		||||
})
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user