From 3a7fffc5875add144ebc4d04b8d23741afb8357d Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy@disroot.org>
Date: Sat, 8 Oct 2022 17:46:03 +0200
Subject: [PATCH] DevTest: Move more logging to log mod

---
 games/devtest/mods/experimental/init.lua       |   7 -------
 games/devtest/mods/log/init.lua                |  17 +++++++++++++++--
 .../mods/{experimental => testtools}/items.lua |   0
 .../textures/testtools_privatizer.png}         | Bin
 4 files changed, 15 insertions(+), 9 deletions(-)
 rename games/devtest/mods/{experimental => testtools}/items.lua (100%)
 rename games/devtest/mods/{experimental/textures/experimental_tester_tool_1.png => testtools/textures/testtools_privatizer.png} (100%)

diff --git a/games/devtest/mods/experimental/init.lua b/games/devtest/mods/experimental/init.lua
index b292f792e..20350b093 100644
--- a/games/devtest/mods/experimental/init.lua
+++ b/games/devtest/mods/experimental/init.lua
@@ -13,11 +13,4 @@ function experimental.print_to_everything(msg)
 	minetest.chat_send_all(msg)
 end
 
-minetest.log("info", "[experimental] modname="..dump(minetest.get_current_modname()))
-minetest.log("info", "[experimental] modpath="..dump(minetest.get_modpath("experimental")))
-minetest.log("info", "[experimental] worldpath="..dump(minetest.get_worldpath()))
 
-
-minetest.register_on_mods_loaded(function()
-	minetest.log("action", "[experimental] on_mods_loaded()")
-end)
diff --git a/games/devtest/mods/log/init.lua b/games/devtest/mods/log/init.lua
index 4102bca36..c1c052ddc 100644
--- a/games/devtest/mods/log/init.lua
+++ b/games/devtest/mods/log/init.lua
@@ -1,3 +1,16 @@
-minetest.register_on_chatcommand(function(name, command, params)
-	minetest.log("action", "[devtest] Caught command '"..command.."', issued by '"..name.."'. Parameters: '"..params.."'")
+local modname = minetest.get_current_modname()
+local prefix = "["..modname.."] "
+
+-- Startup info
+minetest.log("action", prefix.."modname="..dump(modname))
+minetest.log("action", prefix.."modpath="..dump(minetest.get_modpath(modname)))
+minetest.log("action", prefix.."worldpath="..dump(minetest.get_worldpath()))
+
+-- Callback info
+minetest.register_on_mods_loaded(function()
+	minetest.log("action", prefix.."Callback: on_mods_loaded()")
+end)
+
+minetest.register_on_chatcommand(function(name, command, params)
+	minetest.log("action", prefix.."Caught command '"..command.."', issued by '"..name.."'. Parameters: '"..params.."'")
 end)
diff --git a/games/devtest/mods/experimental/items.lua b/games/devtest/mods/testtools/items.lua
similarity index 100%
rename from games/devtest/mods/experimental/items.lua
rename to games/devtest/mods/testtools/items.lua
diff --git a/games/devtest/mods/experimental/textures/experimental_tester_tool_1.png b/games/devtest/mods/testtools/textures/testtools_privatizer.png
similarity index 100%
rename from games/devtest/mods/experimental/textures/experimental_tester_tool_1.png
rename to games/devtest/mods/testtools/textures/testtools_privatizer.png