From 3214adfdb9db8d5107ed3459d7d3526ecfc1de94 Mon Sep 17 00:00:00 2001
From: Zughy <4279489-marco_a@users.noreply.gitlab.com>
Date: Wed, 3 Mar 2021 21:22:08 +0100
Subject: [PATCH] pulizia

---
 init.lua               |  1 +
 src/api.lua            | 61 ++++++++++++++++++------------------------
 src/chat.lua           | 13 +++++++++
 src/commands.lua       | 13 +++++----
 src/player_manager.lua |  9 -------
 5 files changed, 46 insertions(+), 51 deletions(-)
 create mode 100644 src/chat.lua

diff --git a/init.lua b/init.lua
index 31fdbec..9b15b4b 100644
--- a/init.lua
+++ b/init.lua
@@ -3,6 +3,7 @@ local modpath = minetest.get_modpath("hub_manager")
 local srcpath = modpath .. "/src/"
 
 dofile(srcpath .. "/api.lua")
+dofile(srcpath .. "/chat.lua")
 dofile(srcpath .. "/chatcmdbuilder.lua")
 dofile(srcpath .. "/commands.lua")
 dofile(srcpath .. "/load_config.lua")
diff --git a/src/api.lua b/src/api.lua
index 8cb110f..88fb062 100644
--- a/src/api.lua
+++ b/src/api.lua
@@ -2,41 +2,6 @@ hub_manager = {}
 
 
 
-function hub_manager.set_items(player)
-
-  local inv = player:get_inventory()
-
-  local hotbar_items = {
-    nil,
-    nil,
-    nil,
-    nil,
-    nil,
-    nil,
-    nil,
-    "hub_manager:settings"
-  }
-
-  local additional_items = hub_manager.get_additional_items()
-
-  -- eventuali oggetti aggiuntivi
-  for i = 1, 7 do
-    hotbar_items[i] = additional_items[i]
-  end
-
-  inv:set_list("main", hotbar_items)
-  inv:set_list("craft", {})
-
-end
-
-
-
-function hub_manager.print_error(name, msg)
-  minetest.chat_send_player(name, minetest.colorize("#e6482e", msg))
-end
-
-
-
 function hub_manager.get_prefix(name)
   local meta = minetest.get_player_by_name(name):get_meta()
   local prefix = meta:get_string("hub_manager:prefix")
@@ -45,3 +10,29 @@ function hub_manager.get_prefix(name)
   if prefix == "" then return "" end
   return minetest.colorize(color, prefix) .. " "
 end
+
+
+
+function hub_manager.set_items(player)
+
+  local inv = player:get_inventory()
+  local hotbar_items = {
+    nil,
+    nil,
+    nil,
+    nil,
+    nil,
+    nil,
+    nil,
+    "hub_manager:settings"
+  }
+  local additional_items = hub_manager.get_additional_items()
+
+  -- eventuali oggetti aggiuntivi
+  for i = 1, 7 do
+    hotbar_items[i] = additional_items[i]
+  end
+
+  inv:set_list("main", hotbar_items)
+  inv:set_list("craft", {})
+end
diff --git a/src/chat.lua b/src/chat.lua
new file mode 100644
index 0000000..2b3d32a
--- /dev/null
+++ b/src/chat.lua
@@ -0,0 +1,13 @@
+function minetest.format_chat_message(name, msg)
+  if arena_lib.is_player_in_arena(name) then
+    return format_chat_message(name, msg)
+  else
+    return hub_manager.get_prefix(name) .. format_chat_message(name, msg)
+  end
+end
+
+
+
+function hub_manager.print_error(name, msg)
+  minetest.chat_send_player(name, minetest.colorize("#e6482e", msg))
+end
diff --git a/src/commands.lua b/src/commands.lua
index f13b03b..84aeac8 100644
--- a/src/commands.lua
+++ b/src/commands.lua
@@ -3,7 +3,7 @@ minetest.unregister_chatcommand("pulverize")
 
 
 
-minetest.register_privilege("hub_admin", {  
+minetest.register_privilege("hub_admin", {
     description = S("It allows you to use /hubadmin")
 })
 
@@ -15,10 +15,10 @@ ChatCmdBuilder.new("hubadmin", function(cmd)
         local player = minetest.get_player_by_name(name)
 
         if prefix == "@remove" then prefix = "" end
+
         if not player then
-            hub_manager.print_error(sender, S("[!] @1 is not online", name))
-            return
-        end
+          hub_manager.print_error(sender, S("[!] @1 is not online", name))
+          return end
 
         local meta = player:get_meta()
 
@@ -32,9 +32,8 @@ ChatCmdBuilder.new("hubadmin", function(cmd)
         local player = minetest.get_player_by_name(name)
 
         if not player then
-            hub_manager.print_error(sender, S("[!] @1 is not online", name))
-            return
-        end
+          hub_manager.print_error(sender, S("[!] @1 is not online", name))
+          return end
 
         local meta = player:get_meta()
 
diff --git a/src/player_manager.lua b/src/player_manager.lua
index 4ec4a71..a533ac8 100644
--- a/src/player_manager.lua
+++ b/src/player_manager.lua
@@ -38,12 +38,3 @@ minetest.register_on_respawnplayer(function(player)
   return true
 
 end)
-
-
-
-function minetest.format_chat_message(name, msg)
-
-  if arena_lib.is_player_in_arena(name) then return format_chat_message(name, msg) end
-  return hub_manager.get_prefix(name) .. format_chat_message(name, msg)
-
-end