Add return for get_staticdata

Reviewed-on: VoxeLibre/VoxeLibre#4457

CREDITS.md

@@ -20,10 +20,8 @@
 * epCode
 * chmodsayshello
 * MrRar
-* FossFanatic 
 * SmokeyDope
 * Faerraven / Michieal
-* Codiac
 * rudzik8
 * teknomunk
 
@@ -36,6 +34,8 @@
 * NO11
 * SumianVoice
 * PrairieWind
+* FossFanatic
+* Codiac
 
 ## Contributors
 * RandomLegoBrick
@@ -140,6 +140,7 @@
 * SOS-Games
 * Bram
 * qoheniac
+* WillConker
 
 ## Music
 * Jordach for the jukebox music compilation from Big Freaking Dig

mods/ENTITIES/mcl_mobs/api.lua

@@ -150,6 +150,11 @@ function mob_class:mob_activate(staticdata, def, dtime)
 	local tmp = minetest.deserialize(staticdata)
 
 	if tmp then
+		-- Patch incorrectly converted mobs
+		if tmp.base_mesh ~= minetest.registered_entities[self.name].mesh then
+			mcl_mobs.strip_staticdata(tmp)
+		end
+
 		for _,stat in pairs(tmp) do
 			self[_] = stat
 		end

mods/ENTITIES/mcl_mobs/init.lua

@@ -342,13 +342,33 @@ function mcl_mobs.register_mob(name, def)
 	minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
 end -- END mcl_mobs.register_mob function
 
+
+local STRIP_FIELDS = { "mesh", "base_size", "textures", "base_mesh", "base_texture" }
+function mcl_mobs.strip_staticdata(unpacked_staticdata)
+	-- Strip select fields from the staticdata to prevent conversion issues
+	for i = 1,#STRIP_FIELDS do
+		unpacked_staticdata[STRIP_FIELDS[i]] = nil
+	end
+end
 function mcl_mobs.register_conversion(old_name, new_name)
 	minetest.register_entity(old_name, {
 		on_activate = function(self, staticdata, dtime)
-			local obj = minetest.add_entity(self.object:get_pos(), new_name, staticdata)
-			local hook = (obj:get_luaentity() or {})._on_after_convert
-			if hook then hook(obj) end
-			self.object:remove()
+			local unpacked_staticdata = minetest.deserialize(staticdata)
+			mcl_mobs.strip_staticdata(unpacked_staticdata)
+			staticdata = minetest.serialize(unpacked_staticdata)
+
+			local old_object = self.object
+			if not old_object then return end
+
+			local pos = old_object:get_pos()
+			if not pos then return end
+			old_object:remove()
+
+			local new_object = minetest.add_entity(pos, new_name, staticdata)
+			if not new_object then return end
+
+			local hook = (new_object:get_luaentity() or {})._on_after_convert
+			if hook then hook(new_object) end
 		end,
 		_convert_to = new_name,
 	})
@@ -572,7 +592,12 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
 					--minetest.log("min light: " .. mob_light_lvl[1])
 					--minetest.log("max light: " .. mob_light_lvl[2])
 
-					mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name(), mob_light_lvl[1], mob_light_lvl[2])
+					-- Handle egg conversion
+					local mob_name = itemstack:get_name()
+					local convert_to = (minetest.registered_entities[mob_name] or {})._convert_to
+					if convert_to then mob_name = convert_to end
+
+					mcl_mobspawners.setup_spawner(pointed_thing.under, mob_name, mob_light_lvl[1], mob_light_lvl[2])
 					if not minetest.is_creative_enabled(name) then
 						itemstack:take_item()
 					end

mods/HELP/mcl_craftguide/init.lua

@@ -678,6 +678,7 @@ local function make_formspec(name)
 		image_button[2.4,0.12;0.8,0.8;craftguide_search_icon.png;search;]
 		image_button[3.05,0.12;0.8,0.8;craftguide_clear_icon.png;clear;]
 		field_close_on_enter[filter;false]
+		field_enter_after_edit[filter;true]
 	]]
 
 	fs[#fs + 1] = fmt([[ tooltip[search;%s]

mods/HUD/mcl_credits/people.lua

@@ -22,10 +22,8 @@ return {
 		"epCode",
 		"chmodsayshello",
 		"MrRar",
-		"FossFanatic ",
 		"SmokeyDope",
 		"Faerraven / Michieal",
-		"Codiac",
 		"rudzik8",
 		"teknomunk",
 	}},
@@ -38,6 +36,8 @@ return {
 		"NO11",
 		"SumianVoice",
 		"PrairieWind",
+		"FossFanatic",
+		"Codiac",
 	}},
 	{S("Contributors"), 0x52FF00, {
 		"RandomLegoBrick",
@@ -142,6 +142,7 @@ return {
 		"SOS-Games",
 		"Bram",
 		"qoheniac",
+		"WillConker",
 	}},
 	{S("Music"), 0xA60014, {
 		"Jordach for the jukebox music compilation from Big Freaking Dig",

mods/HUD/mcl_experience/orb.lua

@@ -1,7 +1,12 @@
-local size_min, size_max = 20, 59
-local delta_size = size_max - size_min
+-- Constants
+local size_min = 20 / 100 -- minimum size, prescaled
+local size_max = 59 / 100 -- maximum size, prescaled
+local delta_size = (size_max - size_min) / 10 -- Size change for each XP size level
+local max_orb_age = 300 -- seconds
+local gravity = vector.new(0, -((tonumber(minetest.settings:get("movement_gravity"))) or 9.81), 0)
 
 local size_to_xp = {
+	-- min and max XP amount for a given size
 	{-32768,     2}, --  1
 	{     3,     6}, --  2
 	{     7,    16}, --  3
@@ -16,24 +21,20 @@ local size_to_xp = {
 }
 
 local function xp_to_size(xp)
-	local i, l = 1, #size_to_xp
+	xp = xp or 0
 
-	while xp > size_to_xp[i][1] and i < l do
-		i = i + 1
+	-- Find the size for the xp amount
+	for i=1,11 do
+		local bucket = size_to_xp[i]
+		if xp >= bucket[1] and xp <= bucket[2] then
+			return (i - 1) * delta_size + size_min
+		end
 	end
 
-	return ((i - 1) / (l - 1) * delta_size + size_min) / 100
+	-- Fallback is the minimum size
+	return size_min
 end
 
-local max_orb_age = 300 -- seconds
-local gravity = vector.new(0, -((tonumber(minetest.settings:get("movement_gravity"))) or 9.81), 0)
-
-local collector, pos, pos2
-local direction, distance, player_velocity, goal
-local currentvel, acceleration, multiplier, velocity
-local node, vel, def
-local is_moving, is_slippery, slippery, slip_factor
-local size
 local function xp_step(self, dtime)
 	--if item set to be collected then only execute go to player
 	if self.collected == true then
@@ -41,32 +42,33 @@ local function xp_step(self, dtime)
 			self.collected = false
 			return
 		end
-		collector = minetest.get_player_by_name(self.collector)
+
+		local collector = minetest.get_player_by_name(self.collector)
 		if collector and collector:get_hp() > 0 and vector.distance(self.object:get_pos(),collector:get_pos()) < 7.25 then
 			self.object:set_acceleration(vector.new(0,0,0))
 			self.disable_physics(self)
 			--get the variables
-			pos = self.object:get_pos()
-			pos2 = collector:get_pos()
+			local pos = self.object:get_pos()
+			local pos2 = collector:get_pos()
 
-			player_velocity = collector:get_velocity() or collector:get_player_velocity()
+			local player_velocity = collector:get_velocity() or collector:get_player_velocity()
 
 			pos2.y = pos2.y + 0.8
 
-			direction = vector.direction(pos,pos2)
-			distance = vector.distance(pos2,pos)
-			multiplier = distance
+			local direction = vector.direction(pos,pos2)
+			local distance = vector.distance(pos2,pos)
+			local multiplier = distance
 			if multiplier < 1 then
 				multiplier = 1
 			end
-			goal = vector.multiply(direction,multiplier)
-			currentvel = self.object:get_velocity()
+			local goal = vector.multiply(direction,multiplier)
+			local currentvel = self.object:get_velocity()
 
 			if distance > 1 then
 				multiplier = 20 - distance
-				velocity = vector.multiply(direction,multiplier)
+				local velocity = vector.multiply(direction,multiplier)
 				goal = velocity
-				acceleration = vector.new(goal.x-currentvel.x,goal.y-currentvel.y,goal.z-currentvel.z)
+				local acceleration = vector.new(goal.x-currentvel.x,goal.y-currentvel.y,goal.z-currentvel.z)
 				self.object:add_velocity(vector.add(acceleration,player_velocity))
 			elseif distance < 0.8 then
 				mcl_experience.add_xp(collector, self._xp)
@@ -75,28 +77,25 @@ local function xp_step(self, dtime)
 			return
 		else
 			self.collector = nil
-			self.enable_physics(self)
+			self:enable_physics()
 		end
 	end
 
-
+	-- Age orbs
 	self.age = self.age + dtime
 	if self.age > max_orb_age then
 		self.object:remove()
 		return
 	end
 
-	pos = self.object:get_pos()
+	local pos = self.object:get_pos()
+	if not pos then return end
 
-	if pos then
-		node = minetest.get_node_or_nil({
+	local node = minetest.get_node_or_nil({
 		x = pos.x,
 		y = pos.y -0.25,
 		z = pos.z
 	})
-	else
-		return
-	end
 
 	-- Remove nodes in 'ignore'
 	if node and node.name == "ignore" then
@@ -109,18 +108,18 @@ local function xp_step(self, dtime)
 	end
 
 	-- Slide on slippery nodes
-	vel = self.object:get_velocity()
-	def = node and minetest.registered_nodes[node.name]
-	is_moving = (def and not def.walkable) or
+	local vel = self.object:get_velocity()
+	local def = node and minetest.registered_nodes[node.name]
+	local is_moving = (def and not def.walkable) or
 		vel.x ~= 0 or vel.y ~= 0 or vel.z ~= 0
-	is_slippery = false
+	local is_slippery = false
 
 	if def and def.walkable then
-		slippery = minetest.get_item_group(node.name, "slippery")
+		local slippery = minetest.get_item_group(node.name, "slippery")
 		is_slippery = slippery ~= 0
 		if is_slippery and (math.abs(vel.x) > 0.2 or math.abs(vel.z) > 0.2) then
 			-- Horizontal deceleration
-			slip_factor = 4.0 / (slippery + 4)
+			local slip_factor = 4.0 / (slippery + 4)
 			self.object:set_acceleration({
 				x = -vel.x * slip_factor,
 				y = 0,
@@ -160,7 +159,6 @@ minetest.register_entity("mcl_experience:orb", {
 		initial_sprite_basepos = {x = 0, y = 0},
 		is_visible = true,
 		pointable = false,
-		static_save = false,
 	},
 	moving_state = true,
 	slippery_state = false,
@@ -191,7 +189,7 @@ minetest.register_entity("mcl_experience:orb", {
 		-- This was a minetest bug for a while: https://github.com/minetest/minetest/issues/14420
 		local xp = tonumber(staticdata) or 0
 		self._xp = xp
-		size = xp_to_size(xp)
+		local size = xp_to_size(xp)
 
 		self.object:set_properties({
 			visual_size = {x = size, y = size},
@@ -199,6 +197,9 @@ minetest.register_entity("mcl_experience:orb", {
 		})
 		self.object:set_sprite({x=1,y=math.random(1,14)}, 14, 0.05, false)
 	end,
+	get_staticdata = function(self)
+		return tostring(self._xp or 0)
+	end,
 
 	enable_physics = function(self)
 		if not self.physical_state then

mods/ITEMS/mcl_anvils/init.lua

@@ -28,6 +28,7 @@ local function get_anvil_formspec(set_name)
 
 		"field[4.125,0.75;7.25,1;name;;" .. F(set_name) .. "]",
 		"field_close_on_enter[name;false]",
+		"field_enter_after_edit[name;true]",
 		"set_focus[name;true]",
 
 		mcl_formspec.get_itemslot_bg_v4(1.625, 2.6, 1, 1),

mods/ITEMS/mcl_blackstone/init.lua

@@ -196,7 +196,7 @@ end
 mcl_stairs.register_stair_and_slab("blackstone", "mcl_blackstone:blackstone",
 		{cracky=3, pickaxey=1, material_stone=1},
 		{"mcl_blackstone_top.png", "mcl_blackstone_top.png", "mcl_blackstone_side.png"},
-		S("Blackstone Stairs"),
+		S("Blackstone Stair"),
 		S("Blackstone Slab"),
 		mcl_sounds.node_sound_stone_defaults(), 6, 2,
 		S("Double Blackstone Slab"), nil)
@@ -204,7 +204,7 @@ mcl_stairs.register_stair_and_slab("blackstone", "mcl_blackstone:blackstone",
 mcl_stairs.register_stair_and_slab("blackstone_polished", "mcl_blackstone:blackstone_polished",
 		{cracky=3, pickaxey=1, material_stone=1},
 		{"mcl_blackstone_polished.png"},
-		S("Polished Blackstone Stairs"),
+		S("Polished Blackstone Stair"),
 		S("Polished Blackstone Slab"),
 		mcl_sounds.node_sound_stone_defaults(), 6, 2,
 		S("Double Polished Blackstone Slab"), nil)
@@ -212,7 +212,7 @@ mcl_stairs.register_stair_and_slab("blackstone_polished", "mcl_blackstone:blacks
 mcl_stairs.register_stair_and_slab("blackstone_chiseled_polished", "mcl_blackstone:blackstone_chiseled_polished",
 		{cracky=3, pickaxey=1, material_stone=1},
 		{"mcl_blackstone_chiseled_polished.png"},
-		S("Chiseled Polished Blackstone Stairs"),
+		S("Chiseled Polished Blackstone Stair"),
 		S("Chiseled Polished Blackstone Slab"),
 		mcl_sounds.node_sound_stone_defaults(), 6, 2,
 		S("Double Chiseled Polished Blackstone Slab"), nil)
@@ -220,10 +220,10 @@ mcl_stairs.register_stair_and_slab("blackstone_chiseled_polished", "mcl_blacksto
 mcl_stairs.register_stair_and_slab("blackstone_brick_polished", "mcl_blackstone:blackstone_brick_polished",
 		{cracky=3, pickaxey=1, material_stone=1},
 		{"mcl_blackstone_polished_bricks.png"},
-		S("Polished Blackstone Brick Stair Stairs"),
-		S("Polished Blackstone Brick Stair Slab"),
+		S("Polished Blackstone Brick Stair"),
+		S("Polished Blackstone Brick Slab"),
 		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Polished Blackstone Brick Stair Slab"), nil)
+		S("Double Polished Blackstone Brick Slab"), nil)
 
 --Wall
 mcl_walls.register_wall(

mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.de.tr

@@ -9,10 +9,10 @@ Blackstone Slab=Schwarzstein Stufe
 Polished Blackstone Slab=Polierte Schwarzstein Stufe
 Chiseled Polished Blackstone Slab=Gemeißelte Polierte Schwarzstein Stufe
 Polished Blackstone Brick Slab=Polierte Schwarzsteinziegel Stufe
-Blackstone Stairs=Schwarzstein Treppe
-Polished Blackstone Stairs=Polierte Schwarzstein Treppe
-Chiseled Polished Blackstone Stairs=Gemeißelte Polierte Schwarzstein Treppe
-Polished Blackstone Brick Stairs=Polierte Schwarzsteinziegel Treppe
+Blackstone Stair=Schwarzstein Treppe
+Polished Blackstone Stair=Polierte Schwarzstein Treppe
+Chiseled Polished Blackstone Stair=Gemeißelte Polierte Schwarzstein Treppe
+Polished Blackstone Brick Stair=Polierte Schwarzsteinziegel Treppe
 Quartz Bricks=Quartz Ziegel
 Soul Torch=Seelenfakel
 Soul Lantern=Seelenlaterne

mods/ITEMS/mcl_mobspawners/init.lua

@@ -83,6 +83,13 @@ local function respawn_doll(pos)
 	local mob = meta:get_string("Mob")
 	local doll
 	if mob and mob ~= "" then
+		-- Handle conversion of mob spawners
+		local convert_to = (minetest.registered_entities[mob] or {})._convert_to
+		if convert_to then
+			mob = convert_to
+			meta:set_string("Mob", mob)
+		end
+
 		doll = find_doll(pos)
 		if not doll then
 			doll = spawn_doll(pos)
@@ -128,7 +135,6 @@ function mcl_mobspawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInAr
 	end
 	set_doll_properties(doll, Mob)
 
-
 	-- Start spawning very soon
 	local t = minetest.get_node_timer(pos)
 	t:start(2)
@@ -165,7 +171,6 @@ local function spawn_mobs(pos, elapsed)
 	local count = 0
 	local ent
 
-
 	local timer = minetest.get_node_timer(pos)
 
 	-- spawn mob if player detected and in range
@@ -367,7 +372,6 @@ doll_def.on_activate = function(self, staticdata, dtime_s)
 	self.object:set_velocity({x=0, y=0, z=0})
 	self.object:set_acceleration({x=0, y=0, z=0})
 	self.object:set_armor_groups({immortal=1})
-
 end
 
 doll_def.on_step = function(self, dtime)

mods/ITEMS/mcl_stairs/register.lua

@@ -77,7 +77,7 @@ mcl_stairs.register_slab("granite", "mcl_core:granite",
 mcl_stairs.register_stair("diorite", "mcl_core:diorite",
 		{pickaxey=1, material_stone=1},
 		{"mcl_core_diorite.png"},
-		S("Granite Stairs"),
+		S("Diorite Stairs"),
 		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
 mcl_stairs.register_slab("diorite", "mcl_core:diorite",
 		{pickaxey=1, material_stone=1},

releasenotes/0_87-the_prismatic_release.md

@@ -16,6 +16,7 @@
 * SOS-Games
 * Bram
 * qoheniac
+* WillConker
 
 ### Game rename
 Based on months of collecting suggestions, analysis and vetting of possible names, community voting and discussion between developers, the rename of the game has reached its conclusion! The project has been renamed to **VoxeLibre**.
@@ -165,16 +166,34 @@ One of our tools, the Python script allowing conversion of Minecraft resource pa
 * XP orbs related crash – by teknomunk
 * Ghast fireball related crash – by Araca
 * Crash related to server restart while a player is dead – by teknomunk
-* Crashes related to the new effects API - by teknomunk and Herowl
+* Crashes related to the new effects API – by teknomunk and Herowl
 
 ## 0.87.1 hotfix
-* Fixed crash when shooting potions from a dispenser - by teknomunk
-* Fixed crash related to custom mobspawners - by teknomunk
-* Fixed beacon crash - by teknomunk
-* Fixed eye of ender crash - by Herowl
-* Fixed Stalker texture generation - by teknomunk
-* Correctly refresh enchanted tool capabilities - by teknomunk
-* Fixed creative inventory misbehaving - by Herowl
-* Fixed variable definition in mob spawning code - by teknomunk
-* Updated documentation - by Herowl and teknomunk
-* Increased stack size for snowballs and eggs - by JoseDouglas26
+* Fixed crash when shooting potions from a dispenser – by teknomunk
+* Fixed crash related to custom mobspawners – by teknomunk
+* Fixed beacon crash – by teknomunk
+* Fixed eye of ender crash – by Herowl
+* Fixed Stalker texture generation – by teknomunk
+* Correctly refresh enchanted tool capabilities – by teknomunk
+* Fixed creative inventory misbehaving – by Herowl
+* Fixed variable definition in mob spawning code – by teknomunk
+* Updated documentation – by Herowl and teknomunk
+* Increased stack size for snowballs and eggs – by JoseDouglas26
+
+## 0.87.2 hotfix
+* Zombie texture improvements – by SmokeyDope
+* Wrong name of diorite stairs fixed – by qoheniac
+* Fixed flint and steel wearing down when not placing fire – by JoseDouglas26 and WillConker
+* Fixed brewing stands' rotation – by JoseDouglas26 and WillConker
+* Fixed beacon formspec – by teknomunk
+* Made all hollow logs breakable properly – by teknomunk
+* Instructions on how to eat added to the help menu – by teknomunk
+* Potion conversion fixed – by Herowl
+* Fixed some node names – by seventeenthShulker
+* Fixed anvil and craftguide formspecs on mobile – by Herowl
+* Fixed effect loading – by Herowl
+* Fixed crash while fighting wither – by teknomunk
+* Fixed crash when bonemealing sweet berry bushes – by teknomunk
+* Fixed some mob conversion crashes – by teknomunk
+* Fixed crash related to the frost walker enchantment – by WillConker
+* Fixed some mob-related crashes – by Herowl