From 21ae9f8c17797affea51eab16564d2b3a44a1f32 Mon Sep 17 00:00:00 2001
From: unknown <24964441+wsor4035@users.noreply.github.com>
Date: Sat, 27 Nov 2021 23:43:59 -0500
Subject: [PATCH] drop stairs api support and fix use_texture_alpha for stairs

---
 building_blocks/node_stairs.lua | 59 +++++----------------------------
 1 file changed, 9 insertions(+), 50 deletions(-)

diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua
index bfdabdf2..07cbe223 100644
--- a/building_blocks/node_stairs.lua
+++ b/building_blocks/node_stairs.lua
@@ -1,77 +1,48 @@
 local S = minetest.get_translator("building_blocks")
 
-local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
-
 local function building_blocks_stairs(nodename, def)
 	minetest.register_node(nodename, def)
-	if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
+	if minetest.get_modpath("moreblocks") then
 		local mod, name = nodename:match("(.*):(.*)")
-		minetest.register_alias(mod .. ":slab_" .. name, "stairs:slab_" .. name)
-		minetest.register_alias(mod .. ":stair_" .. name, "stairs:stair_" .. name)
-		local stairs_groups = {}
-		for _, groupname in ipairs(stairs_groups_names) do
-			stairs_groups[groupname] = def.groups[groupname]
-		end
+		stairsplus:register_all(mod, name, nodename, def)
 
-		if minetest.get_modpath("moreblocks") then
-			stairsplus:register_all(
-				mod,
-				name,
-				nodename,
-				{
-					description = def.description,
-					tiles = def.tiles,
-					groups = stairs_groups,
-					sounds = def.sounds,
-				}
-			)
-		else
-			stairs.register_stair_and_slab(name,nodename,
-				stairs_groups,
-				def.tiles,
-				def.stair_desc,
-				def.slab_desc,
-				def.sounds
-				--FIXME: Missing descriptions for Inner and Outer stairs
-				-- See https://github.com/minetest/minetest_game/pull/2584
-			)
-		end
+		minetest.register_alias("stairs:slab_" .. name, mod .. ":slab_" .. name)
+		minetest.register_alias("stairs:stair_" .. name, mod .. ":stair_" .. name)
+		minetest.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
+		minetest.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer")
 	end
 end
 
 building_blocks_stairs("building_blocks:grate", {
 	drawtype = "glasslike",
 	description = S("Grate"),
-	stair_desc = S("Grate Stair"),
-	slab = S("Grate Slab"),
 	tiles = {"building_blocks_grate.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
+	use_texture_alpha = "clip",
 	groups = {cracky=1},
 	sounds = default.node_sound_metal_defaults(),
 })
 building_blocks_stairs("building_blocks:smoothglass", {
 	drawtype = "glasslike",
 	description = S("Streak Free Glass"),
-	stair_desc = S("Streak Free Glass Stair"),
-	slab_desc = S("Streak Free Glass Slab"),
 	tiles = {"building_blocks_sglass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
+	use_texture_alpha = "clip",
 	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
 	sounds = default.node_sound_glass_defaults(),
 })
 building_blocks_stairs("building_blocks:woodglass", {
 	drawtype = "glasslike",
 	description = S("Wood Framed Glass"),
-	stair_desc = S("Wood Framed Glass Stair"),
-	slab_desc = S("Wood Framed Glass Slab"),
 	tiles = {"building_blocks_wglass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
+	use_texture_alpha = "clip",
 	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
 	sounds = default.node_sound_glass_defaults(),
 })
@@ -79,8 +50,6 @@ building_blocks_stairs("building_blocks:woodglass", {
 building_blocks_stairs("building_blocks:Adobe", {
 	tiles = {"building_blocks_Adobe.png"},
 	description = S("Adobe"),
-	stair_desc = S("Adobe Stair"),
-	slab_desc = S("Adobe Slab"),
 	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_stone_defaults(),
@@ -88,8 +57,6 @@ building_blocks_stairs("building_blocks:Adobe", {
 building_blocks_stairs("building_blocks:fakegrass", {
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	description = S("Fake Grass"),
-	stair_desc = S("Fake Grass Stair"),
-	slab_desc = S("Fake Grass Slab"),
 	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_dirt_defaults({
@@ -100,8 +67,6 @@ building_blocks_stairs("building_blocks:hardwood", {
 	tiles = {"building_blocks_hardwood.png"},
 	is_ground_content = true,
 	description = S("Hardwood"),
-	stair_desc = S("Hardwood Stair"),
-	slab_desc = S("Hardwood Slab"),
 	groups = {choppy=1,flammable=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -109,15 +74,11 @@ building_blocks_stairs("building_blocks:Roofing", {
 	tiles = {"building_blocks_Roofing.png"},
 	is_ground_content = true,
 	description = S("Roof block"),
-	stair_desc = S("Roof block Stair"),
-	slab_desc = S("Roof block Slab"),
 	groups = {snappy=3},
 	sounds = default.node_sound_stone_defaults(),
 })
 building_blocks_stairs("building_blocks:Tar", {
 	description = S("Tar"),
-	stair_desc = S("Tar Stair"),
-	slab_desc = S("Tar Slab"),
 	tiles = {"building_blocks_tar.png"},
 	is_ground_content = true,
 	groups = {crumbly=1, tar_block = 1},
@@ -125,8 +86,6 @@ building_blocks_stairs("building_blocks:Tar", {
 })
 building_blocks_stairs("building_blocks:Marble", {
 	description = S("Marble"),
-	stair_desc = S("Marble Stair"),
-	slab_desc = S("Marble Slab"),
 	tiles = {"building_blocks_marble.png"},
 	is_ground_content = true,
 	groups = {cracky=3, marble = 1},