From 34bb232052c3c6b37310a99b2051a60d6c370bc7 Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Sat, 27 Feb 2021 00:48:56 -0500 Subject: [PATCH 1/3] mtg_craftguide: Fix incorrect item tooltips This happened when the same item was visible twice and one of them was a group item. Fix it by ensuring that buttons that should have different tooltips don't have the same element name. --- mods/mtg_craftguide/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mods/mtg_craftguide/init.lua b/mods/mtg_craftguide/init.lua index e20b168e..f3de3db5 100644 --- a/mods/mtg_craftguide/init.lua +++ b/mods/mtg_craftguide/init.lua @@ -242,11 +242,13 @@ local function recipe_fs(fs, data) for i, item in pairs(recipe.items) do local x, y = coords(i - 1, width) + local elem_name = item local groups = extract_groups(item) if groups then item = groups_to_item(groups) + elem_name = esc(item.."."..table.concat(groups, "+")) end - item_button_fs(fs, base_x + x, base_y + y, item, item, groups) + item_button_fs(fs, base_x + x, base_y + y, item, elem_name, groups) end if shapeless or recipe.method == "cooking" then @@ -378,7 +380,7 @@ local function on_receive_fields(player, fields) local item for field in pairs(fields) do if field:find(":") then - item = field + item = field:match("[%w_:]+") break end end From 0a90bd8a0ec530f48e1bd9a438e24bd85cc9cd66 Mon Sep 17 00:00:00 2001 From: An0n3m0us Date: Wed, 17 Mar 2021 07:16:39 -0400 Subject: [PATCH 2/3] Fix wield image for coral and kelp nodes (#2850) --- mods/default/nodes.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 1358c706..afd231e9 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1961,6 +1961,7 @@ minetest.register_node("default:sand_with_kelp", { tiles = {"default_sand.png"}, special_tiles = {{name = "default_kelp.png", tileable_vertical = true}}, inventory_image = "default_kelp.png", + wield_image = "default_kelp.png", paramtype = "light", paramtype2 = "leveled", groups = {snappy = 3}, @@ -2077,6 +2078,7 @@ minetest.register_node("default:coral_green", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}}, inventory_image = "default_coral_green.png", + wield_image = "default_coral_green.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2107,6 +2109,7 @@ minetest.register_node("default:coral_pink", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}}, inventory_image = "default_coral_pink.png", + wield_image = "default_coral_pink.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2137,6 +2140,7 @@ minetest.register_node("default:coral_cyan", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}}, inventory_image = "default_coral_cyan.png", + wield_image = "default_coral_cyan.png", groups = {snappy = 3}, selection_box = { type = "fixed", From 42baede13fdf855773cc44ce10f4a3ea4e239404 Mon Sep 17 00:00:00 2001 From: An0n3m0us Date: Fri, 2 Apr 2021 13:13:44 -0400 Subject: [PATCH 3/3] Add specific groups to different types of grass (#2852) --- mods/default/nodes.lua | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index afd231e9..a2974517 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1450,7 +1450,7 @@ minetest.register_node("default:junglegrass", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, junglegrass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1471,7 +1471,8 @@ minetest.register_node("default:grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, + normal_grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1501,7 +1502,8 @@ for i = 2, 5 do buildable_to = true, drop = "default:grass_1", groups = {snappy = 3, flora = 1, attached_node = 1, - not_in_creative_inventory = 1, grass = 1, flammable = 1}, + not_in_creative_inventory = 1, grass = 1, + normal_grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1523,7 +1525,7 @@ minetest.register_node("default:dry_grass_1", { walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, - attached_node = 1, dry_grass = 1}, + attached_node = 1, grass = 1, dry_grass = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1552,7 +1554,7 @@ for i = 2, 5 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - not_in_creative_inventory=1, dry_grass = 1}, + not_in_creative_inventory = 1, grass = 1, dry_grass = 1}, drop = "default:dry_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1574,7 +1576,8 @@ minetest.register_node("default:fern_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1}, + groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, + fern = 1, attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1604,7 +1607,7 @@ for i = 2, 3 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - not_in_creative_inventory=1}, + grass = 1, fern = 1, not_in_creative_inventory = 1}, drop = "default:fern_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1626,7 +1629,8 @@ minetest.register_node("default:marram_grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1}, + groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, marram_grass = 1, + attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1654,8 +1658,8 @@ for i = 2, 3 do sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1, - not_in_creative_inventory=1}, + groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, + grass = 1, marram_grass = 1, not_in_creative_inventory = 1}, drop = "default:marram_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = {