start to take care of loose ends

This commit is contained in:
flux
2022-06-16 17:46:09 -07:00
parent acc6e2ebea
commit 21d4fab1f5
20 changed files with 315 additions and 229 deletions

View File

@ -1,4 +1,4 @@
std = "lua51+luajit+minetest+moreblocks"
std = "lua51+luajit+minetest+stairsplus_legacy"
unused_args = false
max_line_length = 120
@ -19,7 +19,7 @@ stds.minetest = {
}
}
stds.moreblocks = {
stds.stairsplus_legacy = {
globals = {
"stairsplus_legacy",
},

View File

@ -1,41 +1,41 @@
if stairsplus_legacy.has.stairs then
stairsplus_legacy.override_stairs("wood", "default:wood")
stairsplus_legacy.override_stairs("junglewood", "default:junglewood")
stairsplus_legacy.override_stairs("pine_wood", "default:pine_wood")
stairsplus_legacy.override_stairs("acacia_wood", "default:acacia_wood")
stairsplus_legacy.override_stairs("aspen_wood", "default:aspen_wood")
stairsplus_legacy.override_stairs("cobble", "default:cobble")
stairsplus_legacy.override_stairs("stone", "default:stone")
stairsplus_legacy.override_stairs("mossycobble", "default:mossycobble")
stairsplus_legacy.override_stairs("stonebrick", "default:stonebrick")
stairsplus_legacy.override_stairs("stone_block", "default:stone_block")
stairsplus_legacy.override_stairs("desert_stone", "default:desert_stone")
stairsplus_legacy.override_stairs("desert_cobble", "default:desert_cobble")
stairsplus_legacy.override_stairs("desert_stonebrick", "default:desert_stonebrick")
stairsplus_legacy.override_stairs("desert_stone_block", "default:desert_stone_block")
stairsplus_legacy.override_stairs("sandstone", "default:sandstone")
stairsplus_legacy.override_stairs("sandstonebrick", "default:sandstonebrick")
stairsplus_legacy.override_stairs("sandstone_block", "default:sandstone_block")
stairsplus_legacy.override_stairs("desert_sandstone", "default:desert_sandstone")
stairsplus_legacy.override_stairs("desert_sandstone_brick", "default:desert_sandstone_brick")
stairsplus_legacy.override_stairs("desert_sandstone_block", "default:desert_sandstone_block")
stairsplus_legacy.override_stairs("silver_sandstone", "default:silver_sandstone")
stairsplus_legacy.override_stairs("silver_sandstone_brick", "default:silver_sandstone_brick")
stairsplus_legacy.override_stairs("silver_sandstone_block", "default:silver_sandstone_block")
stairsplus_legacy.override_stairs("obsidian", "default:obsidian")
stairsplus_legacy.override_stairs("obsidianbrick", "default:obsidianbrick")
stairsplus_legacy.override_stairs("obsidian_block", "default:obsidian_block")
stairsplus_legacy.override_stairs("brick", "default:brick")
stairsplus_legacy.override_stairs("steelblock", "default:steelblock")
stairsplus_legacy.override_stairs("tinblock", "default:tinblock")
stairsplus_legacy.override_stairs("copperblock", "default:copperblock")
stairsplus_legacy.override_stairs("bronzeblock", "default:bronzeblock")
stairsplus_legacy.override_stairs("goldblock", "default:goldblock")
stairsplus_legacy.override_stairs("ice", "default:ice")
stairsplus_legacy.override_stairs("snowblock", "default:snowblock")
stairsplus_legacy.override_stairs("glass", "default:glass",
stairsplus.compat.override_stairs("wood", "default:wood")
stairsplus.compat.override_stairs("junglewood", "default:junglewood")
stairsplus.compat.override_stairs("pine_wood", "default:pine_wood")
stairsplus.compat.override_stairs("acacia_wood", "default:acacia_wood")
stairsplus.compat.override_stairs("aspen_wood", "default:aspen_wood")
stairsplus.compat.override_stairs("cobble", "default:cobble")
stairsplus.compat.override_stairs("stone", "default:stone")
stairsplus.compat.override_stairs("mossycobble", "default:mossycobble")
stairsplus.compat.override_stairs("stonebrick", "default:stonebrick")
stairsplus.compat.override_stairs("stone_block", "default:stone_block")
stairsplus.compat.override_stairs("desert_stone", "default:desert_stone")
stairsplus.compat.override_stairs("desert_cobble", "default:desert_cobble")
stairsplus.compat.override_stairs("desert_stonebrick", "default:desert_stonebrick")
stairsplus.compat.override_stairs("desert_stone_block", "default:desert_stone_block")
stairsplus.compat.override_stairs("sandstone", "default:sandstone")
stairsplus.compat.override_stairs("sandstonebrick", "default:sandstonebrick")
stairsplus.compat.override_stairs("sandstone_block", "default:sandstone_block")
stairsplus.compat.override_stairs("desert_sandstone", "default:desert_sandstone")
stairsplus.compat.override_stairs("desert_sandstone_brick", "default:desert_sandstone_brick")
stairsplus.compat.override_stairs("desert_sandstone_block", "default:desert_sandstone_block")
stairsplus.compat.override_stairs("silver_sandstone", "default:silver_sandstone")
stairsplus.compat.override_stairs("silver_sandstone_brick", "default:silver_sandstone_brick")
stairsplus.compat.override_stairs("silver_sandstone_block", "default:silver_sandstone_block")
stairsplus.compat.override_stairs("obsidian", "default:obsidian")
stairsplus.compat.override_stairs("obsidianbrick", "default:obsidianbrick")
stairsplus.compat.override_stairs("obsidian_block", "default:obsidian_block")
stairsplus.compat.override_stairs("brick", "default:brick")
stairsplus.compat.override_stairs("steelblock", "default:steelblock")
stairsplus.compat.override_stairs("tinblock", "default:tinblock")
stairsplus.compat.override_stairs("copperblock", "default:copperblock")
stairsplus.compat.override_stairs("bronzeblock", "default:bronzeblock")
stairsplus.compat.override_stairs("goldblock", "default:goldblock")
stairsplus.compat.override_stairs("ice", "default:ice")
stairsplus.compat.override_stairs("snowblock", "default:snowblock")
stairsplus.compat.override_stairs("glass", "default:glass",
{tiles = {"stairs_glass_split.png"}}, {ignore_paramtype2 = true})
stairsplus_legacy.override_stairs("obsidian_glass", "default:obsidian_glass",
stairsplus.compat.override_stairs("obsidian_glass", "default:obsidian_glass",
{tiles = {"stairs_obsidian_glass_split.png"}}, {ignore_paramtype2 = true})
end

View File

@ -1,5 +1,5 @@
if stairsplus_legacy.has.stairs then
stairsplus_legacy.override_stairs("straw", "farming:straw")
stairsplus.compat.override_stairs("straw", "farming:straw")
end
local farming_nodes = {"straw"}

View File

@ -41,26 +41,6 @@ function stairsplus_legacy.register_legacy(node, overrides, meta)
end
end
if stairsplus_legacy.has.stairs then
local stair_name_formats = {
stair = "stairs:stair_%s",
slab_8 = "stairs:slab_%s",
stair_inner = "stairs:stair_inner_%s",
stair_outer = "stairs:stair_outer_%s",
}
function stairsplus_legacy.override_stairs(name, node, overrides, meta)
for shape, name_format in pairs(stair_name_formats) do
local stair_name = name_format:format(name)
if minetest.registered_nodes[stair_name] then
stairsplus.api.register_single(node, shape, overrides, meta)
local shaped_name = stairsplus.api.format_name(node, shape)
minetest.register_alias_force(stair_name, shaped_name)
end
end
end
end
if stairsplus_legacy.has.basic_materials and stairsplus_legacy.settings.basic_materials then
stairsplus_legacy.dofile("basic_materials")
end