From 42f92694b5f29ce654111de73f3332fbda0a93eb Mon Sep 17 00:00:00 2001
From: grorp <grorp@posteo.de>
Date: Wed, 1 Jan 2025 17:12:28 +0100
Subject: [PATCH] Move builtin/mainmenu/settings to builtin/common/settings,
 create builtin/pause_menu

---
 builtin/{mainmenu => common}/settings/components.lua      | 0
 .../settings/dlg_change_mapgen_flags.lua                  | 0
 builtin/{mainmenu => common}/settings/dlg_settings.lua    | 7 +++----
 .../settings/generate_from_settingtypes.lua               | 0
 builtin/{mainmenu => common}/settings/init.lua            | 8 ++++----
 builtin/{mainmenu => common}/settings/settingtypes.lua    | 0
 .../{mainmenu => common}/settings/shadows_component.lua   | 0
 builtin/init.lua                                          | 2 +-
 builtin/mainmenu/init.lua                                 | 2 +-
 builtin/pause_menu/init.lua                               | 0
 10 files changed, 9 insertions(+), 10 deletions(-)
 rename builtin/{mainmenu => common}/settings/components.lua (100%)
 rename builtin/{mainmenu => common}/settings/dlg_change_mapgen_flags.lua (100%)
 rename builtin/{mainmenu => common}/settings/dlg_settings.lua (98%)
 rename builtin/{mainmenu => common}/settings/generate_from_settingtypes.lua (100%)
 rename builtin/{mainmenu => common}/settings/init.lua (83%)
 rename builtin/{mainmenu => common}/settings/settingtypes.lua (100%)
 rename builtin/{mainmenu => common}/settings/shadows_component.lua (100%)
 create mode 100644 builtin/pause_menu/init.lua

diff --git a/builtin/mainmenu/settings/components.lua b/builtin/common/settings/components.lua
similarity index 100%
rename from builtin/mainmenu/settings/components.lua
rename to builtin/common/settings/components.lua
diff --git a/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua b/builtin/common/settings/dlg_change_mapgen_flags.lua
similarity index 100%
rename from builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
rename to builtin/common/settings/dlg_change_mapgen_flags.lua
diff --git a/builtin/mainmenu/settings/dlg_settings.lua b/builtin/common/settings/dlg_settings.lua
similarity index 98%
rename from builtin/mainmenu/settings/dlg_settings.lua
rename to builtin/common/settings/dlg_settings.lua
index f1861879a..1acb15425 100644
--- a/builtin/mainmenu/settings/dlg_settings.lua
+++ b/builtin/common/settings/dlg_settings.lua
@@ -16,11 +16,10 @@
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-local component_funcs =  dofile(core.get_mainmenu_path() .. DIR_DELIM ..
-		"settings" .. DIR_DELIM .. "components.lua")
+local path = core.get_builtin_path() .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM
 
-local shadows_component =  dofile(core.get_mainmenu_path() .. DIR_DELIM ..
-		"settings" .. DIR_DELIM .. "shadows_component.lua")
+local component_funcs =  dofile(path .. "components.lua")
+local shadows_component =  dofile(path .. "shadows_component.lua")
 
 local loaded = false
 local full_settings
diff --git a/builtin/mainmenu/settings/generate_from_settingtypes.lua b/builtin/common/settings/generate_from_settingtypes.lua
similarity index 100%
rename from builtin/mainmenu/settings/generate_from_settingtypes.lua
rename to builtin/common/settings/generate_from_settingtypes.lua
diff --git a/builtin/mainmenu/settings/init.lua b/builtin/common/settings/init.lua
similarity index 83%
rename from builtin/mainmenu/settings/init.lua
rename to builtin/common/settings/init.lua
index c8615ba34..d475e0c96 100644
--- a/builtin/mainmenu/settings/init.lua
+++ b/builtin/common/settings/init.lua
@@ -15,11 +15,11 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-local path = core.get_mainmenu_path() .. DIR_DELIM .. "settings"
+local path = core.get_builtin_path() .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM
 
-dofile(path .. DIR_DELIM .. "settingtypes.lua")
-dofile(path .. DIR_DELIM .. "dlg_change_mapgen_flags.lua")
-dofile(path .. DIR_DELIM .. "dlg_settings.lua")
+dofile(path .. "settingtypes.lua")
+dofile(path .. "dlg_change_mapgen_flags.lua")
+dofile(path .. "dlg_settings.lua")
 
 -- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'.
 -- For RUN_IN_PLACE the generated files may appear in the 'bin' folder.
diff --git a/builtin/mainmenu/settings/settingtypes.lua b/builtin/common/settings/settingtypes.lua
similarity index 100%
rename from builtin/mainmenu/settings/settingtypes.lua
rename to builtin/common/settings/settingtypes.lua
diff --git a/builtin/mainmenu/settings/shadows_component.lua b/builtin/common/settings/shadows_component.lua
similarity index 100%
rename from builtin/mainmenu/settings/shadows_component.lua
rename to builtin/common/settings/shadows_component.lua
diff --git a/builtin/init.lua b/builtin/init.lua
index 828dc98f8..59d1558fc 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -79,7 +79,7 @@ elseif INIT == "client" then
 elseif INIT == "emerge" then
 	dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua")
 elseif INIT == "pause_menu" then
-	print("WOW WOW WOW HELLO FROM PAUSE MENU ENV")
+	dofile(scriptdir .. "pause_menu" .. DIR_DELIM .. "init.lua")
 else
 	error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 4e1c201cd..67d441520 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -47,7 +47,7 @@ dofile(menupath .. DIR_DELIM .. "game_theme.lua")
 dofile(menupath .. DIR_DELIM .. "content" .. DIR_DELIM .. "init.lua")
 
 dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
-dofile(menupath .. DIR_DELIM .. "settings" .. DIR_DELIM .. "init.lua")
+dofile(basepath .. "common" .. DIR_DELIM .. "settings" .. DIR_DELIM .. "init.lua")
 dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
 dofile(menupath .. DIR_DELIM .. "dlg_delete_content.lua")
 dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
diff --git a/builtin/pause_menu/init.lua b/builtin/pause_menu/init.lua
new file mode 100644
index 000000000..e69de29bb