From 961d6779b5d6c2065b47e3f3e7b14c80e6133ebd Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sun, 13 Aug 2023 11:21:24 +0100
Subject: [PATCH] code tidy

---
 functions.lua |  4 +++-
 igor.lua      |  7 ++++---
 init.lua      | 19 +++++--------------
 mod.conf      |  5 +++--
 npc.lua       |  9 +++++----
 trader.lua    |  7 ++++---
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/functions.lua b/functions.lua
index 47661be..2c6cb10 100644
--- a/functions.lua
+++ b/functions.lua
@@ -1,4 +1,6 @@
-local S = mobs_npc.S
+-- Translation support
+local S = minetest.get_translator("mobs_npc")
+
 local mcl = minetest.get_modpath("mcl_core") ~= nil
 local def = minetest.get_modpath("default") ~= nil
 
diff --git a/igor.lua b/igor.lua
index e218d1c..b6c3dd3 100644
--- a/igor.lua
+++ b/igor.lua
@@ -1,5 +1,6 @@
+-- Translation support
+local S = minetest.get_translator("mobs_npc")
 
-local S = mobs_npc.S
 local mcl = minetest.get_modpath("mcl_core") ~= nil
 
 
@@ -99,8 +100,8 @@ mobs:register_mob("mobs_npc:igor", {
 		local name = clicker:get_player_name()
 
 		-- right clicking with gold lump drops random item from list
-		if 	mobs_npc.drop_trade(self, clicker,  mcl and "mcl_raw_ores:raw_gold" or "default:gold_lump",
-				self.npc_drops or mobs_npc.igor_drops) then
+		if 	mobs_npc.drop_trade(self, clicker,  mcl and "mcl_raw_ores:raw_gold"
+				or "default:gold_lump", self.npc_drops or mobs_npc.igor_drops) then
 			return
 		end
 
diff --git a/init.lua b/init.lua
index 1445354..aa7b6c9 100644
--- a/init.lua
+++ b/init.lua
@@ -1,20 +1,11 @@
 
 local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
--- Check for translation method
-local S
-if minetest.get_translator then
-	S = minetest.get_translator("mobs_npc") -- 5.x translation function
-else -- boilerplate function
-	S = function(str, ...)
-		local args = {...}
-		return str:gsub("@%d+", function(match)
-			return args[tonumber(match:sub(2))]
-		end)
-	end
-end
+-- Translation support
+local S = minetest.get_translator("mobs_npc")
 
-mobs_npc = {S = S}
+-- Global
+mobs_npc = {}
 
 
 -- Check for custom mob spawn file
@@ -48,4 +39,4 @@ if minetest.get_modpath("lucky_block") then
 end
 
 
-print ("[MOD] Mobs Redo NPCs loaded")
+print ("[MOD] Mobs NPC loaded")
diff --git a/mod.conf b/mod.conf
index af15a2e..6bf73db 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,6 +1,7 @@
+title = Mobs NPC
 name = mobs_npc
+description = Add a simple NPC, Igor and Trader into your world.
 depends = mobs
 optional_depends = default, lucky_block, simple_dialogs, screwdriver, mcl_core
-description = Adds simple NPC and Trader.
 author = TenPlus1
-title = Mobs NPC
+min_minetest_version = 5.0
diff --git a/npc.lua b/npc.lua
index 528af29..aa849a2 100644
--- a/npc.lua
+++ b/npc.lua
@@ -1,6 +1,7 @@
-local S = mobs_npc.S
-local mcl = minetest.get_modpath("mcl_core") ~= nil
+-- Translation support
+local S = minetest.get_translator("mobs_npc")
 
+local mcl = minetest.get_modpath("mcl_core") ~= nil
 
 -- Npc by TenPlus1
 
@@ -103,8 +104,8 @@ mobs:register_mob("mobs_npc:npc", {
 		local name = clicker:get_player_name()
 
 		-- right clicking with gold lump drops random item from list
-		if 	mobs_npc.drop_trade(self, clicker, mcl and "mcl_raw_ores:raw_gold" or "default:gold_lump",
-				self.npc_drops or mobs_npc.npc_drops) then
+		if 	mobs_npc.drop_trade(self, clicker, mcl and "mcl_raw_ores:raw_gold"
+				or "default:gold_lump", self.npc_drops or mobs_npc.npc_drops) then
 			return
 		end
 
diff --git a/trader.lua b/trader.lua
index 2b63b5d..12b9f18 100644
--- a/trader.lua
+++ b/trader.lua
@@ -1,15 +1,16 @@
 
-local S = mobs_npc.S
+-- Translation support
+local S = minetest.get_translator("mobs_npc")
+
 local mcl = minetest.get_modpath("mcl_core") ~= nil
 
-
 -- define table containing names for use and shop items for sale
 
 mobs.human = {
 
 	names = {
 		"Bob", "Duncan", "Bill", "Tom", "James", "Ian", "Lenny",
-		"Dylan", "Ethan", "Sam"
+		"Dylan", "Ethan", "Sam", "Aubrey"
 	},
 
 	items = {