From 72684f36ffb55632ce3857f781ba0100b7b6272d Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 27 Nov 2017 12:40:07 +0100
Subject: [PATCH] Remove faceless pumpkins from survival again

The top face rotates when you use shears on the pumpkin.
---
 mods/ITEMS/mcl_farming/pumpkin.lua   | 18 +++++++++++-------
 mods/MAPGEN/mcl_biomes/init.lua      |  2 +-
 mods/MAPGEN/mcl_mapgen_core/init.lua |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua
index fca121965..a834ee0d8 100644
--- a/mods/ITEMS/mcl_farming/pumpkin.lua
+++ b/mods/ITEMS/mcl_farming/pumpkin.lua
@@ -78,8 +78,8 @@ local stem_def = {
 
 -- Template for pumpkin
 local pumpkin_base_def = {
-	description = "Pumpkin",
-	_doc_items_longdesc = "A pumpkin is a naturally occouring block from the grasslands. Pumpkins are grown from pumpkin stems, which in turn are grown from pumpkin seeds. Pumpkins can be carved with shears.",
+	description = "Faceless Pumpkin",
+	_doc_items_longdesc = "A faceless pumpkin is a decorative block. It can be carved with shears to obtain pumpkin seeds.",
 	_doc_items_usagehelp = "To carve a face into the pumpkin, use the shears on the side you want to carve.",
 	stack_max = 64,
 	paramtype = "light",
@@ -90,21 +90,20 @@ local pumpkin_base_def = {
 	_mcl_blast_resistance = 5,
 	_mcl_hardness = 1,
 }
+minetest.register_node("mcl_farming:pumpkin", pumpkin_base_def)
 
 local pumpkin_face_base_def = table.copy(pumpkin_base_def)
-pumpkin_face_base_def.description = "Carved Pumpkin"
-pumpkin_face_base_def.doc_items_longdesc = "A carved pumpkin can be worn as a helmet for fun, but it doesn't offer any protection. Carved pumpkins are created by using shears on a pumpkin."
+pumpkin_face_base_def.description = "Pumpkin"
+pumpkin_face_base_def._doc_items_longdesc = "A pumpkin can be worn as a helmet for fun, but it doesn't offer any protection. Pumpkins grow from pumpkin stems, which in turn grow from pumpkin seeds."
 pumpkin_face_base_def.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"}
 pumpkin_face_base_def.groups.armor_head=1
 pumpkin_face_base_def.groups.non_combat_armor=1
 
-minetest.register_node("mcl_farming:pumpkin_face", pumpkin_face_base_def)
-
 -- Register stem growth
 mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5)
 
 -- Register actual pumpkin, connected stems and stem-to-pumpkin growth
-mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127",
+mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_face_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127",
 function(pos)
 	-- Attempt to spawn iron golem or snow golem
 	mobs_mc.tools.check_iron_golem_summon(pos)
@@ -146,6 +145,11 @@ minetest.register_craft({
 	recipe = {{"mcl_farming:pumpkin"}}
 })
 
+minetest.register_craft({
+	output = "mcl_farming:pumpkin_seeds 4",
+	recipe = {{"mcl_farming:pumpkin_face"}}
+})
+
 minetest.register_craftitem("mcl_farming:pumpkin_pie", {
 	description = "Pumpkin Pie",
 	_doc_items_longdesc = "A pumpkin pie is a tasty food item which can be eaten.",
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 6ee7192ea..7be0ce9f4 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -2858,7 +2858,7 @@ local function register_decorations()
 			size = { x=1, y=2, z=1 },
 			data = {
 				{ name = "air", prob = 0 },
-				{ name = "mcl_farming:pumpkin", param1=255, },
+				{ name = "mcl_farming:pumpkin_face", param1=255, },
 			},
 		},
 		place_on = {"group:grass_block_no_snow"},
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index 3357040c9..d88e91d3b 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -842,7 +842,7 @@ local function register_mgv6_decorations()
 			size = { x=1, y=2, z=1 },
 			data = {
 				{ name = "air", prob = 0 },
-				{ name = "mcl_farming:pumpkin" },
+				{ name = "mcl_farming:pumpkin_face" },
 			},
 		},
 		place_on = {"group:grass_block_no_snow"},