mirror of
https://github.com/minetest-mods/hopper.git
synced 2025-01-03 11:07:30 +01:00
Hoppers work with node timed Furnaces, reduced abm's, tidied code
This commit is contained in:
TenPlus1
parent
a6f668fe03
commit
7396af91d1
@ -25,3 +25,5 @@ Released under WTFPL
|
||||
0.9 - Added support for Wine mod's wine barrels
|
||||
|
||||
1.0 - New furances do not work properly with hoppers so old reverted to abm furnaces
|
||||
|
||||
1.1 - Hoppers now work with new node timer Furnaces. Reduced Abm's and tidied code.
|
||||
|
||||
291
furnace.lua
291
furnace.lua
@ -1,291 +0,0 @@
|
||||
|
||||
--
|
||||
-- Formspecs
|
||||
--
|
||||
|
||||
local function active_formspec(fuel_percent, item_percent)
|
||||
local formspec =
|
||||
"size[8,8.5]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"list[current_name;src;2.75,0.5;1,1;]"..
|
||||
"list[current_name;fuel;2.75,2.5;1,1;]"..
|
||||
"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
|
||||
(100-fuel_percent)..":default_furnace_fire_fg.png]"..
|
||||
"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:"..
|
||||
(item_percent)..":gui_furnace_arrow_fg.png^[transformR270]"..
|
||||
"list[current_name;dst;4.75,0.96;2,2;]"..
|
||||
"list[current_player;main;0,4.25;8,1;]"..
|
||||
"list[current_player;main;0,5.5;8,3;8]"..
|
||||
"listring[current_name;dst]"..
|
||||
"listring[current_player;main]"..
|
||||
"listring[current_name;src]"..
|
||||
"listring[current_player;main]"..
|
||||
default.get_hotbar_bg(0, 4.25)
|
||||
return formspec
|
||||
end
|
||||
|
||||
local inactive_formspec =
|
||||
"size[8,8.5]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"list[current_name;src;2.75,0.5;1,1;]"..
|
||||
"list[current_name;fuel;2.75,2.5;1,1;]"..
|
||||
"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
|
||||
"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
|
||||
"list[current_name;dst;4.75,0.96;2,2;]"..
|
||||
"list[current_player;main;0,4.25;8,1;]"..
|
||||
"list[current_player;main;0,5.5;8,3;8]"..
|
||||
"listring[current_name;dst]"..
|
||||
"listring[current_player;main]"..
|
||||
"listring[current_name;src]"..
|
||||
"listring[current_player;main]"..
|
||||
default.get_hotbar_bg(0, 4.25)
|
||||
|
||||
--
|
||||
-- Node callback functions that are the same for active and inactive furnace
|
||||
--
|
||||
|
||||
local function can_dig(pos, player)
|
||||
local meta = minetest.get_meta(pos)
|
||||
local inv = meta:get_inventory()
|
||||
return inv:is_empty("fuel") and inv:is_empty("dst") and inv:is_empty("src")
|
||||
end
|
||||
|
||||
local function allow_metadata_inventory_put(pos, listname, index, stack, player)
|
||||
if minetest.is_protected(pos, player:get_player_name()) then
|
||||
return 0
|
||||
end
|
||||
local meta = minetest.get_meta(pos)
|
||||
local inv = meta:get_inventory()
|
||||
if listname == "fuel" then
|
||||
if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then
|
||||
if inv:is_empty("src") then
|
||||
meta:set_string("infotext", "Furnace is empty")
|
||||
end
|
||||
return stack:get_count()
|
||||
else
|
||||
return 0
|
||||
end
|
||||
elseif listname == "src" then
|
||||
return stack:get_count()
|
||||
elseif listname == "dst" then
|
||||
return 0
|
||||
end
|
||||
end
|
||||
|
||||
local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
|
||||
local meta = minetest.get_meta(pos)
|
||||
local inv = meta:get_inventory()
|
||||
local stack = inv:get_stack(from_list, from_index)
|
||||
return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
|
||||
end
|
||||
|
||||
local function allow_metadata_inventory_take(pos, listname, index, stack, player)
|
||||
if minetest.is_protected(pos, player:get_player_name()) then
|
||||
return 0
|
||||
end
|
||||
return stack:get_count()
|
||||
end
|
||||
|
||||
--
|
||||
-- Node definitions
|
||||
--
|
||||
|
||||
minetest.register_node(":default:furnace", {
|
||||
description = "Furnace",
|
||||
tiles = {
|
||||
"default_furnace_top.png", "default_furnace_bottom.png",
|
||||
"default_furnace_side.png", "default_furnace_side.png",
|
||||
"default_furnace_side.png", "default_furnace_front.png"
|
||||
},
|
||||
paramtype2 = "facedir",
|
||||
groups = {cracky=2},
|
||||
legacy_facedir_simple = true,
|
||||
is_ground_content = false,
|
||||
sounds = default.node_sound_stone_defaults(),
|
||||
|
||||
can_dig = can_dig,
|
||||
|
||||
allow_metadata_inventory_put = allow_metadata_inventory_put,
|
||||
allow_metadata_inventory_move = allow_metadata_inventory_move,
|
||||
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
||||
})
|
||||
|
||||
minetest.register_node(":default:furnace_active", {
|
||||
description = "Furnace",
|
||||
tiles = {
|
||||
"default_furnace_top.png", "default_furnace_bottom.png",
|
||||
"default_furnace_side.png", "default_furnace_side.png",
|
||||
"default_furnace_side.png",
|
||||
{
|
||||
image = "default_furnace_front_active.png",
|
||||
backface_culling = false,
|
||||
animation = {
|
||||
type = "vertical_frames",
|
||||
aspect_w = 16,
|
||||
aspect_h = 16,
|
||||
length = 1.5
|
||||
},
|
||||
}
|
||||
},
|
||||
paramtype2 = "facedir",
|
||||
light_source = 8,
|
||||
drop = "default:furnace",
|
||||
groups = {cracky=2, not_in_creative_inventory=1},
|
||||
legacy_facedir_simple = true,
|
||||
is_ground_content = false,
|
||||
sounds = default.node_sound_stone_defaults(),
|
||||
|
||||
can_dig = can_dig,
|
||||
|
||||
allow_metadata_inventory_put = allow_metadata_inventory_put,
|
||||
allow_metadata_inventory_move = allow_metadata_inventory_move,
|
||||
allow_metadata_inventory_take = allow_metadata_inventory_take,
|
||||
})
|
||||
|
||||
--
|
||||
-- ABM
|
||||
--
|
||||
|
||||
local function swap_node(pos, name)
|
||||
local node = minetest.get_node(pos)
|
||||
if node.name == name then
|
||||
return
|
||||
end
|
||||
node.name = name
|
||||
minetest.swap_node(pos, node)
|
||||
end
|
||||
|
||||
minetest.register_abm({
|
||||
nodenames = {"default:furnace", "default:furnace_active"},
|
||||
interval = 1.0,
|
||||
chance = 1,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
--
|
||||
-- Inizialize metadata
|
||||
--
|
||||
local meta = minetest.get_meta(pos)
|
||||
local fuel_time = meta:get_float("fuel_time") or 0
|
||||
local src_time = meta:get_float("src_time") or 0
|
||||
local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
|
||||
|
||||
--
|
||||
-- Inizialize inventory
|
||||
--
|
||||
local inv = meta:get_inventory()
|
||||
for listname, size in pairs({
|
||||
src = 1,
|
||||
fuel = 1,
|
||||
dst = 4,
|
||||
}) do
|
||||
if inv:get_size(listname) ~= size then
|
||||
inv:set_size(listname, size)
|
||||
end
|
||||
end
|
||||
local srclist = inv:get_list("src")
|
||||
local fuellist = inv:get_list("fuel")
|
||||
local dstlist = inv:get_list("dst")
|
||||
|
||||
--
|
||||
-- Cooking
|
||||
--
|
||||
|
||||
-- Check if we have cookable content
|
||||
local cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
|
||||
local cookable = true
|
||||
|
||||
if cooked.time == 0 then
|
||||
cookable = false
|
||||
end
|
||||
|
||||
-- Check if we have enough fuel to burn
|
||||
if fuel_time < fuel_totaltime then
|
||||
-- The furnace is currently active and has enough fuel
|
||||
fuel_time = fuel_time + 1
|
||||
|
||||
-- If there is a cookable item then check if it is ready yet
|
||||
if cookable then
|
||||
src_time = src_time + 1
|
||||
if src_time >= cooked.time then
|
||||
-- Place result in dst list if possible
|
||||
if inv:room_for_item("dst", cooked.item) then
|
||||
inv:add_item("dst", cooked.item)
|
||||
inv:set_stack("src", 1, aftercooked.items[1])
|
||||
src_time = 0
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
-- Furnace ran out of fuel
|
||||
if cookable then
|
||||
-- We need to get new fuel
|
||||
local fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
|
||||
|
||||
if fuel.time == 0 then
|
||||
-- No valid fuel in fuel list
|
||||
fuel_totaltime = 0
|
||||
fuel_time = 0
|
||||
src_time = 0
|
||||
else
|
||||
-- Take fuel from fuel list
|
||||
inv:set_stack("fuel", 1, afterfuel.items[1])
|
||||
|
||||
fuel_totaltime = fuel.time
|
||||
fuel_time = 0
|
||||
|
||||
end
|
||||
else
|
||||
-- We don't need to get new fuel since there is no cookable item
|
||||
fuel_totaltime = 0
|
||||
fuel_time = 0
|
||||
src_time = 0
|
||||
end
|
||||
end
|
||||
|
||||
--
|
||||
-- Update formspec, infotext and node
|
||||
--
|
||||
local formspec = inactive_formspec
|
||||
local item_state = ""
|
||||
local item_percent = 0
|
||||
if cookable then
|
||||
item_percent = math.floor(src_time / cooked.time * 100)
|
||||
item_state = item_percent .. "%"
|
||||
else
|
||||
if srclist[1]:is_empty() then
|
||||
item_state = "Empty"
|
||||
else
|
||||
item_state = "Not cookable"
|
||||
end
|
||||
end
|
||||
|
||||
local fuel_state = "Empty"
|
||||
local active = "inactive "
|
||||
if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then
|
||||
active = "active "
|
||||
local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
|
||||
fuel_state = fuel_percent .. "%"
|
||||
formspec = active_formspec(fuel_percent, item_percent)
|
||||
swap_node(pos, "default:furnace_active")
|
||||
else
|
||||
if not fuellist[1]:is_empty() then
|
||||
fuel_state = "0%"
|
||||
end
|
||||
swap_node(pos, "default:furnace")
|
||||
end
|
||||
|
||||
local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
|
||||
|
||||
--
|
||||
-- Set meta values
|
||||
--
|
||||
meta:set_float("fuel_totaltime", fuel_totaltime)
|
||||
meta:set_float("fuel_time", fuel_time)
|
||||
meta:set_float("src_time", src_time)
|
||||
meta:set_string("formspec", formspec)
|
||||
meta:set_string("infotext", infotext)
|
||||
end,
|
||||
})
|
||||
160
init.lua
160
init.lua
@ -1,7 +1,4 @@
|
||||
|
||||
-- change back to old style amb furnaces so that hoppers work fine
|
||||
dofile(minetest.get_modpath("hopper") .. "/furnace.lua")
|
||||
|
||||
-- formspec
|
||||
local function get_hopper_formspec(pos)
|
||||
local spos = pos.x .. "," .. pos.y .. "," ..pos.z
|
||||
@ -44,9 +41,9 @@ minetest.register_node("hopper:hopper", {
|
||||
|
||||
on_construct = function(pos)
|
||||
local meta = minetest.get_meta(pos)
|
||||
meta:set_string("infotext", "Hopper")
|
||||
local inv = meta:get_inventory()
|
||||
inv:set_size("main", 4*4) -- was 8*4
|
||||
meta:set_string("infotext", "Hopper")
|
||||
inv:set_size("main", 4*4)
|
||||
end,
|
||||
|
||||
can_dig = function(pos, player)
|
||||
@ -94,7 +91,10 @@ minetest.register_node("hopper:hopper_side", {
|
||||
drawtype = "nodebox",
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
tiles = {"hopper_top.png", "hopper_top.png", "hopper_back.png", "hopper_side.png", "hopper_back.png", "hopper_back.png"},
|
||||
tiles = {
|
||||
"hopper_top.png", "hopper_top.png", "hopper_back.png",
|
||||
"hopper_side.png", "hopper_back.png", "hopper_back.png"
|
||||
},
|
||||
inventory_image = "hopper_side_inv.png",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
@ -114,9 +114,9 @@ minetest.register_node("hopper:hopper_side", {
|
||||
|
||||
on_construct = function(pos)
|
||||
local meta = minetest.get_meta(pos)
|
||||
meta:set_string("infotext", "Side Hopper")
|
||||
local inv = meta:get_inventory()
|
||||
inv:set_size("main", 4*4) -- was 8*4
|
||||
meta:set_string("infotext", "Side Hopper")
|
||||
inv:set_size("main", 4*4)
|
||||
end,
|
||||
|
||||
can_dig = function(pos, player)
|
||||
@ -195,7 +195,7 @@ minetest.register_abm({
|
||||
})
|
||||
|
||||
-- transfer function
|
||||
local transfer = function(src, srcpos, dst, dstpos)
|
||||
local transfer = function(src, srcpos, dst, dstpos, name)
|
||||
|
||||
-- source inventory
|
||||
local meta = minetest.get_meta(srcpos)
|
||||
@ -245,10 +245,10 @@ local transfer = function(src, srcpos, dst, dstpos)
|
||||
|
||||
end
|
||||
|
||||
-- hopper transfer
|
||||
-- hopper workings
|
||||
minetest.register_abm({
|
||||
|
||||
nodenames = {"hopper:hopper"},
|
||||
nodenames = {"hopper:hopper", "hopper:hopper_side"},
|
||||
neighbors = {
|
||||
"default:chest","default:chest_locked","protector:chest",
|
||||
"hopper:hopper","hopper:hopper_side","default:furnace",
|
||||
@ -260,119 +260,37 @@ minetest.register_abm({
|
||||
|
||||
action = function(pos, node)
|
||||
|
||||
local min = {x = pos.x, y = pos.y - 1, z = pos.z}
|
||||
local max = {x = pos.x, y = pos.y + 1, z = pos.z}
|
||||
local vm = minetest.get_voxel_manip()
|
||||
local emin, emax = vm:read_from_map(min, max)
|
||||
local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
|
||||
local data = vm:get_data()
|
||||
local a = vm:get_node_at({x = pos.x, y = pos.y + 1, z = pos.z}).name
|
||||
local b = vm:get_node_at({x = pos.x, y = pos.y - 1, z = pos.z}).name
|
||||
|
||||
--local a = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name
|
||||
--local b = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}).name
|
||||
|
||||
-- input (from above)
|
||||
|
||||
if a == "default:chest"
|
||||
or a == "default:chest_locked"
|
||||
or a == "protector:chest"
|
||||
or a == "hopper:hopper"
|
||||
or a == "hopper:hopper_side" then
|
||||
|
||||
-- chest/hopper above to hopper below
|
||||
transfer("main", {
|
||||
x = pos.x,
|
||||
y = pos.y + 1,
|
||||
z = pos.z
|
||||
}, "main", pos)
|
||||
|
||||
elseif a == "default:furnace"
|
||||
or a == "default:furnace_active"
|
||||
or a == "wine:wine_barrel" then
|
||||
|
||||
-- furnace output above to hopper below
|
||||
transfer("dst", {
|
||||
x = pos.x,
|
||||
y = pos.y + 1,
|
||||
z = pos.z
|
||||
}, "main", pos)
|
||||
|
||||
end
|
||||
|
||||
-- output (to below)
|
||||
|
||||
if b == "default:chest"
|
||||
or b == "default:chest_locked"
|
||||
or b == "protector:chest" then
|
||||
|
||||
-- hopper above to chest below
|
||||
transfer("main", pos, "main", {
|
||||
x = pos.x,
|
||||
y = pos.y - 1,
|
||||
z = pos.z
|
||||
})
|
||||
|
||||
elseif b == "default:furnace"
|
||||
or b == "default:furnace_active"
|
||||
or b == "wine:wine_barrel" then
|
||||
|
||||
-- hopper above to furnace source below
|
||||
transfer("main", pos, "src", {
|
||||
x = pos.x,
|
||||
y = pos.y - 1,
|
||||
z = pos.z
|
||||
})
|
||||
end
|
||||
|
||||
end,
|
||||
})
|
||||
|
||||
-- hopper side
|
||||
minetest.register_abm({
|
||||
|
||||
nodenames = {"hopper:hopper_side"},
|
||||
neighbors = {
|
||||
"default:chest","default:chest_locked","protector:chest",
|
||||
"hopper:hopper","hopper:hopper_side","default:furnace",
|
||||
"default:furnace_active", "wine:wine_barrel"
|
||||
},
|
||||
interval = 1.0,
|
||||
chance = 1,
|
||||
catch_up = false,
|
||||
|
||||
action = function(pos, node)
|
||||
|
||||
local min = {x = pos.x - 1, y = pos.y, z = pos.z - 1}
|
||||
local max = {x = pos.x + 1, y = pos.y + 1, z = pos.z + 1}
|
||||
local vm = minetest.get_voxel_manip()
|
||||
local emin, emax = vm:read_from_map(min, max)
|
||||
local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
|
||||
local data = vm:get_data()
|
||||
local face = vm:get_node_at(pos).param2
|
||||
|
||||
local front = {}
|
||||
--local face = minetest.get_node(pos).param2 ; print(face)
|
||||
|
||||
-- if side hopper check which way it's facing
|
||||
if node.name == "hopper:hopper_side" then
|
||||
|
||||
local face = minetest.get_node(pos).param2
|
||||
|
||||
if face == 0 then
|
||||
front = {x = pos.x - 1, y = pos.y, z = pos.z}
|
||||
|
||||
elseif face == 1 then
|
||||
front = {x = pos.x, y = pos.y, z = pos.z + 1}
|
||||
|
||||
elseif face == 2 then
|
||||
front = {x = pos.x + 1, y = pos.y, z = pos.z}
|
||||
|
||||
elseif face == 3 then
|
||||
front = {x = pos.x, y = pos.y, z = pos.z - 1}
|
||||
else
|
||||
return
|
||||
end
|
||||
else
|
||||
-- otherwise normal hopper, output downwards
|
||||
front = {x = pos.x, y = pos.y - 1, z = pos.z}
|
||||
end
|
||||
|
||||
local a = vm:get_node_at({x = pos.x, y = pos.y + 1,z = pos.z}).name
|
||||
local b = vm:get_node_at(front).name
|
||||
-- what is above hopper and on other end of funnel
|
||||
local a = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name
|
||||
local b = minetest.get_node(front).name
|
||||
|
||||
-- local a = minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name
|
||||
-- local b = minetest.get_node(front).name
|
||||
|
||||
-- input (from above)
|
||||
-- funnel input
|
||||
|
||||
if a == "default:chest"
|
||||
or a == "default:chest_locked"
|
||||
@ -380,7 +298,6 @@ minetest.register_abm({
|
||||
or a == "hopper:hopper"
|
||||
or a == "hopper:hopper_side" then
|
||||
|
||||
-- chest/hopper above to hopper below
|
||||
transfer("main", {
|
||||
x = pos.x,
|
||||
y = pos.y + 1,
|
||||
@ -391,16 +308,26 @@ minetest.register_abm({
|
||||
or a == "default:furnace_active"
|
||||
or a == "wine:wine_barrel" then
|
||||
|
||||
-- furnace output above to hopper below
|
||||
transfer("dst", {
|
||||
x = pos.x,
|
||||
y = pos.y + 1,
|
||||
z = pos.z
|
||||
}, "main", pos)
|
||||
|
||||
-- re-start furnace timer
|
||||
if a == "default:furnace"
|
||||
or a == "default:furnace_active" then
|
||||
|
||||
minetest.get_node_timer({
|
||||
x = pos.x,
|
||||
y = pos.y + 1,
|
||||
z = pos.z
|
||||
}):start(1.0)
|
||||
end
|
||||
|
||||
-- output (to side)
|
||||
end
|
||||
|
||||
-- spout output
|
||||
|
||||
if b == "default:chest"
|
||||
or b == "default:chest_locked"
|
||||
@ -408,14 +335,21 @@ minetest.register_abm({
|
||||
or b == "hopper:hopper"
|
||||
or b == "hopper:hopper_side" then
|
||||
|
||||
-- hopper to chest beside
|
||||
transfer("main", pos, "main", front)
|
||||
|
||||
elseif b == "default:furnace"
|
||||
or b == "default:furnace_active" then
|
||||
|
||||
if node.name == "hopper:hopper" then
|
||||
-- hopper above to furnace source below
|
||||
transfer("main", pos, "src", front)
|
||||
else
|
||||
-- hopper to furnace fuel beside
|
||||
transfer("main", pos, "fuel", front)
|
||||
end
|
||||
|
||||
-- re-start furnace timer
|
||||
minetest.get_node_timer(pos):start(1.0)
|
||||
|
||||
elseif b == "wine:wine_barrel" then
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user