From 7ae5bda5ab0658b6cd11b289bdfa44acf9e61ba7 Mon Sep 17 00:00:00 2001
From: Athozus <athozus@gmail.com>
Date: Thu, 20 Jul 2023 00:33:59 +0200
Subject: [PATCH] Quick restructuration of files (create sub-init.lua)

---
 init.lua                  | 24 +++---------------------
 ui/{mail.lua => init.lua} | 20 ++++++++++++++++++++
 util/init.lua             |  6 ++++++
 3 files changed, 29 insertions(+), 21 deletions(-)
 rename ui/{mail.lua => init.lua} (50%)
 create mode 100644 util/init.lua

diff --git a/init.lua b/init.lua
index 4df95a0..dadf16c 100644
--- a/init.lua
+++ b/init.lua
@@ -60,10 +60,6 @@ end
 
 -- sub files
 local MP = minetest.get_modpath(minetest.get_current_modname())
-dofile(MP .. "/util/normalize.lua")
-dofile(MP .. "/util/contact.lua")
-dofile(MP .. "/util/uuid.lua")
-dofile(MP .. "/util/time_ago.lua")
 dofile(MP .. "/chatcommands.lua")
 dofile(MP .. "/migrate.lua")
 dofile(MP .. "/hud.lua")
@@ -71,23 +67,9 @@ dofile(MP .. "/storage.lua")
 dofile(MP .. "/api.lua")
 dofile(MP .. "/gui.lua")
 dofile(MP .. "/onjoin.lua")
-dofile(MP .. "/ui/mail.lua")
-dofile(MP .. "/ui/inbox.lua")
-dofile(MP .. "/ui/outbox.lua")
-dofile(MP .. "/ui/drafts.lua")
-dofile(MP .. "/ui/trash.lua")
-dofile(MP .. "/ui/message.lua")
-dofile(MP .. "/ui/receivers.lua")
-dofile(MP .. "/ui/events.lua")
-dofile(MP .. "/ui/contacts.lua")
-dofile(MP .. "/ui/edit_contact.lua")
-dofile(MP .. "/ui/select_contact.lua")
-dofile(MP .. "/ui/maillists.lua")
-dofile(MP .. "/ui/edit_maillists.lua")
-dofile(MP .. "/ui/compose.lua")
-dofile(MP .. "/ui/options.lua")
-dofile(MP .. "/ui/settings.lua")
-dofile(MP .. "/ui/about.lua")
+-- sub directories
+dofile(MP .. "/ui/init.lua")
+dofile(MP .. "/util/init.lua")
 
 -- migrate storage
 mail.migrate()
diff --git a/ui/mail.lua b/ui/init.lua
similarity index 50%
rename from ui/mail.lua
rename to ui/init.lua
index 9bf114f..5e6443c 100644
--- a/ui/mail.lua
+++ b/ui/init.lua
@@ -1,3 +1,23 @@
+-- sub files
+local MP = minetest.get_modpath(minetest.get_current_modname())
+
+dofile(MP .. "/ui/inbox.lua")
+dofile(MP .. "/ui/outbox.lua")
+dofile(MP .. "/ui/drafts.lua")
+dofile(MP .. "/ui/trash.lua")
+dofile(MP .. "/ui/message.lua")
+dofile(MP .. "/ui/receivers.lua")
+dofile(MP .. "/ui/events.lua")
+dofile(MP .. "/ui/contacts.lua")
+dofile(MP .. "/ui/edit_contact.lua")
+dofile(MP .. "/ui/select_contact.lua")
+dofile(MP .. "/ui/maillists.lua")
+dofile(MP .. "/ui/edit_maillists.lua")
+dofile(MP .. "/ui/compose.lua")
+dofile(MP .. "/ui/options.lua")
+dofile(MP .. "/ui/settings.lua")
+dofile(MP .. "/ui/about.lua")
+
 -- helper function for tabbed overview
 
 function mail.show_mail_menu(playername, sortfield, sortdirection, filter)
diff --git a/util/init.lua b/util/init.lua
new file mode 100644
index 0000000..fed7db7
--- /dev/null
+++ b/util/init.lua
@@ -0,0 +1,6 @@
+-- sub files
+local MP = minetest.get_modpath(minetest.get_current_modname())
+dofile(MP .. "/util/normalize.lua")
+dofile(MP .. "/util/contact.lua")
+dofile(MP .. "/util/uuid.lua")
+dofile(MP .. "/util/time_ago.lua")