From f594c91ca3fa847bfb9b8d66199ed4fa629c60ec Mon Sep 17 00:00:00 2001 From: HybridDog Date: Mon, 4 Nov 2019 12:16:08 +0100 Subject: [PATCH 1/2] Add a warning about string nodenames abm values, they should not occur --- init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.lua b/init.lua index ab2869e..3db6584 100644 --- a/init.lua +++ b/init.lua @@ -1122,6 +1122,11 @@ local function get_grow(name) local is = {} for i = 1,#minetest.registered_abms do local ad = minetest.registered_abms[i] + if type(ad.nodenames) ~= "table" then + minetest.log("warning", "ABM nodenames is not a table: " .. + dump(ad)) + return + end if ad.chance > 1 and table.indexof(ad.nodenames, name) ~= -1 then is[#is+1] = ad.action From 2869aed00a4474646ccba536efc88122cdb00f05 Mon Sep 17 00:00:00 2001 From: HybridDog Date: Mon, 4 Nov 2019 12:26:58 +0100 Subject: [PATCH 2/2] Fix a spelling mistake: binge -> beige --- init.lua | 20 ++++++++++++------ ...ad_binge.png => riesenpilz_head_beige.png} | Bin 2 files changed, 14 insertions(+), 6 deletions(-) rename textures/{riesenpilz_head_binge.png => riesenpilz_head_beige.png} (100%) diff --git a/init.lua b/init.lua index 3db6584..6024ddb 100644 --- a/init.lua +++ b/init.lua @@ -334,7 +334,7 @@ function riesenpilz.parasol(pos, nodes, area, w, h) for _,j in pairs({ {bhead2, 0, c.head_brown_bright}, - {bhead1, -1, c.head_binge} + {bhead1, -1, c.head_beige} }) do for i in area:iter(pos.x-j[1], pos.y+h+j[2], pos.z-j[1], pos.x+j[1], pos.y+h+j[2], pos.z+j[1]) do nodes[i] = j[3] @@ -348,8 +348,8 @@ function riesenpilz.parasol(pos, nodes, area, w, h) nodes[area:index(pos.x+l*k, pos.y+rh, pos.z+k)] = c.head_white end for l = -w+1, w do - nodes[area:index(pos.x+w*k, pos.y+h-2, pos.z-l*k)] = c.head_binge - nodes[area:index(pos.x+l*k, pos.y+h-2, pos.z+w*k)] = c.head_binge + nodes[area:index(pos.x+w*k, pos.y+h-2, pos.z-l*k)] = c.head_beige + nodes[area:index(pos.x+l*k, pos.y+h-2, pos.z+w*k)] = c.head_beige end for l = -bhead1+1, bhead1 do nodes[area:index(pos.x+bhead1*k, pos.y+h-2, pos.z-l*k)] = c.head_white @@ -980,8 +980,8 @@ for _,i in pairs({ }, { typ = "head", - name = "binge", - textures = {"head_binge.png", "head_white.png", "head_binge.png"}, + name = "beige", + textures = {"head_beige.png", "head_white.png", "head_beige.png"}, sapling = "parasol" }, { @@ -1084,7 +1084,7 @@ c = { head_blue_bright = minetest.get_content_id("riesenpilz:head_blue_bright"), head_white = minetest.get_content_id("riesenpilz:head_white"), - head_binge = minetest.get_content_id("riesenpilz:head_binge"), + head_beige = minetest.get_content_id("riesenpilz:head_beige"), head_brown_bright = minetest.get_content_id("riesenpilz:head_brown_bright"), stem_red = minetest.get_content_id("riesenpilz:stem_red"), @@ -1254,6 +1254,14 @@ if riesenpilz.enable_mapgen then dofile(modpath.."mapgen.lua") end + + +-- Legacy + + +minetest.register_alias("riesenpilz:head_binge", "riesenpilz:head_beige") + + local time = math.floor(tonumber(os.clock()-load_time_start)*100+0.5)/100 local msg = "[riesenpilz] loaded after ca. "..time if time > 0.05 then diff --git a/textures/riesenpilz_head_binge.png b/textures/riesenpilz_head_beige.png similarity index 100% rename from textures/riesenpilz_head_binge.png rename to textures/riesenpilz_head_beige.png