From e4bf804f75b4736ef24aa88c7b35a70a7cd124b8 Mon Sep 17 00:00:00 2001
From: Jordan Snelling <jordach.snelling@gmail.com>
Date: Thu, 15 May 2014 21:48:45 +0100
Subject: [PATCH] fixes to hammer code and stuff

---
 mods/deco/init.lua        | 14 ++++++++++++
 mods/gs_tools/init.lua    | 47 ++++++++++++++++++++++++++++-----------
 mods/gs_tools/sledges.lua |  3 ++-
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/mods/deco/init.lua b/mods/deco/init.lua
index 210619a..5923d5e 100644
--- a/mods/deco/init.lua
+++ b/mods/deco/init.lua
@@ -836,6 +836,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'deco:stone_tile 4',
+	recipe = {
+		{'deco:cobble', 'deco:cobble'},
+		{'deco:cobble', 'deco:cobble'},
+	}
+})
+
 -- stone brick
 
 minetest.register_node("deco:stone_brick", {
@@ -926,6 +934,12 @@ minetest.register_craft({
 	output = 'mapgen:stone'
 })
 
+minetest.register_craft({
+	type = "cooking",
+	recipe = 'deco:cobble',
+	output = 'mapgen:stone'
+})
+
 minetest.register_craft({
 	type = "cooking",
 	recipe = 'mapgen:crust_cobble',
diff --git a/mods/gs_tools/init.lua b/mods/gs_tools/init.lua
index 87721f4..c6cc916 100644
--- a/mods/gs_tools/init.lua
+++ b/mods/gs_tools/init.lua
@@ -31,22 +31,43 @@ dofile(modpath.."/sledges.lua")
 
 -- break a node and give the default drops
 
-function gs_tools.drop_node(pos, digger, wielded, rank)
+function gs_tools.drop_node(pos, digger, wielded, rank, group)
+	tool_name = wielded:get_name()
+	
+	if tool_name:find("hammer", 1, true) then
 	-- check if we can drop this node
-	local node = minetest.get_node(pos)
-	local def = ItemStack({name=node.name}):get_definition()
+		local node = minetest.get_node(pos)
+		local def = ItemStack({name=node.name}):get_definition()
 
-	if not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then return end
-	if minetest.is_protected(pos, digger:get_player_name()) then return end
+		if not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then return end
+		if minetest.is_protected(pos, digger:get_player_name()) then return end
 
-	local level = minetest.get_item_group(node.name, "level")
-	if rank >= level then
+		local level = minetest.get_item_group(node.name, "level")
+		if rank >= level then
 
-		-- note that get_node_drops() is not future-safe
-		-- though no alternative currently exists
-		local drops = minetest.get_node_drops(node.name, wielded:get_name())
-		minetest.handle_node_drops(pos, drops, digger)
-		minetest.remove_node(pos)
+			-- note that get_node_drops() is not future-safe
+			-- though no alternative currently exists
+			local drops = minetest.get_node_drops(node.name, wielded:get_name())
+			minetest.handle_node_drops(pos, drops, digger)
+			if minetest.get_item_group(minetest.get_node(pos).name, "cracky") > 0 then minetest.remove_node(pos) end
+		end
+	elseif tool_name:find("dirt_mover", 1, true) then
+	-- check if we can drop this node
+		local node = minetest.get_node(pos)
+		local def = ItemStack({name=node.name}):get_definition()
+
+		if not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then return end
+		if minetest.is_protected(pos, digger:get_player_name()) then return end
+
+		local level = minetest.get_item_group(node.name, "level")
+		if rank >= level then
+
+			-- note that get_node_drops() is not future-safe
+			-- though no alternative currently exists
+			local drops = minetest.get_node_drops(node.name, wielded:get_name())
+			minetest.handle_node_drops(pos, drops, digger)
+			if minetest.get_item_group(minetest.get_node(pos).name, "crumbly") > 0 then minetest.remove_node(pos) end
+		end
 	end
 end
 
@@ -106,7 +127,7 @@ function gs_tools.get_chopped(pos, group, digger)
 	local pos2 = p
 	for x1=-1,1 do
 		for z1=-1,1 do
-			if minetest.get_item_group(minetest.get_node({x=p.x+x1, y=p.y, z=p.z+z1}).name, group) > 0 and minetest.get_item_group(minetest.get_node({x=p.x+x1, y=p.y, z=p.z+z1}).name, "leafdecay") < 4 then
+			if minetest.get_item_group(minetest.get_node({x=p.x+x1, y=p.y, z=p.z+z1}).name, group) > 0 and minetest.get_item_group(minetest.get_node({x=p.x+x1, y=p.y, z=p.z+z1}).name, "leafdecay") > 0 then
 				if minetest.is_protected(pos, digger:get_player_name()) then
 					minetest.record_protection_violation(pos, digger:get_player_name())
 					return
diff --git a/mods/gs_tools/sledges.lua b/mods/gs_tools/sledges.lua
index 077400b..ea058ec 100644
--- a/mods/gs_tools/sledges.lua
+++ b/mods/gs_tools/sledges.lua
@@ -18,9 +18,10 @@ function gs_tools.after_sledge(pos, oldnode, digger)
 	if digger then
 		local wielded = digger:get_wielded_item()
 		local rank = minetest.get_item_group(wielded:get_name(), "sledge")
+		
 		if rank > 0 then
 			for _,k in ipairs(gs_tools.get_3x3s(pos, digger)) do
-				gs_tools.drop_node(k, digger, wielded, rank)
+				gs_tools.drop_node(k, digger, wielded, rank, groups)
 			end
 		end
 	end