Merge remote-tracking branch 'upstream/master'

Fix deprecated use of use_texture_alpha (#180 )
Co-authored-by: sys4 <bricassa@sys4.fr>
2021-03-25 21:52:22 +01:00 · 2021-03-20 00:19:35 +01:00 · 2021-03-19 23:05:52 +01:00 · 2021-03-19 23:02:13 +01:00 · 2021-03-02 23:54:41 +01:00 · 2021-02-26 12:06:41 +01:00
3 changed files with 18 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ### Fixed

+- [Shapeless crafting recipes are now handled in redefinitions.](https://github.com/minetest-mods/moreblocks/pull/171)
+- [Aliases are now resolved in Stairs+ circular saw cost calculation.](https://github.com/minetest-mods/moreblocks/pull/175)
 - [Fixed strange placement behavior for non-default Stairs+ nodes.](https://github.com/minetest-mods/moreblocks/pull/168)
 - [Fixed stairs placement over oddly-shaped nodes.](https://github.com/minetest-mods/moreblocks/pull/166)

--- a/circular_saw.lua
+++ b/circular_saw.lua
@ -89,8 +89,9 @@ circular_saw.names = {
 }

 function circular_saw:get_cost(inv, stackname)
+	local name = minetest.registered_aliases[stackname] or stackname
 	for i, item in pairs(inv:get_list("output")) do
-		if item:get_name() == stackname then
+		if item:get_name() == name then
 			return circular_saw.cost_in_microblocks[i]
 		end
 	end
--- a/nodes.lua
+++ b/nodes.lua
@ -194,7 +194,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -205,7 +205,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -216,7 +216,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -316,7 +316,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -329,7 +329,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -353,7 +353,7 @@ local nodes = {
 		description = S("Trap Clean Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png"},
-		use_texture_alpha = true,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -412,7 +412,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -424,7 +424,7 @@ local nodes = {
 		description = S("Clean Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png^[colorize:#E9CD61", "moreblocks_clean_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = true,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -436,7 +436,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -450,7 +450,7 @@ local nodes = {
 		description = S("Trap Clean Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = true,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -464,7 +464,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -476,7 +476,7 @@ local nodes = {
 		description = S("Clean Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png^[colorize:#FFFF78", "moreblocks_clean_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = true,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -488,7 +488,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 = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@ -502,7 +502,7 @@ local nodes = {
 		description = S("Trap Clean Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = true,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
Author	SHA1	Message	Date
sys4	07b6dd8bfe	Merge remote-tracking branch 'upstream/master'	2021-03-25 21:52:22 +01:00
sys4-fr	3b97ea5697	Fix deprecated use of `use_texture_alpha` (#180 ) Co-authored-by: sys4 <bricassa@sys4.fr>	2021-03-20 00:19:35 +01:00
sys4	4f3c1bb39d	Merge branch 'github'	2021-03-19 23:05:52 +01:00
sys4	cbfc442206	Fix deprecated use of use_texture_alpha	2021-03-19 23:02:13 +01:00
sys4	4692e88b63	Merge remote-tracking branch 'upstream/master'	2021-03-02 23:54:41 +01:00
Hugo Locurcio	bcd1a5688b	Update the changelog with recent fixes	2021-02-26 12:06:41 +01:00
Oblomov	1a03b041dd	Handle shapeless recipes in redefinitions (#171 ) They can be recognized from having width == 0, and don't need the items list to be massaged to be transformed into the recipe field for the Lua API.	2021-02-26 12:04:45 +01:00
sys4	ea335a3745	Merge remote-tracking branch 'upstream/master'	2021-02-13 14:13:46 +01:00
Tin Švagelj	b39bb31295	Resolve aliases in cost calculation (#175 ) If stairs from stairs mod were crafted before moreblocks was enabled, the old (now aliased) stairs variant is kept in inventory. If the player tried to recycle that stair variant, `inv:contains_item("output", stackname)` would return true as `contains_item` resolves alias names, but `circular_saw:get_cost` would return nil as it's expecting exact `stackname` matches which would later crash due to nil arithmetic. This PR fixes this issue by resolving alias using `minetest.registered_aliases` table. `circular_saw:get_cost` should work now in every scenario where `inv:contains_item("output", stackname)` returns true.	2021-02-10 17:52:55 +01:00