Merge remote-tracking branch 'upstream/master'

Takes the changes from MTG commit 38307da and 71ea0c6

.gitignore

@@ -0,0 +1,3 @@
+*.bak
+*.diff
+*.patch

README.md

@@ -0,0 +1,50 @@
+# Boost Cart
+Based on (and fully compatible with) the mod "carts" by PilzAdam
+and the one contained in the subgame "minetest_game".
+Target: Run smoothly as possible, even on laggy servers.
+
+## Features
+- A fast cart for your railway or roller coaster
+- Easily configurable cart speed using the Advanced Settings
+- Boost and brake rails
+- By mesecons controlled Start-Stop rails
+- Detector rails that send a mesecons signal when the cart drives over them
+- Rail junction switching with the 'right/left' walking keys
+- Handbrake with the 'back' key
+- Support for non-minetest_game subgames
+- Descend from cart using the `sneak` key
+
+## Settings
+This mod can be adjusted to fit the preference of a player or server. Use the `Settings -> All Settings` dialog in the main menu or tune your
+minetest.conf file manually:
+
+#### `boost_cart.speed_max = 10`
+* Maximal speed of the cart in m/s
+* Possible values: 1 ... 100
+
+#### `boost_cart.punch_speed_max = 7`
+* Maximal speed to which the driving player can accelerate the cart by punching from inside the cart.
+* Possible values: -1 ... 100
+* Value `-1` will disable this feature.
+
+## License for everything
+CC-0, if not specified otherwise below
+
+
+ Authors
+---------
+Various authors
+- carts_rail_*.png
+
+kddekadenz
+- cart_bottom.png
+- cart_side.png
+- cart_top.png
+
+klankbeeld (CC-BY 3.0)
+- http://freesound.org/people/klankbeeld/sounds/174042/
+- cart_rail.*.ogg
+
+Zeg9
+- cart.x
+- cart.png

README.txt

@@ -1,57 +0,0 @@
- Minetest mod: boost_cart
-==========================
-Based on (and fully compatible with) the mod "carts" by PilzAdam
-and the one contained in the subgame "minetest_game".
-Target: Run smoothly as possible, even on laggy servers.
-
-
- Features
-----------
-- A fast cart for your railway or roller coaster
-- Easily configurable cart speed using the Advanced Settings
-- Boost and brake rails
-- By mesecons controlled Start-Stop rails
-- Detector rails that send a mesecons signal when the cart drives over them
-- Rail junction switching with the 'right/left' walking keys
-- Handbrake with the 'back' key
-- Support for non-minetest_game subgames
-
-
- Settings
-----------
-This mod can be adjusted to fit the conditions of a player or server.
-Use the Advanced Settings dialog in the main menu or tune your
-minetest.conf file manually:
-
-boost_cart.speed_max = 10
-   ^ Possible values: 1 ... 100
-   ^ Maximal speed of the cart in m/s
-
-boost_cart.punch_speed_max = 7
-   ^ Possible values: -1 ... 100
-   ^ Maximal speed to which the driving player can accelerate the cart
-     by punching from inside the cart. -1 will disable this feature.
-
-
- License for everything
-------------------------
-CC-0, if not specified otherwise below
-
-
- Authors
----------
-Various authors
-	carts_rail_*.png
-
-kddekadenz
-	cart_bottom.png
-	cart_side.png
-	cart_top.png
-
-klankbeeld (CC-BY 3.0)
-	http://freesound.org/people/klankbeeld/sounds/174042/
-	cart_rail.*.ogg
-
-Zeg9
-	cart.x
-	cart.png

cart_entity.lua

@@ -1,6 +1,4 @@
 
-local HAVE_MESECONS_ENABLED = minetest.global_exists("mesecon")
-
 function boost_cart:on_rail_step(entity, pos, distance)
 	-- Play rail sound
 	if entity.sound_counter <= 0 then
@@ -13,7 +11,7 @@ function boost_cart:on_rail_step(entity, pos, distance)
 	end
 	entity.sound_counter = entity.sound_counter - distance
 
-	if HAVE_MESECONS_ENABLED then
+	if boost_cart.MESECONS then
 		boost_cart:signal_detector_rail(pos)
 	end
 end
@@ -40,7 +38,7 @@ local cart_entity = {
 }
 
 -- Model and textures
-if boost_cart.mtg_compat then
+if boost_cart.MTG_CARTS then
 	cart_entity.initial_properties.mesh = "carts_cart.b3d"
 	cart_entity.initial_properties.textures = {"carts_cart.png"}
 end
@@ -51,17 +49,10 @@ function cart_entity:on_rightclick(clicker)
 	end
 	local player_name = clicker:get_player_name()
 	if self.driver and player_name == self.driver then
-		self.driver = nil
 		boost_cart:manage_attachment(clicker, nil)
 	elseif not self.driver then
-		self.driver = player_name
 		boost_cart:manage_attachment(clicker, self.object)
-
-		if default.player_set_animation then
-			-- player_api(/default) does not update the animation
-			-- when the player is attached, reset to default animation
-			default.player_set_animation(clicker, "stand")
-		end
+		self.driver = player_name
 	end
 end
 
@@ -96,6 +87,7 @@ end
 -- 0.5.x and later: When the driver leaves
 function cart_entity:on_detach_child(child)
 	if child and child:get_player_name() == self.driver then
+		boost_cart:manage_attachment(child, nil)
 		self.driver = nil
 	end
 end
@@ -128,8 +120,13 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
 			boost_cart:manage_attachment(player, nil)
 		end
 		for _, obj_ in pairs(self.attached_items) do
-			if obj_ then
+			local ent = obj_ and obj_:get_luaentity()
+			if ent then
 				obj_:set_detach()
+				-- Attention! Internal item API
+				if ent.enable_physics then
+					ent:enable_physics()
+				end
 			end
 		end
 
@@ -157,7 +154,8 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
 	end
 
 	local punch_interval = 1
-	if tool_capabilities and tool_capabilities.full_punch_interval then
+	-- Faulty tool registrations may cause the interval to be set to 0 !
+	if tool_capabilities and (tool_capabilities.full_punch_interval or 0) > 0 then
 		punch_interval = tool_capabilities.full_punch_interval
 	end
 	time_from_last_punch = math.min(time_from_last_punch or punch_interval, punch_interval)
@@ -180,11 +178,11 @@ function cart_entity:on_step(dtime)
 	end
 
 	local pos = self.object:get_pos()
-	local cart_dir = boost_cart:velocity_to_dir(vel)
-	local same_dir = vector.equals(cart_dir, self.old_dir)
+	local dir = boost_cart:velocity_to_dir(vel)
+	local dir_changed = not vector.equals(dir, self.old_dir)
 	local update = {}
 
-	if self.old_pos and not self.punched and same_dir then
+	if self.old_pos and not self.punched and not dir_changed then
 		local flo_pos = vector.round(pos)
 		local flo_old = vector.round(self.old_pos)
 		if vector.equals(flo_pos, flo_old) then
@@ -205,7 +203,7 @@ function cart_entity:on_step(dtime)
 	end
 
 	local stop_wiggle = false
-	if self.old_pos and same_dir then
+	if self.old_pos and not dir_changed then
 		-- Detection for "skipping" nodes (perhaps use average dtime?)
 		-- It's sophisticated enough to take the acceleration in account
 		local acc = self.object:get_acceleration()
@@ -220,7 +218,7 @@ function cart_entity:on_step(dtime)
 			-- No rail found: set to the expected position
 			pos = new_pos
 			update.pos = true
-			cart_dir = new_dir
+			dir = new_dir
 		end
 	elseif self.old_pos and self.old_dir.y ~= 1 and not self.punched then
 		-- Stop wiggle
@@ -230,20 +228,25 @@ function cart_entity:on_step(dtime)
 	-- dir:         New moving direction of the cart
 	-- switch_keys: Currently pressed L(1) or R(2) key,
 	--              used to ignore the key on the next rail node
-	local dir, switch_keys = boost_cart:get_rail_direction(
-		pos, cart_dir, ctrl, self.old_switch, self.railtype
+	local switch_keys
+	dir, switch_keys = boost_cart:get_rail_direction(
+		pos, dir, ctrl, self.old_switch, self.railtype
 	)
-	local dir_changed = not vector.equals(dir, self.old_dir)
+	dir_changed = not vector.equals(dir, self.old_dir)
 
 	local acc = 0
 	if stop_wiggle or vector.equals(dir, {x=0, y=0, z=0}) then
+		dir = vector.new(self.old_dir)
 		vel = {x=0, y=0, z=0}
 		local pos_r = vector.round(pos)
 		if not boost_cart:is_rail(pos_r, self.railtype)
 				and self.old_pos then
 			pos = self.old_pos
 		elseif not stop_wiggle then
+			-- End of rail: Smooth out.
 			pos = pos_r
+			dir_changed = false
+			dir.y = 0
 		else
 			pos.y = math.floor(pos.y + 0.5)
 		end
@@ -289,7 +292,7 @@ function cart_entity:on_step(dtime)
 				acc = speed_mod * 10
 			end
 		end
-		if acc == nil and boost_cart.mtg_compat then
+		if acc == nil and boost_cart.MTG_CARTS then
 			-- MTG Cart API adaption
 			local rail_node = minetest.get_node(vector.round(pos))
 			local railparam = carts.railparams[rail_node.name]
@@ -305,10 +308,16 @@ function cart_entity:on_step(dtime)
 				acc = -0.4
 			end
 		end
+		if ctrl and ctrl.sneak then
+			-- Descend when sneak is pressed
+			boost_cart:manage_attachment(player, nil)
+			player = nil
+			ctrl = nil
+		end
 
 		if acc then
 			-- Slow down or speed up, depending on Y direction
-			acc = acc + dir.y * -2.1
+			acc = acc + dir.y * -4
 		else
 			acc = 0
 		end
@@ -327,13 +336,8 @@ function cart_entity:on_step(dtime)
 	self.object:set_acceleration(vector.multiply(dir, acc))
 
 	self.old_pos = vector.round(pos)
-	local old_y_dir = self.old_dir.y
-	if not vector.equals(dir, {x=0, y=0, z=0}) and not stop_wiggle then
-		self.old_dir = dir
-	else
-		-- Cart stopped, set the animation to 0
-		self.old_dir.y = 0
-	end
+	local old_y_dir = self.old_dir.y -- For player tilt
+	self.old_dir = vector.new(dir)
 	self.old_switch = switch_keys
 
 	boost_cart:on_rail_step(self, self.old_pos, distance)
@@ -341,10 +345,13 @@ function cart_entity:on_step(dtime)
 	if self.punched then
 		-- Collect dropped items
 		for _, obj_ in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-			if not obj_:is_player() and
-					obj_:get_luaentity() and
-					not obj_:get_luaentity().physical_state and
-					obj_:get_luaentity().name == "__builtin:item" then
+			local ent = obj_:get_luaentity()
+			-- Attention! Physics must be disabled prior to attach
+			if ent and ent.name == "__builtin:item" and not obj_:get_attach() then
+				-- Check API to support 5.2.0 and older
+				if ent.disable_physics then
+					ent:disable_physics()
+				end
 
 				obj_:set_attach(self.object, "", {x=0, y=0, z=0}, {x=0, y=0, z=0})
 				self.attached_items[#self.attached_items + 1] = obj_
@@ -357,8 +364,6 @@ function cart_entity:on_step(dtime)
 	if not (update.vel or update.pos) then
 		return
 	end
-	-- Re-use "dir", localize self.old_dir
-	dir = self.old_dir
 
 	local yaw = 0
 	if dir.x < 0 then
@@ -380,18 +385,14 @@ function cart_entity:on_step(dtime)
 
 	-- Change player model rotation, depending on the Y direction
 	if player and dir.y ~= old_y_dir then
-		local feet = {x=0, y=0, z=0}
+		local feet = {x=0, y=-4, z=0}
 		local eye = {x=0, y=-4, z=0}
-		feet.y = boost_cart.old_player_model and 6 or -4
+
 		if dir.y ~= 0 then
 			-- TODO: Find a better way to calculate this
-			if boost_cart.old_player_model then
-				feet.y = feet.y + 2
-				feet.z = -dir.y * 6
-			else
 			feet.y = feet.y + 4
 			feet.z = -dir.y * 2
-			end
+
 			eye.z = -dir.y * 8
 		end
 		player:set_attach(self.object, "", feet,
@@ -414,7 +415,7 @@ end
 minetest.register_entity(":carts:cart", cart_entity)
 
 -- Register item to place the entity
-if not boost_cart.mtg_compat then
+if not boost_cart.MTG_CARTS then
 	minetest.register_craftitem(":carts:cart", {
 		description = "Cart (Sneak+Click to pick up)",
 		inventory_image = minetest.inventorycube(

depends.txt

@@ -1,4 +0,0 @@
-default
-mesecons?
-moreores?
-carts?

description.txt

@@ -1 +0,0 @@
-This mod offers improved minecarts and a few more rail types.

functions.lua

@@ -10,20 +10,26 @@ function boost_cart:manage_attachment(player, obj)
 	if not player then
 		return
 	end
-	local status = obj ~= nil
-	local player_name = player:get_player_name()
-	if default.player_attached[player_name] == status then
+	local do_attach = obj ~= nil
+
+	if obj and player:get_attach() == obj then
 		return
 	end
-	default.player_attached[player_name] = status
 
-	if status then
-		local y_pos = self.old_player_model and 6 or -4
-		if player:get_properties().visual == "upright_sprite" then
-			y_pos = -4
+	if boost_cart.PLAYER_API then
+		local player_name = player:get_player_name()
+		player_api.player_attached[player_name] = do_attach
 	end
-		player:set_attach(obj, "", {x=0, y=y_pos, z=0}, {x=0, y=0, z=0})
+
+	if do_attach then
+		player:set_attach(obj, "", {x=0, y=-4, z=0}, {x=0, y=0, z=0})
 		player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0})
+
+		if boost_cart.PLAYER_API then
+			-- player_api does not update the animation
+			-- when the player is attached, reset to default animation
+			player_api.set_animation(player, "stand")
+		end
 	else
 		player:set_detach()
 		player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})

init.lua

@@ -1,12 +1,14 @@
 
+if not minetest.features.object_use_texture_alpha then
+	error("[boost_cart] Your Minetest version is no longer supported."
+		.. " (Version < 5.0.0)")
+end
+
 boost_cart = {}
 boost_cart.modpath = minetest.get_modpath("boost_cart")
-
-
-if not minetest.settings then
-	error("[boost_cart] Your Minetest version is no longer supported."
-		.. " (Version <= 0.4.15)")
-end
+boost_cart.MESECONS = minetest.global_exists("mesecon")
+boost_cart.MTG_CARTS = minetest.global_exists("carts") and carts.pathfinder
+boost_cart.PLAYER_API = minetest.global_exists("player_api")
 
 local function getNum(setting)
 	return tonumber(minetest.settings:get(setting))
@@ -17,30 +19,20 @@ boost_cart.speed_max = getNum("boost_cart.speed_max") or 10
 -- Set to -1 to disable punching the cart from inside
 boost_cart.punch_speed_max = getNum("boost_cart.punch_speed_max") or 7
 -- Maximal distance for the path correction (for dtime peaks)
-boost_cart.path_distance_max = 3
+boost_cart.path_distance_max = 4
 
 
--- Support for non-default games
-if not default.player_attached then
-	default.player_attached = {}
-end
-
-minetest.after(0, function()
-	boost_cart.old_player_model = not minetest.global_exists("player_api")
-end)
-
 dofile(boost_cart.modpath.."/functions.lua")
 dofile(boost_cart.modpath.."/rails.lua")
 
-if minetest.global_exists("mesecon") then
+if boost_cart.MESECONS then
 	dofile(boost_cart.modpath.."/detector.lua")
 --else
 --	minetest.register_alias("carts:powerrail", "boost_cart:detectorrail")
 --	minetest.register_alias("carts:powerrail", "boost_cart:detectorrail_on")
 end
 
-boost_cart.mtg_compat = minetest.global_exists("carts") and carts.pathfinder
-if boost_cart.mtg_compat then
+if boost_cart.MTG_CARTS then
 	minetest.log("action", "[boost_cart] Overwriting definitions of similar carts mod")
 end
 dofile(boost_cart.modpath.."/cart_entity.lua")

mod.conf

@@ -1 +1,7 @@
 name = boost_cart
+description = """
+Boost Cart
+The mod that add a cart and new kinds of rails to your world.
+"""
+depends = default
+optional_depends = mesecons, moreores, carts, player_api

rails.lua

@@ -16,18 +16,21 @@ boost_cart:register_rail(":"..regular_rail_itemname, {
 })
 
 -- Moreores' copper rail
+local copperrail_registered = false
 if minetest.get_modpath("moreores") then
 	minetest.register_alias("carts:copperrail", "moreores:copper_rail")
 
-	if minetest.raillike_group then
+	local raildef = minetest.registered_nodes["moreores:copper_rail"]
+	if raildef and minetest.raillike_group then
 		-- Ensure that this rail uses the same connect_to_raillike
-		local new_groups = minetest.registered_nodes["moreores:copper_rail"].groups
-		new_groups.connect_to_raillike = minetest.raillike_group("rail")
+		raildef.groups.connect_to_raillike = minetest.raillike_group("rail")
 		minetest.override_item("moreores:copper_rail", {
-			groups = new_groups
+			groups = raildef.groups
 		})
+		copperrail_registered = true
 	end
-else
+end
+if not copperrail_registered then
 	boost_cart:register_rail(":carts:copperrail", {
 		description = "Copper rail",
 		tiles = {
@@ -72,15 +75,6 @@ boost_cart:register_rail(":carts:powerrail", {
 	},
 })
 
-minetest.register_craft({
-	output = "carts:powerrail 6",
-	recipe = {
-		{"default:steel_ingot", "default:mese_crystal_fragment", "default:steel_ingot"},
-		{"default:steel_ingot", "group:stick", "default:steel_ingot"},
-		{"default:steel_ingot", "default:mese_crystal_fragment", "default:steel_ingot"},
-	}
-})
-
 -- Brake rail
 boost_cart:register_rail(":carts:brakerail", {
 	description = "Brake rail",
@@ -106,15 +100,6 @@ boost_cart:register_rail(":carts:brakerail", {
 	},
 })
 
-minetest.register_craft({
-	output = "carts:brakerail 6",
-	recipe = {
-		{"default:steel_ingot", "default:coal_lump", "default:steel_ingot"},
-		{"default:steel_ingot", "group:stick", "default:steel_ingot"},
-		{"default:steel_ingot", "default:coal_lump", "default:steel_ingot"},
-	}
-})
-
 boost_cart:register_rail("boost_cart:startstoprail", {
 	description = "Start-stop rail",
 	tiles = {