Physics: Refactoring: extract Game/lord_physics. Closes #1666

mods/lord/Core/physics/mod.conf

@@ -1,2 +1,2 @@
 name = physics
-depends = dev_helpers, builtin, lord_equipment
+depends = dev_helpers, builtin

mods/lord/Core/physics/src/physics.lua

@@ -1,17 +1,10 @@
-local ipairs
-    = ipairs
-
 local PlayerPhysics = require('physics.PlayerPhysics')
 local Event         = require('physics.Event')
 
 
---- @type table<number,string>|string[]
-local PHYSICS_TYPES = { "jump", "speed", "gravity" }
-
 --- @type physics.PlayerPhysics[]|table<string,physics.PlayerPhysics>
 local player_physics = {}
 
-
 physics = {} -- luacheck: ignore unused global variable physics
 
 local function register_api()
@@ -37,43 +30,12 @@ local function register_api()
 	}
 end
 
---- @param player        Player
-local function collect_physics(player)
-	local physics = { speed = 1, gravity = 1, jump = 1 }
-	for _, stack in equipment.for_player(player):items(equipment.Kind.ARMOR) do
-		if stack:get_count() == 1 then
-			local item_groups = stack:get_definition().groups
-			for _, type in ipairs(PHYSICS_TYPES) do
-				local value = item_groups["physics_" .. type]
-				if value then
-					physics[type] = (physics[type] or 1) + value
-				end
-			end
-		end
-	end
-
-	return physics
-end
-
---- @param player Player
-local function set_player_physics(player)
-	local physics_o = collect_physics(player)
-
-	physics.for_player(player):set(physics_o)
-end
-
 
 return {
 	--- @param mod minetest.Mod
 	init = function(mod)
 		register_api()
 
-		equipment.on_load(equipment.Kind.ARMOR, function(player)
-			set_player_physics(player)
-		end)
-		equipment.on_change(equipment.Kind.ARMOR, function(player)
-			set_player_physics(player)
-		end)
 		minetest.register_on_leaveplayer(function(player)
 			player_physics[player:get_player_name()] = nil
 		end)

mods/lord/Game/lord_physics/init.lua

@@ -0,0 +1,5 @@
+
+
+minetest.mod(function(mod)
+	require("lord_physics").init(mod)
+end)

mods/lord/Game/lord_physics/mod.conf

@@ -0,0 +1,2 @@
+name = lord_physics
+depends = builtin, physics, lord_equipment

mods/lord/Game/lord_physics/src/lord_physics.lua

@@ -0,0 +1,42 @@
+local ipairs
+    = ipairs
+
+--- @type table<number,string>|string[]
+local PHYSICS_TYPES = { "jump", "speed", "gravity" }
+
+--- @param player        Player
+local function collect_physics_from_armor(player)
+	local physics = { speed = 1, gravity = 1, jump = 1 }
+	for _, stack in equipment.for_player(player):items(equipment.Kind.ARMOR) do
+		if stack:get_count() == 1 then
+			local item_groups = stack:get_definition().groups
+			for _, type in ipairs(PHYSICS_TYPES) do
+				local value = item_groups["physics_" .. type]
+				if value then
+					physics[type] = (physics[type] or 1) + value
+				end
+			end
+		end
+	end
+
+	return physics
+end
+
+--- @param player Player
+local function set_player_physics(player)
+	local physics_o = collect_physics_from_armor(player)
+
+	physics.for_player(player):set(physics_o)
+end
+
+
+return {
+	init = function()
+		equipment.on_load(equipment.Kind.ARMOR, function(player)
+			set_player_physics(player)
+		end)
+		equipment.on_change(equipment.Kind.ARMOR, function(player)
+			set_player_physics(player)
+		end)
+	end,
+}