Observers must not override swap_node

mods/ENTITIES/mcl_mobs/physics.lua

@@ -928,6 +928,8 @@ end
 -- falling and fall damage
 -- returns true if mob died
 function mob_class:falling(pos, moveresult)
+	if moveresult and moveresult.touching_ground then return false end
+
 	if self.fly and self.state ~= "die" then
 		return
 	end
@@ -950,13 +952,7 @@ function mob_class:falling(pos, moveresult)
 			new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
 		elseif v.y <= 0 and v.y > self.fall_speed then
 			-- fall downwards at set speed
-			if moveresult and moveresult.touching_ground then
+			new_acceleration = vector.new(0, self.fall_speed, 0)
-				-- when touching ground, retain a minimal gravity to keep the touching_ground flag
-				-- but also to not get upwards acceleration with large dtime when on bouncy ground
-				new_acceleration = vector.new(0, self.fall_speed * 0.01, 0)
-			else
-				new_acceleration = vector.new(0, self.fall_speed, 0)
-			end
 		else
 			-- stop accelerating once max fall speed hit
 			new_acceleration =vector.zero()

mods/ENTITIES/mobs_mc/axolotl.lua

@@ -72,24 +72,18 @@ local axolotl = {
 	fly = true,
 	fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" },
 	breathes_in_water = true,
-	jump = false, -- would get them out of the water too often
+	jump = true,
 	damage = 2,
 	reach = 2,
 	attack_type = "dogfight",
 	attack_animals = true,
 	specific_attack = {
-		"mobs_mc:cod",
+		"extra_mobs_cod",
-		"mobs_mc:glow_squid",
+		"extra_mobs_glow_squid",
-		"mobs_mc:salmon",
+		"extra_mobs_salmon",
-		"mobs_mc:tropical_fish",
+		"extra_mobs_tropical_fish",
-		"mobs_mc:squid",
+		"mobs_mc_squid"
-		"mobs_mc:zombie", -- todo: only drowned?
+		 },
-		"mobs_mc:baby_zombie",
-		"mobs_mc:husk",
-		"mobs_mc:baby_husk",
-		"mobs_mc:guardian_elder",
-		"mobs_mc:guardian",
-	},
 	runaway = true,
 }
 

mods/ITEMS/REDSTONE/mcl_observers/init.lua

@@ -291,7 +291,6 @@ if realtime then
 	-- Override basic functions for observing:
 	mcl_observers.add_node =	minetest.add_node
 	mcl_observers.set_node =	minetest.set_node
-	mcl_observers.swap_node =	minetest.swap_node
 	mcl_observers.remove_node =	minetest.remove_node
 	mcl_observers.bulk_set_node =	minetest.bulk_set_node
 
@@ -349,33 +348,6 @@ if realtime then
 			mcl_observers.observer_activate({x=pos.x,y=pos.y+1,z=pos.z})
 		end
 	end
-	function minetest.swap_node(pos,node)
-		mcl_observers.swap_node(pos,node)
-		local n = get_node({x=pos.x+1,y=pos.y,z=pos.z})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_o" and minetest.facedir_to_dir(n.param2).x==-1 then
-			mcl_observers.observer_activate({x=pos.x+1,y=pos.y,z=pos.z})
-		end
-		n = get_node({x=pos.x-1,y=pos.y,z=pos.z})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_o" and minetest.facedir_to_dir(n.param2).x==1 then
-			mcl_observers.observer_activate({x=pos.x-1,y=pos.y,z=pos.z})
-		end
-		n = get_node({x=pos.x,y=pos.y,z=pos.z+1})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_o" and minetest.facedir_to_dir(n.param2).z==-1 then
-			mcl_observers.observer_activate({x=pos.x,y=pos.y,z=pos.z+1})
-		end
-		n = get_node({x=pos.x,y=pos.y,z=pos.z-1})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_o" and minetest.facedir_to_dir(n.param2).z==1 then
-			mcl_observers.observer_activate({x=pos.x,y=pos.y,z=pos.z-1})
-		end
-		n = get_node({x=pos.x,y=pos.y-1,z=pos.z})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_u" then
-			mcl_observers.observer_activate({x=pos.x,y=pos.y-1,z=pos.z})
-		end
-		n = get_node({x=pos.x,y=pos.y+1,z=pos.z})
-		if n and n.name and string.sub(n.name,1,24)=="mcl_observers:observer_d" then
-			mcl_observers.observer_activate({x=pos.x,y=pos.y+1,z=pos.z})
-		end
-	end
 	function minetest.remove_node(pos)
 		mcl_observers.remove_node(pos)
 		local n = get_node({x=pos.x+1,y=pos.y,z=pos.z})

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -5,6 +5,9 @@
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
 -- CONSTS
+local DOUBLE_DROP_CHANCE = 8
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_ENDCAP_NAME = "mcl_bamboo:bamboo_endcap"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
@@ -13,7 +16,7 @@ local BAMBOO_PLANK = BAMBOO .. "_plank"
 local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 local node_sound = mcl_sounds.node_sound_wood_defaults()
-local pr = PseudoRandom((os.time() + 15766) * 12)
+local pr = PseudoRandom((os.time() + 15766) * 12) -- switched from math.random() to PseudoRandom because the random wasn't very random.
 
 local on_rotate
 if minetest.get_modpath("screwdriver") then
@@ -28,7 +31,33 @@ local bamboo_def = {
 	paramtype = "light",
 	groups = {handy = 1, axey = 1, choppy = 1, dig_by_piston = 1, plant = 1, non_mycelium_plant = 1, flammable = 3},
 	sounds = node_sound,
-	drop = BAMBOO,
+
+	drop = {
+		max_items = 1,
+		-- From the API:
+		-- max_items: Maximum number of item lists to drop.
+		-- The entries in 'items' are processed in order. For each:
+		-- Item filtering is applied, chance of drop is applied, if both are
+		-- successful the entire item list is dropped.
+		-- Entry processing continues until the number of dropped item lists
+		-- equals 'max_items'.
+		-- Therefore, entries should progress from low to high drop chance.
+		items = {
+			-- Examples:
+			{
+				-- 1 in DOUBLE_DROP_CHANCE chance of dropping.
+				-- Default rarity is '1'.
+				rarity = DOUBLE_DROP_CHANCE,
+				items = {BAMBOO .. " 2"},
+			},
+			{
+				-- 1 in 1 chance of dropping. (Note: this means that it will drop 100% of the time.)
+				-- Default rarity is '1'.
+				rarity = 1,
+				items = {BAMBOO},
+			},
+		},
+	},
 
 	inventory_image = "mcl_bamboo_bamboo_shoot.png",
 	wield_image = "mcl_bamboo_bamboo_shoot.png",
@@ -57,6 +86,7 @@ local bamboo_def = {
 	on_rotate = on_rotate,
 
 	on_place = function(itemstack, placer, pointed_thing)
+
 		if not pointed_thing then
 			return itemstack
 		end
@@ -211,6 +241,9 @@ local bamboo_def = {
 		if node_above and ((bamboo_node and bamboo_node > 0) or node_above.name == BAMBOO_ENDCAP_NAME) then
 			minetest.remove_node(new_pos)
 			minetest.sound_play(node_sound.dug, sound_params, true)
+			if pr:next(1, DOUBLE_DROP_CHANCE) == 1 then
+				minetest.add_item(new_pos, istack)
+			end
 			minetest.add_item(new_pos, istack)
 		end
 	end,

mods/ITEMS/mcl_bamboo/bamboo_items.lua

@@ -9,6 +9,8 @@ local SIDE_SCAFFOLDING = false
 local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal"
 -- ---------------------------------------------------------------------------
 local SCAFFOLDING_NAME = "mcl_bamboo:scaffolding"
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 

mods/ITEMS/mcl_bamboo/init.lua

@@ -7,6 +7,8 @@
 
 -- LOCALS
 local modname = minetest.get_current_modname()
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 
 mcl_bamboo = {}

mods/ITEMS/mcl_bamboo/recipes.lua

@@ -5,6 +5,8 @@
 --- These are all of the fuel recipes and all of the crafting recipes, consolidated into one place.
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
+-- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
+-- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 -- Craftings