From 4bf05de37d2d7f8d42392a1cf4da32315f00e4c2 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 27 Feb 2017 01:26:07 +0100
Subject: [PATCH] Add hardness to farming stuff

---
 mods/ITEMS/mcl_farming/melon.lua   | 3 ++-
 mods/ITEMS/mcl_farming/pumpkin.lua | 6 ++++--
 mods/ITEMS/mcl_farming/soil.lua    | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua
index 4ffc3ab37..cbcd8748b 100644
--- a/mods/ITEMS/mcl_farming/melon.lua
+++ b/mods/ITEMS/mcl_farming/melon.lua
@@ -2,7 +2,7 @@ minetest.register_node("mcl_farming:melon", {
 	description = "Melon",
 	stack_max = 64,
 	tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png"},
-	groups = {choppy=2, oddly_breakable_by_hand=2, building_block=1},
+	groups = {handy=1,axey=1, oddly_breakable_by_hand=2, building_block=1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -36,6 +36,7 @@ minetest.register_node("mcl_farming:melon", {
 	end,
 	sounds = mcl_sounds.node_sound_wood_defaults(),
 	_mcl_blast_resistance = 5,
+	_mcl_hardness = 1,
 })
 
 local stemdrop = {
diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua
index d2169c340..bdb5029d2 100644
--- a/mods/ITEMS/mcl_farming/pumpkin.lua
+++ b/mods/ITEMS/mcl_farming/pumpkin.lua
@@ -73,7 +73,7 @@ minetest.register_node("mcl_farming:pumpkin_face", {
 	stack_max = 64,
 	paramtype2 = "facedir",
 	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face.png"},
-	groups = {choppy=2, oddly_breakable_by_hand=2, building_block=1},
+	groups = {handy=1,axey=1, building_block=1},
 	after_dig_node = function(pos, oldnode, oldmetadata, user)
 		local have_change = 0
 		for x=-1,1 do
@@ -97,6 +97,7 @@ minetest.register_node("mcl_farming:pumpkin_face", {
 	end,
 	sounds = mcl_sounds.node_sound_wood_defaults(),
 	_mcl_blast_resistance = 5,
+	_mcl_hardness = 1,
 })
 
 minetest.register_node("mcl_farming:pumpkintige_unconnect", {
@@ -303,9 +304,10 @@ minetest.register_node("mcl_farming:pumpkin_face_light", {
 	-- Real light level: 15 (Minetest caps at 14)
 	light_source = 14,
 	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face_light.png"},
-	groups = {choppy=2, oddly_breakable_by_hand=2, building_block=1},
+	groups = {handy=1,axey=1, building_block=1},
 	sounds = mcl_sounds.node_sound_wood_defaults(),
 	_mcl_blast_resistance = 5,
+	_mcl_hardness = 1,
 })
 
 minetest.register_craft({
diff --git a/mods/ITEMS/mcl_farming/soil.lua b/mods/ITEMS/mcl_farming/soil.lua
index 5c9fdf567..5e7fbfce0 100644
--- a/mods/ITEMS/mcl_farming/soil.lua
+++ b/mods/ITEMS/mcl_farming/soil.lua
@@ -11,9 +11,10 @@ minetest.register_node("mcl_farming:soil", {
 			{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
 		}
 	},
-	groups = { crumbly=3, not_in_creative_inventory=1, soil=2, soil_sapling=1 },
+	groups = {handy=1,shovely=1, not_in_creative_inventory=1, soil=2, soil_sapling=1 },
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
 	_mcl_blast_resistance = 3,
+	_mcl_hardness = 0.9,
 })
 
 minetest.register_node("mcl_farming:soil_wet", {
@@ -28,9 +29,10 @@ minetest.register_node("mcl_farming:soil_wet", {
 			{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
 		}
 	},
-	groups = { crumbly=3, not_in_creative_inventory=1, soil=3, soil_sapling=1 },
+	groups = {handy=1,shovely=1, not_in_creative_inventory=1, soil=3, soil_sapling=1 },
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
 	_mcl_blast_resistance = 3,
+	_mcl_hardness = 0.9,
 })
 
 minetest.register_abm({