From c97727082c3b1e3361774a4a5c250cf63280112a Mon Sep 17 00:00:00 2001
From: Juraj Vajda <juraj.vajda@rituals.com>
Date: Sun, 10 Dec 2017 18:12:39 -0500
Subject: [PATCH] code cleanup and add scale for pickaxe - disabled by default

---
 external_cmd.lua |  2 +-
 item_drop.lua    |  2 +-
 pickaxe.lua      | 16 ++++++++++------
 spawn.lua        |  2 +-
 swords.lua       | 14 --------------
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/external_cmd.lua b/external_cmd.lua
index 8cc1b78..df8806c 100644
--- a/external_cmd.lua
+++ b/external_cmd.lua
@@ -3,7 +3,7 @@
 -- License: LGPL
 
 local admin = "SERVER"
--- local admin = minetest.setting_get("name")
+-- local admin = minetest.settings:get("name")
 
 -- if admin == nil then
 -- 	admin = "SERVER"
diff --git a/item_drop.lua b/item_drop.lua
index d5a10fa..e2a69b0 100644
--- a/item_drop.lua
+++ b/item_drop.lua
@@ -7,7 +7,7 @@ local delay = 0
 
 minetest.register_globalstep(function(dtime)
 	for _,player in ipairs(minetest.get_connected_players()) do
-		if player:get_player_control().sneak and (player:get_hp() > 0 or not minetest.setting_getbool("enable_damage")) then
+		if player:get_player_control().sneak and (player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage")) then
 
 			-- [Shift + E + Q] single drop item
 			-- autopickup after delay
diff --git a/pickaxe.lua b/pickaxe.lua
index fd8752b..458edbd 100644
--- a/pickaxe.lua
+++ b/pickaxe.lua
@@ -34,16 +34,20 @@ if (minetest.get_modpath("moreores")) then
 	})
 end
 
--- PICK-AXE SUPER DIAMONDS
-if (minetest.get_modpath("diamonds")) then
-	minetest.override_item("diamonds:pick", {
-		-- inventory_image="enhancements_diamond_sword.png",
+-- OBSIDIANMESE
+if (minetest.get_modpath("obsidianmese")) then
+	minetest.override_item("obsidianmese:pick", {
 		wield_scale = {x=1.5, y=2, z=1},
 	})
 
-	minetest.override_item("diamonds:steelpick", {
-		-- inventory_image="enhancements_diamond_steel_sword.png",
+	minetest.override_item("obsidianmese:pick_engraved", {
 		wield_scale = {x=1.5, y=2, z=1},
 	})
 end
 
+-- MOBS
+if (minetest.get_modpath("mobs_monsters")) then
+	minetest.override_item("mobs_monsters:pick_lava", {
+		wield_scale = {x=1.5, y=2, z=1},
+	})
+end
diff --git a/spawn.lua b/spawn.lua
index 4c07bf8..9cd6ae4 100644
--- a/spawn.lua
+++ b/spawn.lua
@@ -36,7 +36,7 @@ minetest.register_chatcommand("setspawn", {
 		local z = pos.z
 		local pos_string = x..","..y..","..z
 		local pos_string_2 = "Setting spawn point to ("..x..", "..y..", "..z..")"
-		minetest.setting_set("static_spawnpoint",pos_string)
+		minetest.settings:set("static_spawnpoint",pos_string)
 		spawn_spawnpos = pos
 		minetest.setting_save()
 		return true, pos_string_2
diff --git a/swords.lua b/swords.lua
index 4f0bb87..d015a06 100644
--- a/swords.lua
+++ b/swords.lua
@@ -48,17 +48,3 @@ if (minetest.get_modpath("obsidianmese")) then
 	-- 	wield_scale = {x=2.0, y=2.5, z=1.5},
 	-- })
 end
-
--- SWORDS SUPER DIAMONDS
-if (minetest.get_modpath("diamonds")) then
-	minetest.override_item("diamonds:sword", {
-		-- inventory_image="enhancements_diamond_sword.png",
-		wield_scale = {x=1.5, y=2, z=1},
-	})
-
-	minetest.override_item("diamonds:steelsword", {
-		-- inventory_image="enhancements_diamond_steel_sword.png",
-		wield_scale = {x=1.5, y=2, z=1},
-	})
-end
-