From 95bef458bb3f7e4a10b292fa465c4d49834da46d Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Fri, 20 Jan 2017 11:21:55 +0100
Subject: [PATCH] Move glistering melon to mcl_potions

---
 mods/farming/melon.lua                          |  16 +---------------
 mods/mcl_mobitems/init.lua                      |   3 +--
 mods/mcl_potions/depends.txt                    |   3 +++
 mods/mcl_potions/init.lua                       |  16 ++++++++++++++++
 .../textures/mcl_potions_melon_speckled.png}    | Bin
 5 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 mods/mcl_potions/depends.txt
 rename mods/{farming/textures/farming_melon_speckled.png => mcl_potions/textures/mcl_potions_melon_speckled.png} (100%)

diff --git a/mods/farming/melon.lua b/mods/farming/melon.lua
index e1aaf5d0fe..35324242cc 100644
--- a/mods/farming/melon.lua
+++ b/mods/farming/melon.lua
@@ -219,13 +219,6 @@ minetest.register_craftitem("farming:melon_item", {
 	groups = { food = 2, eatable = 2 },
 })
 
-minetest.register_craftitem("farming:speckled_melon", {
-	description = "Glistering Melon",
-	stack_max = 64,
-	groups = { brewitem = 1 },
-	inventory_image = "farming_melon_speckled.png",
-})
-
 minetest.register_abm({
 	nodenames = {"farming:melontige_unconnect"},
 	neighbors = {"air"},
@@ -293,11 +286,4 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "farming:speckled_melon",
-	recipe = {
-		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
-		{'default:gold_nugget', 'farming:melon_item', 'default:gold_nugget'},
-		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
-	}
-})
+
diff --git a/mods/mcl_mobitems/init.lua b/mods/mcl_mobitems/init.lua
index c2edccb260..291f23f300 100644
--- a/mods/mcl_mobitems/init.lua
+++ b/mods/mcl_mobitems/init.lua
@@ -107,7 +107,6 @@ minetest.register_craftitem("mcl_mobitems:milk_bucket", {
 	inventory_image = "mcl_mobitems_bucket_milk.png",
 	wield_image = "mcl_mobitems_bucket_milk.png",
 	on_use = minetest.item_eat(0, "bucket:bucket_empty"),
-	groups = { food = 3, },
 	stack_max = 1,
 })
 
@@ -188,7 +187,7 @@ minetest.register_craftitem("mcl_mobitems:rabbit_foot", {
 	description = "Rabbit's Foot",
 	wield_image = "mcl_mobitems_rabbit_foot.png",
 	inventory_image = "mcl_mobitems_rabbit_foot.png",
-	groups = { craftitem = 1 },
+	groups = { brewitem = 1 },
 	stack_max = 64,
 })
 
diff --git a/mods/mcl_potions/depends.txt b/mods/mcl_potions/depends.txt
new file mode 100644
index 0000000000..8bb82f2104
--- /dev/null
+++ b/mods/mcl_potions/depends.txt
@@ -0,0 +1,3 @@
+default
+farming
+mcl_mobitems
diff --git a/mods/mcl_potions/init.lua b/mods/mcl_potions/init.lua
index c20cb905b6..a1c76ff870 100644
--- a/mods/mcl_potions/init.lua
+++ b/mods/mcl_potions/init.lua
@@ -27,6 +27,22 @@ minetest.register_craft( {
 	}
 })
 
+minetest.register_craftitem("mcl_potions:speckled_melon", {
+	description = "Glistering Melon",
+	stack_max = 64,
+	groups = { brewitem = 1 },
+	inventory_image = "mcl_potions_melon_speckled.png",
+})
+
+minetest.register_craft({
+	output = "mcl_potions:speckled_melon",
+	recipe = {
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+		{'default:gold_nugget', 'farming:melon_item', 'default:gold_nugget'},
+		{'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'},
+	}
+})
+
 -- TODO: Get texture
 --[[
 minetest.register_craftitem("mcl_potions:dragon_breath", {
diff --git a/mods/farming/textures/farming_melon_speckled.png b/mods/mcl_potions/textures/mcl_potions_melon_speckled.png
similarity index 100%
rename from mods/farming/textures/farming_melon_speckled.png
rename to mods/mcl_potions/textures/mcl_potions_melon_speckled.png