From 5827b15ec5f68bb2995e86343730853cbb583310 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 16 Feb 2017 21:44:53 +0100
Subject: [PATCH] Move hay bale to mcl_farming

---
 mods/CORE/mcl_core/crafting.lua               |  16 ----------
 mods/CORE/mcl_core/nodes.lua                  |  12 --------
 .../textures/mcl_farming_hayblock_side.png}   | Bin
 .../textures/mcl_farming_hayblock_top.png}    | Bin
 mods/ITEMS/mcl_farming/wheat.lua              |  28 ++++++++++++++++++
 mods/MISC/mcl_temp_helper_recipes/init.lua    |  14 ++++-----
 6 files changed, 35 insertions(+), 35 deletions(-)
 rename mods/{CORE/mcl_core/textures/default_hayblock_side.png => ITEMS/mcl_farming/textures/mcl_farming_hayblock_side.png} (100%)
 rename mods/{CORE/mcl_core/textures/default_hayblock_top.png => ITEMS/mcl_farming/textures/mcl_farming_hayblock_top.png} (100%)

diff --git a/mods/CORE/mcl_core/crafting.lua b/mods/CORE/mcl_core/crafting.lua
index a24c583ae..b1c0fe5cf 100644
--- a/mods/CORE/mcl_core/crafting.lua
+++ b/mods/CORE/mcl_core/crafting.lua
@@ -408,22 +408,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'mcl_core:haybale',
-	recipe = {
-		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
-		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
-		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
-	}
-})
-
-minetest.register_craft({
-	output = 'mcl_farming:wheat_item 9',
-	recipe = {
-		{'mcl_core:haybale'},
-	}
-})
-
 minetest.register_craft({
 	output = 'mcl_core:coalblock',
 	recipe = {
diff --git a/mods/CORE/mcl_core/nodes.lua b/mods/CORE/mcl_core/nodes.lua
index d750723b2..9b6b59574 100644
--- a/mods/CORE/mcl_core/nodes.lua
+++ b/mods/CORE/mcl_core/nodes.lua
@@ -441,18 +441,6 @@ minetest.register_node("mcl_core:brick_block", {
 	sounds = mcl_sounds.node_sound_stone_defaults(),
 })
 
-minetest.register_node("mcl_core:haybale", {
-	description = "Hay Bale",
-	tiles = {"default_hayblock_top.png", "default_hayblock_top.png", "default_hayblock_side.png"},
-	is_ground_content = false,
-	stack_max = 64,
-	paramtype2 = "facedir",
-	is_ground_content = false,
-	on_place = mcl_util.rotate_axis,
-	groups = {oddly_breakable_by_hand=3,flammable=2, building_block=1},
-	sounds = mcl_sounds.node_sound_leaves_defaults(),
-})
-
 minetest.register_node("mcl_core:bone_block", {
 	description = "Bone Block",
 	tiles = {"mcl_core_bone_block_top.png", "mcl_core_bone_block_top.png", "mcl_core_bone_block_side.png"},
diff --git a/mods/CORE/mcl_core/textures/default_hayblock_side.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_hayblock_side.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_hayblock_side.png
rename to mods/ITEMS/mcl_farming/textures/mcl_farming_hayblock_side.png
diff --git a/mods/CORE/mcl_core/textures/default_hayblock_top.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_hayblock_top.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_hayblock_top.png
rename to mods/ITEMS/mcl_farming/textures/mcl_farming_hayblock_top.png
diff --git a/mods/ITEMS/mcl_farming/wheat.lua b/mods/ITEMS/mcl_farming/wheat.lua
index b2f118729..d53b20872 100644
--- a/mods/ITEMS/mcl_farming/wheat.lua
+++ b/mods/ITEMS/mcl_farming/wheat.lua
@@ -162,3 +162,31 @@ minetest.register_craftitem("mcl_farming:bread", {
 	on_secondary_use = minetest.item_eat(5),
 })
 
+minetest.register_node("mcl_farming:hay_block", {
+	description = "Hay Bale",
+	tiles = {"mcl_farming_hayblock_top.png", "mcl_farming_hayblock_top.png", "mcl_farming_hayblock_side.png"},
+	is_ground_content = false,
+	stack_max = 64,
+	paramtype2 = "facedir",
+	is_ground_content = false,
+	on_place = mcl_util.rotate_axis,
+	groups = {oddly_breakable_by_hand=3,flammable=2, building_block=1},
+	sounds = mcl_sounds.node_sound_leaves_defaults(),
+})
+
+minetest.register_craft({
+	output = 'mcl_farming:hay_block',
+	recipe = {
+		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
+		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
+		{'mcl_farming:wheat_item', 'mcl_farming:wheat_item', 'mcl_farming:wheat_item'},
+	}
+})
+
+minetest.register_craft({
+	output = 'mcl_farming:wheat_item 9',
+	recipe = {
+		{'mcl_farming:hay_block'},
+	}
+})
+
diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index eb2446427..5b31a2f2a 100644
--- a/mods/MISC/mcl_temp_helper_recipes/init.lua
+++ b/mods/MISC/mcl_temp_helper_recipes/init.lua
@@ -14,9 +14,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_sponges:sponge",
 	recipe = {
-		{ "mcl_core:haybale", "mcl_core:haybale", "mcl_core:haybale" },
-		{ "mcl_core:haybale", "mcl_core:emerald", "mcl_core:haybale" },
-		{ "mcl_core:haybale", "mcl_core:haybale", "mcl_core:haybale" },
+		{ "mcl_farming:hay_block", "mcl_farming:hay_block", "mcl_farming:hay_block" },
+		{ "mcl_farming:hay_block", "mcl_core:emerald", "mcl_farming:hay_block" },
+		{ "mcl_farming:hay_block", "mcl_farming:hay_block", "mcl_farming:hay_block" },
 	}
 })
 
@@ -174,15 +174,15 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_farming:beetroot_seeds",
 	recipe = {
-		{"mcl_core:haybale","mcl_farming:wheat_seeds"},
-		{"mcl_farming:wheat_seeds","mcl_core:haybale"},
+		{"mcl_farming:hay_block","mcl_farming:wheat_seeds"},
+		{"mcl_farming:wheat_seeds","mcl_farming:hay_block"},
 	},
 })
 minetest.register_craft({
 	output = "mcl_farming:beetroot_seeds",
 	recipe = {
-		{"mcl_farming:wheat_seeds","mcl_core:haybale"},
-		{"mcl_core:haybale","mcl_farming:wheat_seeds"},
+		{"mcl_farming:wheat_seeds","mcl_farming:hay_block"},
+		{"mcl_farming:hay_block","mcl_farming:wheat_seeds"},
 	},
 })
 minetest.register_craft({