mirror of
https://github.com/minetest-mods/moreblocks.git
synced 2025-07-02 08:00:44 +02:00
start to take care of loose ends
This commit is contained in:
flux
@ -41,7 +41,7 @@ function api.build_groups(node, shape)
|
||||
|
||||
local groups = {
|
||||
[("shape_%s"):format(shape)] = 1,
|
||||
not_in_creative_inventory = in_creative_inventory and 1 or 0,
|
||||
not_in_creative_inventory = in_creative_inventory and 1,
|
||||
}
|
||||
|
||||
local shape_def = api.registered_shapes[shape]
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
stairsplus.api = {}
|
||||
|
||||
stairsplus.dofile("api", "legacy")
|
||||
stairsplus.dofile("api", "shape")
|
||||
stairsplus.dofile("api", "group_filters")
|
||||
stairsplus.dofile("api", "node")
|
||||
|
||||
110
stairsplus/api/legacy.lua
Normal file
110
stairsplus/api/legacy.lua
Normal file
@ -0,0 +1,110 @@
|
||||
local api = stairsplus.api
|
||||
|
||||
local legacy_mode = stairsplus.settings.legacy_mode
|
||||
local legacy_place_mechanic = stairsplus.settings.legacy_place_mechanic
|
||||
|
||||
if legacy_place_mechanic then
|
||||
local wall_right_dirmap = {9, 18, 7, 12}
|
||||
local wall_left_dirmap = {11, 16, 5, 14}
|
||||
local ceil_dirmap = {20, 23, 22, 21}
|
||||
|
||||
function api.on_place(itemstack, placer, pointed_thing)
|
||||
if not minetest.is_player(placer) then
|
||||
return minetest.item_place(itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
local controls = placer:get_player_control()
|
||||
|
||||
local sneak = controls.sneak
|
||||
local aux = controls.aux1
|
||||
|
||||
local shaped_node_name = itemstack:get_name()
|
||||
local shape = api.get_shape_of_shaped_node(shaped_node_name)
|
||||
|
||||
local under = pointed_thing.under
|
||||
local under_node = minetest.get_node(under)
|
||||
local under_shape = api.get_shape_of_shaped_node(under_node.name)
|
||||
|
||||
local same_cat = shape == under_shape
|
||||
|
||||
-- standard (floor) facedir, also used for sneak placement against the lower half of the wall
|
||||
local p2 = placer and minetest.dir_to_facedir(placer:get_look_dir()) or 0
|
||||
|
||||
-- check which face and which quadrant we are interested in
|
||||
-- this is used both to check if we're handling parallel placement in the same-category case,
|
||||
-- and in general for sneak placement
|
||||
local face_pos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)
|
||||
local face_off = vector.subtract(face_pos, under)
|
||||
|
||||
-- we cannot trust face_off to tell us the correct directionif the
|
||||
-- under node has a non-standard shape, so use the distance between under and above
|
||||
local wallmounted = minetest.dir_to_wallmounted(vector.subtract(pointed_thing.above, under))
|
||||
|
||||
if same_cat and not aux then
|
||||
p2 = under_node.param2
|
||||
-- flip if placing above or below an upright or upside-down node
|
||||
-- TODO should we also flip when placing next to a side-mounted node?
|
||||
if wallmounted < 2 then
|
||||
if p2 < 4 then
|
||||
p2 = (p2 + 2) % 4
|
||||
p2 = ceil_dirmap[p2 + 1]
|
||||
elseif p2 > 19 then
|
||||
p2 = ceil_dirmap[p2 - 19] - 20
|
||||
p2 = (p2 + 2) % 4
|
||||
end
|
||||
end
|
||||
else
|
||||
-- for same-cat placement, aux is used to disable param2 copying
|
||||
if same_cat then
|
||||
aux = not aux
|
||||
end
|
||||
|
||||
local remap = nil
|
||||
|
||||
-- standard placement against the wall
|
||||
local use_wallmap = (wallmounted > 1 and not sneak) or (wallmounted < 2 and sneak)
|
||||
|
||||
-- standard placement against the ceiling, or sneak placement against the upper half of the wall
|
||||
local use_ceilmap = wallmounted == 1 and not sneak
|
||||
use_ceilmap = use_ceilmap or (wallmounted > 1 and sneak and face_off.y > 0)
|
||||
|
||||
if use_wallmap then
|
||||
local left = (p2 == 0 and face_off.x < 0) or
|
||||
(p2 == 1 and face_off.z > 0) or
|
||||
(p2 == 2 and face_off.x > 0) or
|
||||
(p2 == 3 and face_off.z < 0)
|
||||
if aux then
|
||||
left = not left
|
||||
end
|
||||
remap = left and wall_left_dirmap or wall_right_dirmap
|
||||
elseif use_ceilmap then
|
||||
remap = ceil_dirmap
|
||||
end
|
||||
|
||||
if aux then
|
||||
p2 = (p2 + 2) % 4
|
||||
end
|
||||
|
||||
if remap then
|
||||
p2 = remap[p2 + 1]
|
||||
end
|
||||
end
|
||||
|
||||
return minetest.item_place(itemstack, placer, pointed_thing, p2)
|
||||
end
|
||||
|
||||
else
|
||||
api.on_place = minetest.item_place
|
||||
end
|
||||
|
||||
|
||||
function api.scale_light(light_source, shape_def)
|
||||
if not light_source or light_source == 0 then
|
||||
return 0
|
||||
|
||||
elseif legacy_mode then
|
||||
return light_source - 1
|
||||
end
|
||||
|
||||
return math.max(1, math.min(math.round(light_source * shape_def.eighths / 4), light_source))
|
||||
end
|
||||
@ -1,7 +1,4 @@
|
||||
-- for registering variants of a specific node
|
||||
--[[
|
||||
|
||||
]]
|
||||
local api = stairsplus.api
|
||||
|
||||
local table_set_all = stairsplus.util.table_set_all
|
||||
@ -9,22 +6,13 @@ local table_sort_keys = stairsplus.util.table_sort_keys
|
||||
|
||||
local S = stairsplus.S
|
||||
|
||||
local legacy_mode = stairsplus.settings.legacy_mode
|
||||
local legacy_place_mechanic = stairsplus.settings.legacy_place_mechanic
|
||||
local default_align_style = stairsplus.settings.default_align_style
|
||||
|
||||
api.nodes_by_shape = {}
|
||||
api.shapes_by_node = {}
|
||||
|
||||
local function scale_light(light_source, shape_def)
|
||||
if not light_source or light_source == 0 then
|
||||
return 0
|
||||
elseif legacy_mode then
|
||||
return light_source - 1
|
||||
end
|
||||
|
||||
return math.max(1, math.min(math.round(light_source * shape_def.eighths / 4), light_source))
|
||||
end
|
||||
api.node_by_shaped_node = {}
|
||||
api.shape_by_shaped_node = {}
|
||||
|
||||
local function check_node_validity(node_def, meta)
|
||||
local type_ = node_def.type
|
||||
@ -66,95 +54,6 @@ local function check_node_validity(node_def, meta)
|
||||
end
|
||||
end
|
||||
|
||||
local wall_right_dirmap = {9, 18, 7, 12}
|
||||
local wall_left_dirmap = {11, 16, 5, 14}
|
||||
local ceil_dirmap = {20, 23, 22, 21}
|
||||
|
||||
function api.legacy_on_place(itemstack, placer, pointed_thing)
|
||||
if not minetest.is_player(placer) then
|
||||
return minetest.item_place(itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
local controls = placer:get_player_control()
|
||||
|
||||
local sneak = controls.sneak
|
||||
local aux = controls.aux1
|
||||
|
||||
local shaped_node_name = itemstack:get_name()
|
||||
local shape = api.get_shape_of_shaped_node(shaped_node_name)
|
||||
|
||||
local under = pointed_thing.under
|
||||
local under_node = minetest.get_node(under)
|
||||
local under_shape = api.get_shape_of_shaped_node(under_node.name)
|
||||
|
||||
local same_cat = shape == under_shape
|
||||
|
||||
-- standard (floor) facedir, also used for sneak placement against the lower half of the wall
|
||||
local p2 = placer and minetest.dir_to_facedir(placer:get_look_dir()) or 0
|
||||
|
||||
-- check which face and which quadrant we are interested in
|
||||
-- this is used both to check if we're handling parallel placement in the same-category case,
|
||||
-- and in general for sneak placement
|
||||
local face_pos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)
|
||||
local face_off = vector.subtract(face_pos, under)
|
||||
|
||||
-- we cannot trust face_off to tell us the correct directionif the
|
||||
-- under node has a non-standard shape, so use the distance between under and above
|
||||
local wallmounted = minetest.dir_to_wallmounted(vector.subtract(pointed_thing.above, under))
|
||||
|
||||
if same_cat and not aux then
|
||||
p2 = under_node.param2
|
||||
-- flip if placing above or below an upright or upside-down node
|
||||
-- TODO should we also flip when placing next to a side-mounted node?
|
||||
if wallmounted < 2 then
|
||||
if p2 < 4 then
|
||||
p2 = (p2 + 2) % 4
|
||||
p2 = ceil_dirmap[p2 + 1]
|
||||
elseif p2 > 19 then
|
||||
p2 = ceil_dirmap[p2 - 19] - 20
|
||||
p2 = (p2 + 2) % 4
|
||||
end
|
||||
end
|
||||
else
|
||||
-- for same-cat placement, aux is used to disable param2 copying
|
||||
if same_cat then
|
||||
aux = not aux
|
||||
end
|
||||
|
||||
local remap = nil
|
||||
|
||||
-- standard placement against the wall
|
||||
local use_wallmap = (wallmounted > 1 and not sneak) or (wallmounted < 2 and sneak)
|
||||
|
||||
-- standard placement against the ceiling, or sneak placement against the upper half of the wall
|
||||
local use_ceilmap = wallmounted == 1 and not sneak
|
||||
use_ceilmap = use_ceilmap or (wallmounted > 1 and sneak and face_off.y > 0)
|
||||
|
||||
if use_wallmap then
|
||||
local left = (p2 == 0 and face_off.x < 0) or
|
||||
(p2 == 1 and face_off.z > 0) or
|
||||
(p2 == 2 and face_off.x > 0) or
|
||||
(p2 == 3 and face_off.z < 0)
|
||||
if aux then
|
||||
left = not left
|
||||
end
|
||||
remap = left and wall_left_dirmap or wall_right_dirmap
|
||||
elseif use_ceilmap then
|
||||
remap = ceil_dirmap
|
||||
end
|
||||
|
||||
if aux then
|
||||
p2 = (p2 + 2) % 4
|
||||
end
|
||||
|
||||
if remap then
|
||||
p2 = remap[p2 + 1]
|
||||
end
|
||||
end
|
||||
|
||||
return minetest.item_place(itemstack, placer, pointed_thing, p2)
|
||||
end
|
||||
|
||||
function api.format_name(node, shape)
|
||||
local mod, name = node:match("^([^:]+):(.*)$")
|
||||
local shape_def = api.registered_shapes[shape]
|
||||
@ -201,7 +100,7 @@ function api.register_single(node, shape, overrides, meta)
|
||||
paramtype = shape_def.paramtype or "light",
|
||||
paramtype2 = paramtype2,
|
||||
|
||||
light_source = scale_light(node_def.light_source, shape_def),
|
||||
light_source = api.scale_light(node_def.light_source, shape_def),
|
||||
groups = api.build_groups(node, shape),
|
||||
|
||||
tiles = node_def.tiles,
|
||||
@ -217,6 +116,8 @@ function api.register_single(node, shape, overrides, meta)
|
||||
diggable = node_def.diggable,
|
||||
climbable = node_def.climbable,
|
||||
move_resistance = node_def.move_resistance,
|
||||
|
||||
on_place = api.on_place,
|
||||
}
|
||||
|
||||
-- see-through nodes tend to look better if we just use the first tile
|
||||
@ -236,16 +137,12 @@ function api.register_single(node, shape, overrides, meta)
|
||||
|
||||
-- if there's a drop defined, and we can drop a shaped version, do so
|
||||
if node_def.drop and type(node_def.drop) == "string" then
|
||||
local item = api.get_shaped_node(node_def.drop, shape)
|
||||
local item = api.get_schema_recipe_item(node_def.drop, shape)
|
||||
if item then
|
||||
def.drop = item
|
||||
end
|
||||
end
|
||||
|
||||
if legacy_place_mechanic then
|
||||
def.on_place = api.legacy_on_place
|
||||
end
|
||||
|
||||
overrides.groups = nil
|
||||
table_set_all(def, overrides)
|
||||
|
||||
@ -339,7 +236,8 @@ function api.get_shapes_hash(node)
|
||||
return api.shapes_by_node[node]
|
||||
end
|
||||
|
||||
function api.get_shaped_node(node, shape_or_item)
|
||||
-- turn a recipe item into a shape if possible
|
||||
function api.get_schema_recipe_item(node, shape_or_item)
|
||||
if shape_or_item == "" then
|
||||
return ""
|
||||
end
|
||||
@ -367,20 +265,11 @@ function api.get_shaped_node(node, shape_or_item)
|
||||
end
|
||||
|
||||
function api.get_micronode(node)
|
||||
return api.format_name(node, "micro_8")
|
||||
end
|
||||
|
||||
api.node_by_shaped_node = {}
|
||||
api.shape_by_shaped_node = {}
|
||||
|
||||
function api.get_node_of_shaped_node(shaped_node)
|
||||
return api.node_by_shaped_node[shaped_node]
|
||||
end
|
||||
|
||||
function api.get_shape_of_shaped_node(shaped_node)
|
||||
return api.shape_by_shaped_node[shaped_node]
|
||||
return api.get_schema_recipe_item(node, "micro_8")
|
||||
end
|
||||
|
||||
-- create some hashes for quickly looking things up at run-time (i.e. the circular saw)
|
||||
-- register schema crafts once, after everything has been registered. otherwise, it's not clear when to do this
|
||||
minetest.register_on_mods_loaded(function()
|
||||
stairsplus.log("info", "registering schema crafts")
|
||||
for node, shapes in pairs(api.shapes_by_node) do
|
||||
@ -396,3 +285,11 @@ minetest.register_on_mods_loaded(function()
|
||||
api.register_schema_crafts_for_node(node)
|
||||
end
|
||||
end)
|
||||
|
||||
function api.get_node_of_shaped_node(shaped_node)
|
||||
return api.node_by_shaped_node[shaped_node]
|
||||
end
|
||||
|
||||
function api.get_shape_of_shaped_node(shaped_node)
|
||||
return api.shape_by_shaped_node[shaped_node]
|
||||
end
|
||||
|
||||
@ -1,37 +1,13 @@
|
||||
-- for registering recipe schemas
|
||||
-- should register schemas w/ unified_inventory and i3 and whatever else,
|
||||
-- and hide the recipes for the individual nodes (possibly a setting for such)
|
||||
--[[
|
||||
|
||||
api.register_craft_schema({
|
||||
output = "panel_8 6",
|
||||
recipe = {{"node", "node", "node"}},
|
||||
})
|
||||
|
||||
api.register_craft_schema({
|
||||
type = "shapeless",
|
||||
output = "micro_8 7",
|
||||
recipe = {"stair_inner"},
|
||||
})
|
||||
|
||||
api.register_schema_crafts_for_node("default:coalblock")
|
||||
|
||||
api.register_crafts_for_shapes({
|
||||
type = "cooking",
|
||||
output = "default:stone",
|
||||
recipe = "default:cobblestone",
|
||||
cooktime = function(eights) return 3 * eights / 8 end,
|
||||
})
|
||||
|
||||
api.register_crafts_for_shapes({
|
||||
type = "fuel",
|
||||
recipe = "default:coalblock",
|
||||
burntime = function(eights) return 370 * eights / 8 end,
|
||||
})
|
||||
|
||||
]]
|
||||
-- TODO: should register schemas w/ unified_inventory and i3 and whatever else,
|
||||
-- and hide the recipes for the individual nodes (possibly a setting for such)
|
||||
local api = stairsplus.api
|
||||
|
||||
local recipes_in_creative_inventory = stairsplus.settings.recipes_in_creative_inventory
|
||||
|
||||
api.registered_recipe_schemas = {}
|
||||
api.registered_on_register_craft_schemas = {}
|
||||
|
||||
local function is_valid_output(item, shapes)
|
||||
local item_name = item:match("^([^ ]+)")
|
||||
|
||||
@ -85,7 +61,10 @@ local function verify_schema(schema)
|
||||
end
|
||||
end
|
||||
|
||||
api.registered_recipe_schemas = {}
|
||||
function api.register_on_register_craft_schema(func)
|
||||
table.insert(api.registered_on_register_craft_schema, func)
|
||||
end
|
||||
|
||||
function api.register_craft_schema(schema)
|
||||
local problems = verify_schema(schema)
|
||||
|
||||
@ -93,9 +72,13 @@ function api.register_craft_schema(schema)
|
||||
error(problems)
|
||||
end
|
||||
|
||||
stairsplus.log("info", "registering craft schema %s", minetest.write_json(schema))
|
||||
stairsplus.log("info", "registering craft schema %s", minetest.serialize(schema):sub(#("return ")))
|
||||
|
||||
table.insert(api.registered_recipe_schemas, schema)
|
||||
|
||||
for _, func in ipairs(api.registered_on_register_craft_schemas) do
|
||||
func(schema)
|
||||
end
|
||||
end
|
||||
|
||||
local function has_the_right_shapes(schema, shapes)
|
||||
@ -136,31 +119,36 @@ end
|
||||
local function register_for_schema(node, schema)
|
||||
local recipe = table.copy(schema)
|
||||
|
||||
recipe.output = api.get_shaped_node(node, recipe.output)
|
||||
recipe.output = api.get_schema_recipe_item(node, recipe.output)
|
||||
|
||||
if recipe.replacements then
|
||||
for _, replacement in ipairs(recipe.replacements) do
|
||||
for i, item in ipairs(replacement) do
|
||||
replacement[i] = api.get_shaped_node(node, item)
|
||||
replacement[i] = api.get_schema_recipe_item(node, item)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if recipe.type == "shapeless" then
|
||||
for i, item in ipairs(recipe.recipe) do
|
||||
recipe.recipe[i] = api.get_shaped_node(node, item)
|
||||
recipe.recipe[i] = api.get_schema_recipe_item(node, item)
|
||||
end
|
||||
|
||||
elseif recipe.type == "shaped" or recipe.type == nil then
|
||||
for _, row in ipairs(recipe.recipe) do
|
||||
for i, item in ipairs(row) do
|
||||
row[i] = api.get_shaped_node(node, item)
|
||||
row[i] = api.get_schema_recipe_item(node, item)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
stairsplus.log("info", "registering recipe %s", minetest.serialize(recipe):sub(#("return ")))
|
||||
|
||||
if not recipes_in_creative_inventory then
|
||||
-- i don't think anything supports this but...
|
||||
recipe.groups = {not_in_creative_inventory = 1}
|
||||
end
|
||||
|
||||
minetest.register_craft(recipe)
|
||||
end
|
||||
|
||||
@ -204,9 +192,10 @@ function api.register_crafts_for_shapes(def)
|
||||
for _, shape in ipairs(shapes) do
|
||||
minetest.register_craft({
|
||||
type = "cooking",
|
||||
output = api.get_shaped_node(def.output, shape),
|
||||
recipe = api.get_shaped_node(def.recipe, shape),
|
||||
output = api.get_schema_recipe_item(def.output, shape),
|
||||
recipe = api.get_schema_recipe_item(def.recipe, shape),
|
||||
cooktime = def.cooktime(api.registered_shapes[shape].eighths),
|
||||
groups = (not recipes_in_creative_inventory) and {not_in_creative_inventory = 1}
|
||||
})
|
||||
end
|
||||
|
||||
@ -216,8 +205,9 @@ function api.register_crafts_for_shapes(def)
|
||||
for _, shape in ipairs(shapes) do
|
||||
minetest.register_craft({
|
||||
type = "fuel",
|
||||
recipe = api.get_shaped_node(def.recipe, shape),
|
||||
recipe = api.get_schema_recipe_item(def.recipe, shape),
|
||||
burntime = def.burntime(api.registered_shapes[shape].eighths),
|
||||
groups = (not recipes_in_creative_inventory) and {not_in_creative_inventory = 1}
|
||||
})
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user