From 4052da3116d27142ec5551c2bf9146717daad367 Mon Sep 17 00:00:00 2001
From: davedevils <davedevils@yandex.com>
Date: Fri, 3 Jul 2015 06:58:01 +0200
Subject: [PATCH] Delete old func, fix two crash and add timer

---
 mods/farming/init.lua  |  4 +++-
 mods/farming/soil.lua  |  4 ++--
 mods/farming/wheat.lua | 54 ++++++++++++++++++++++++++++++++++++++----
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 6b9ecbf65..63974dae4 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -1,3 +1,4 @@
+local init = os.clock()
 farming = {}
 
 function farming:add_plant(full_grown, names, interval, chance)
@@ -90,4 +91,5 @@ dofile(minetest.get_modpath("farming").."/potatoes.lua")
 -- ========= MUSHROOMS =========
 dofile(minetest.get_modpath("farming").."/mushrooms.lua")
 
-
+local time_to_load= os.clock() - init
+print(string.format("[MOD] "..minetest.get_current_modname().." loaded in %.4f s", time_to_load))
diff --git a/mods/farming/soil.lua b/mods/farming/soil.lua
index b91a6c682..987cae7cd 100644
--- a/mods/farming/soil.lua
+++ b/mods/farming/soil.lua
@@ -6,7 +6,7 @@ minetest.register_node("farming:soil", {
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.5},
+			{-0.5, -0.5, -0.5, 0.5, 0.4, 0.5},
 		}
 	},
 	groups = {crumbly=3, not_in_creative_inventory=1,soil=2},
@@ -20,7 +20,7 @@ minetest.register_node("farming:soil_wet", {
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.5}, 
+			{-0.5, -0.5, -0.5, 0.5, 0.4, 0.5}, 
 		}
 	},
 	groups = {crumbly=3, not_in_creative_inventory=1,soil=3},
diff --git a/mods/farming/wheat.lua b/mods/farming/wheat.lua
index 87ffe62d1..e01bd696b 100644
--- a/mods/farming/wheat.lua
+++ b/mods/farming/wheat.lua
@@ -10,7 +10,8 @@ minetest.register_node("farming:wheat_1", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	paramtype = "light",
 	drop = "farming:wheat_seed",
 	tiles = {"farming_wheat_1.png"},
 	selection_box = {
@@ -20,13 +21,23 @@ minetest.register_node("farming:wheat_1", {
 		},
 	},
 	groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.5, -0.3125, 0.375, 0.5}, -- NodeBox1
+			{0.3125, -0.5, -0.5, 0.3125, 0.375, 0.5}, -- NodeBox2
+			{-0.5, -0.5, 0.375, 0.5, 0.375, 0.375}, -- NodeBox3
+			{-0.5, -0.5, -0.25, 0.5, 0.375, -0.25}, -- NodeBox4
+		}
+	},
 })
 
 minetest.register_node("farming:wheat_2", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	paramtype = "light",
 	drop = "farming:wheat_seed",
 	tiles = {"farming_wheat_2.png"},
 	selection_box = {
@@ -36,13 +47,23 @@ minetest.register_node("farming:wheat_2", {
 		},
 	},
 	groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.5, -0.3125, 0.375, 0.5}, -- NodeBox1
+			{0.3125, -0.5, -0.5, 0.3125, 0.375, 0.5}, -- NodeBox2
+			{-0.5, -0.5, 0.375, 0.5, 0.375, 0.375}, -- NodeBox3
+			{-0.5, -0.5, -0.25, 0.5, 0.375, -0.25}, -- NodeBox4
+		}
+	},
 })
 
 minetest.register_node("farming:wheat_3", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	paramtype = "light",
 	drop = "farming:wheat_seed",
 	tiles = {"farming_wheat_3.png"},
 	selection_box = {
@@ -52,13 +73,23 @@ minetest.register_node("farming:wheat_3", {
 		},
 	},
 	groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.5, -0.3125, 0.375, 0.5}, -- NodeBox1
+			{0.3125, -0.5, -0.5, 0.3125, 0.375, 0.5}, -- NodeBox2
+			{-0.5, -0.5, 0.375, 0.5, 0.375, 0.375}, -- NodeBox3
+			{-0.5, -0.5, -0.25, 0.5, 0.375, -0.25}, -- NodeBox4
+		}
+	},
 })
 
 minetest.register_node("farming:wheat", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	walkable = false,
-	drawtype = "plantlike",
+	drawtype = "nodebox",
+	paramtype = "light",
 	tiles = {"farming_wheat.png"},
 	drop = {
 		max_items = 4,
@@ -69,7 +100,22 @@ minetest.register_node("farming:wheat", {
 			{ items = {'farming:wheat_harvested'} }
 		}
 	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, 0.35, 0.5}
+		},
+	},
 	groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.5, -0.3125, 0.375, 0.5}, -- NodeBox1
+			{0.3125, -0.5, -0.5, 0.3125, 0.375, 0.5}, -- NodeBox2
+			{-0.5, -0.5, 0.375, 0.5, 0.375, 0.375}, -- NodeBox3
+			{-0.5, -0.5, -0.25, 0.5, 0.375, -0.25}, -- NodeBox4
+		}
+	},
 })
 
 farming:add_plant("farming:wheat", {"farming:wheat_1", "farming:wheat_2", "farming:wheat_3"}, 50, 20)