mirror of
https://github.com/minetest/minetest_game.git
synced 2024-12-23 07:10:19 +01:00
Use replacements in furnace and replace lava bucket with empty bucket when used as fuel
This commit is contained in:
parent
467e2029e2
commit
648a11263b
@ -100,4 +100,5 @@ minetest.register_craft({
|
|||||||
type = "fuel",
|
type = "fuel",
|
||||||
recipe = "bucket:bucket_lava",
|
recipe = "bucket:bucket_lava",
|
||||||
burntime = 60,
|
burntime = 60,
|
||||||
|
replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
|
||||||
})
|
})
|
||||||
|
@ -1632,9 +1632,10 @@ minetest.register_abm({
|
|||||||
|
|
||||||
local srclist = inv:get_list("src")
|
local srclist = inv:get_list("src")
|
||||||
local cooked = nil
|
local cooked = nil
|
||||||
|
local aftercooked
|
||||||
|
|
||||||
if srclist then
|
if srclist then
|
||||||
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
|
cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
|
||||||
end
|
end
|
||||||
|
|
||||||
local was_active = false
|
local was_active = false
|
||||||
@ -1649,9 +1650,7 @@ minetest.register_abm({
|
|||||||
-- Put result in "dst" list
|
-- Put result in "dst" list
|
||||||
inv:add_item("dst", cooked.item)
|
inv:add_item("dst", cooked.item)
|
||||||
-- take stuff from "src" list
|
-- take stuff from "src" list
|
||||||
srcstack = inv:get_stack("src", 1)
|
inv:set_stack("src", 1, aftercooked.items[1])
|
||||||
srcstack:take_item()
|
|
||||||
inv:set_stack("src", 1, srcstack)
|
|
||||||
else
|
else
|
||||||
print("Could not insert '"..cooked.item:to_string().."'")
|
print("Could not insert '"..cooked.item:to_string().."'")
|
||||||
end
|
end
|
||||||
@ -1676,6 +1675,7 @@ minetest.register_abm({
|
|||||||
end
|
end
|
||||||
|
|
||||||
local fuel = nil
|
local fuel = nil
|
||||||
|
local afterfuel
|
||||||
local cooked = nil
|
local cooked = nil
|
||||||
local fuellist = inv:get_list("fuel")
|
local fuellist = inv:get_list("fuel")
|
||||||
local srclist = inv:get_list("src")
|
local srclist = inv:get_list("src")
|
||||||
@ -1684,7 +1684,7 @@ minetest.register_abm({
|
|||||||
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
|
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
|
||||||
end
|
end
|
||||||
if fuellist then
|
if fuellist then
|
||||||
fuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
|
fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
|
||||||
end
|
end
|
||||||
|
|
||||||
if fuel.time <= 0 then
|
if fuel.time <= 0 then
|
||||||
@ -1706,9 +1706,7 @@ minetest.register_abm({
|
|||||||
meta:set_string("fuel_totaltime", fuel.time)
|
meta:set_string("fuel_totaltime", fuel.time)
|
||||||
meta:set_string("fuel_time", 0)
|
meta:set_string("fuel_time", 0)
|
||||||
|
|
||||||
local stack = inv:get_stack("fuel", 1)
|
inv:set_stack("fuel", 1, afterfuel.items[1])
|
||||||
stack:take_item()
|
|
||||||
inv:set_stack("fuel", 1, stack)
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user