From cf6dad1f3fa4749acd77841c3fb0a776cbb396e5 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Tue, 3 Dec 2013 18:47:35 -0500
Subject: [PATCH] Move "waving = 1" property for grasses/shrubs over to
 default/nodes.lua and put all instances of this property right under the
 drawtype, since they are directly related.

---
 mods/default/nodes.lua | 12 +++++++++---
 mods/farming/init.lua  |  7 ++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index c9b50818..3bda0edb 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -255,10 +255,10 @@ minetest.register_node("default:junglewood", {
 minetest.register_node("default:jungleleaves", {
 	description = "Jungle Leaves",
 	drawtype = "allfaces_optional",
+	waving = 1,
 	visual_scale = 1.3,
 	tiles = {"default_jungleleaves.png"},
 	paramtype = "light",
-	waving = 1,
 	is_ground_content = false,
 	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
 	drop = {
@@ -299,6 +299,7 @@ minetest.register_node("default:junglesapling", {
 minetest.register_node("default:junglegrass", {
 	description = "Jungle Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	visual_scale = 1.3,
 	tiles = {"default_junglegrass.png"},
 	inventory_image = "default_junglegrass.png",
@@ -318,10 +319,10 @@ minetest.register_node("default:junglegrass", {
 minetest.register_node("default:leaves", {
 	description = "Leaves",
 	drawtype = "allfaces_optional",
+	waving = 1,
 	visual_scale = 1.3,
 	tiles = {"default_leaves.png"},
 	paramtype = "light",
-	waving = 1,
 	is_ground_content = false,
 	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
 	drop = {
@@ -1224,12 +1225,12 @@ minetest.register_node("default:apple", {
 minetest.register_node("default:dry_shrub", {
 	description = "Dry Shrub",
 	drawtype = "plantlike",
+	waving = 1,
 	visual_scale = 1.0,
 	tiles = {"default_dry_shrub.png"},
 	inventory_image = "default_dry_shrub.png",
 	wield_image = "default_dry_shrub.png",
 	paramtype = "light",
-	waving = 1,
 	walkable = false,
 	is_ground_content = true,
 	buildable_to = true,
@@ -1244,6 +1245,7 @@ minetest.register_node("default:dry_shrub", {
 minetest.register_node("default:grass_1", {
 	description = "Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	tiles = {"default_grass_1.png"},
 	-- use a bigger inventory image
 	inventory_image = "default_grass_3.png",
@@ -1269,6 +1271,7 @@ minetest.register_node("default:grass_1", {
 minetest.register_node("default:grass_2", {
 	description = "Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	tiles = {"default_grass_2.png"},
 	inventory_image = "default_grass_2.png",
 	wield_image = "default_grass_2.png",
@@ -1287,6 +1290,7 @@ minetest.register_node("default:grass_2", {
 minetest.register_node("default:grass_3", {
 	description = "Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	tiles = {"default_grass_3.png"},
 	inventory_image = "default_grass_3.png",
 	wield_image = "default_grass_3.png",
@@ -1306,6 +1310,7 @@ minetest.register_node("default:grass_3", {
 minetest.register_node("default:grass_4", {
 	description = "Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	tiles = {"default_grass_4.png"},
 	inventory_image = "default_grass_4.png",
 	wield_image = "default_grass_4.png",
@@ -1325,6 +1330,7 @@ minetest.register_node("default:grass_4", {
 minetest.register_node("default:grass_5", {
 	description = "Grass",
 	drawtype = "plantlike",
+	waving = 1,
 	tiles = {"default_grass_5.png"},
 	inventory_image = "default_grass_5.png",
 	wield_image = "default_grass_5.png",
diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 9c3bf5b7..a991f8a1 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -189,7 +189,6 @@ minetest.register_node(":default:grass_1", {
 	inventory_image = "default_grass_3.png",
 	wield_image = "default_grass_3.png",
 	paramtype = "light",
-	waving = 1,
 	walkable = false,
 	buildable_to = true,
 	drop = {
@@ -221,7 +220,6 @@ for i=2,5 do
 		inventory_image = "default_grass_"..i..".png",
 		wield_image = "default_grass_"..i..".png",
 		paramtype = "light",
-		waving = 1,
 		walkable = false,
 		buildable_to = true,
 		is_ground_content = true,
@@ -249,7 +247,6 @@ minetest.register_node(":default:junglegrass", {
 	inventory_image = "default_junglegrass.png",
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
-	waving = 1,
 	walkable = false,
 	buildable_to = true,
 	is_ground_content = true,
@@ -366,9 +363,9 @@ for i=1,8 do
 	}
 	minetest.register_node("farming:wheat_"..i, {
 		drawtype = "plantlike",
+		waving = 1,
 		tiles = {"farming_wheat_"..i..".png"},
 		paramtype = "light",
-		waving = 1,
 		walkable = false,
 		buildable_to = true,
 		is_ground_content = true,
@@ -452,9 +449,9 @@ for i=1,8 do
 	}
 	minetest.register_node("farming:cotton_"..i, {
 		drawtype = "plantlike",
+		waving = 1,
 		tiles = {"farming_cotton_"..i..".png"},
 		paramtype = "light",
-		waving = 1,
 		walkable = false,
 		buildable_to = true,
 		is_ground_content = true,