minetest-mods/moreblocks
1
0
Fork 2
mirror of https://github.com/minetest-mods/moreblocks.git synced 2025-07-25 11:10:22 +02:00
Code Issues Releases Wiki Activity

bugfixes for legacy stairsplus support

Browse Source
This commit is contained in:
flux
2022-06-21 12:22:26 -07:00
parent 21a374b8dd
commit 2163a39844
9 changed files with 117 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
stairsplus/api/station.lua
View File

@ -2,6 +2,8 @@
local api = stairsplus.api
local resolve_aliases = stairsplus.util.resolve_aliases
local default_stack_max = tonumber(minetest.settings:get("default_stack_max")) or 99
local station = {}
@ -59,10 +61,36 @@ function station.on_receive_fields(meta, inv, formname, fields, sender, build_fo
return not not fields.max_offered
end
function station.update_inventory(meta, inv, taken_stack)
local node = station.get_current_node(inv)
local function fix_aliases(inv)
local input = inv:get_stack("stairsplus:input", 1)
input:set_name(resolve_aliases(input:get_name()))
inv:set_stack("stairsplus:input", 1, input)
if not node then
local micro = inv:get_stack("stairsplus:micro", 1)
micro:set_name(resolve_aliases(micro:get_name()))
inv:set_stack("stairsplus:micro", 1, micro)
local recycle = inv:get_stack("stairsplus:recycle", 1)
recycle:set_name(resolve_aliases(recycle:get_name()))
inv:set_stack("stairsplus:recycle", 1, recycle)
for i = 1, inv:get_size("stairsplus:output") do
local output = inv:get_stack("stairsplus:output", i)
output:set_name(resolve_aliases(output:get_name()))
inv:set_stack("stairsplus:output", i, output)
end
end
function station.update_inventory(meta, inv, taken_stack)
fix_aliases(inv)
local node = station.get_current_node(inv)
local valid_shapes = api.shapes_by_node[node]
if not (node and valid_shapes) then
inv:set_stack("stairsplus:input", 1, ItemStack())
inv:set_stack("stairsplus:micro", 1, ItemStack())
inv:set_stack("stairsplus:recycle", 1, ItemStack())
for i = 1, inv:get_size("stairsplus:output") do
inv:set_stack("stairsplus:output", i, ItemStack())
end
@ -92,7 +120,6 @@ function station.update_inventory(meta, inv, taken_stack)
return
end
local valid_shapes = api.shapes_by_node[node]
local max_offered = meta:get_int("stairsplus:max_offered")
local shape_groups = minetest.parse_json(meta:get_string("stairsplus:shape_groups"))
@ -152,7 +179,7 @@ function station.allow_inventory_put(meta, inv, listname, index, stack, player)
return 0
end
local shaped_node = stack:get_name()
local shaped_node = resolve_aliases(stack:get_name())
local node = api.get_node_of_shaped_node(shaped_node)
local shape = api.get_shape_of_shaped_node(shaped_node)

3
stairsplus/shapes/micros.lua
View File

@ -72,7 +72,8 @@ stairsplus.api.register_shape("micro_14", {
})
stairsplus.api.register_shape("micro_15", {
name_format = "micro_%s_5",
name_format = "micro_%s_15",
aliases = {"micro_%s_5"},
description = "@1 15/16 Microblock",
shape_groups = {micro = 1, legacy = 1},
eighths = 2,

13
stairsplus/util.lua
View File

@ -81,4 +81,17 @@ stairsplus.util = {
error(("unexpected location? %s"):format(dump(location)))
end
end,
resolve_aliases = function(node, seen)
seen = seen or {}
if seen[node] then
error(("alias loop on %s"):format(node))
end
local aliased_to = minetest.registered_aliases[node]
if aliased_to then
seen[node] = true
return stairsplus.util.resolve_aliases(aliased_to, seen)
end
return node
end,
}