autodetect 5.4/5.X/0.4 version and set deprecation of some things

* detect is_50 for 5.0+ * detect is_54 for 5.4+ * Fix deprecated use of `use_texture_alpha` on 5.4+ * Pending related minetest-mods#187
minenux · Feb 19, 2022 · 2f51b23 · 2f51b23
1 parent 1410da4
commit 2f51b23
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/init.lua b/init.lua
@@ -9,13 +9,14 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 moreblocks = {}
-
+local is_54 = minetest.has_feature("direct_velocity_on_players")
+local is_50 = minetest.has_feature("object_use_texture_alpha")
 local modpath = minetest.get_modpath("moreblocks")
-
 local S, NS = dofile(modpath .. "/intllib.lua")
 moreblocks.S = S
 moreblocks.NS = NS
-
+moreblocks.is_50 = is_50
+moreblocks.is_54 = is_54
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/circular_saw.lua")
 dofile(modpath .. "/stairsplus/init.lua")

diff --git a/nodes.lua b/nodes.lua
@@ -6,7 +6,7 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 local S = moreblocks.S
-
+local is_54 = moreblocks.is_54
 local sound_dirt = default.node_sound_dirt_defaults()
 local sound_wood = default.node_sound_wood_defaults()
 local sound_stone = default.node_sound_stone_defaults()
@@ -16,6 +16,7 @@ local sound_leaves = default.node_sound_leaves_defaults()
 -- Don't break on 0.4.14 and earlier.
 local sound_metal = (default.node_sound_metal_defaults
 		and default.node_sound_metal_defaults() or sound_stone)
+local utaapi; if is_54 then utaapi = "clip" else utaapi = true end
 
 local function tile_tiles(name)
 	local tex = "moreblocks_" ..name.. ".png"
@@ -194,7 +195,7 @@ local nodes = {
 		description = S("Iron Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#DEDEDE", "default_glass_detail.png^[colorize:#DEDEDE"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -205,7 +206,7 @@ local nodes = {
 		description = S("Coal Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#828282", "default_glass_detail.png^[colorize:#828282"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -216,7 +217,7 @@ local nodes = {
 		description = S("Clean Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -316,7 +317,7 @@ local nodes = {
 		description = S("Trap Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^moreblocks_trap_box_glass.png", "default_glass_detail.png"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -329,7 +330,7 @@ local nodes = {
 		description = S("Trap Obsidian Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png", "default_obsidian_glass_detail.png"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -399,7 +400,7 @@ local nodes = {
 		description = S("Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#E9CD61", "default_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -411,7 +412,7 @@ local nodes = {
 		description = S("Trap Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -425,7 +426,7 @@ local nodes = {
 		description = S("Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#FFFF78", "default_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -437,7 +438,7 @@ local nodes = {
 		description = S("Trap Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = true,
+		use_texture_alpha = utaapi,
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,

diff --git a/redefinitions.lua b/redefinitions.lua
@@ -7,7 +7,7 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 local modname = minetest.get_current_modname()
 
-local is_50 = minetest.has_feature("object_use_texture_alpha")
+local is_50 = moreblocks.is_50
 
 -- Redefine some of the default crafting recipes to be more productive