From 70803f8aefc8c68377dc3396001a6ca7973f8372 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Wed, 9 Jun 2021 07:41:11 +0100
Subject: [PATCH] add pumpkin bottom texture, redo melon node, fix typo in
 scythe, make pumpkin/melon rotatable

---
 crops/melon.lua                     |  32 ++++++++++++++--------------
 crops/pumpkin.lua                   |   6 ++++--
 hoes.lua                            |   2 +-
 textures/farming_pumpkin_bottom.png | Bin 0 -> 258 bytes
 4 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 textures/farming_pumpkin_bottom.png

diff --git a/crops/melon.lua b/crops/melon.lua
index 4c199da..66decdc 100644
--- a/crops/melon.lua
+++ b/crops/melon.lua
@@ -71,22 +71,22 @@ def.tiles = {"farming_melon_7.png"}
 minetest.register_node("farming:melon_7", table.copy(def))
 
 -- stage 8 (final)
-def.drawtype = "nodebox"
-def.description = S("Melon")
-def.tiles = {
-	"farming_melon_top.png", "farming_melon_bottom.png", "farming_melon_side.png"
-}
-def.selection_box = {-.5, -.5, -.5, .5, .5, .5}
-def.walkable = true
-def.buildable_to = false
-def.paramtype2 = "facedir"
-def.groups = {
-	food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
-	flammable = 2, plant = 1
-}
-def.drop = "farming:melon_8"
-def.on_place = minetest.rotate_node
-minetest.register_node("farming:melon_8", table.copy(def))
+minetest.register_node("farming:melon_8", {
+	description = S("Melon"),
+	tiles = {
+		"farming_melon_top.png",
+		"farming_melon_bottom.png",
+		"farming_melon_side.png"
+	},
+	groups = {
+		food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
+		flammable = 2, plant = 1
+	},
+	drop = "farming:melon_8",
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
+})
 
 -- add to registered_plants
 farming.registered_plants["farming:melon"] = {
diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua
index 0007ac7..2829d47 100644
--- a/crops/pumpkin.lua
+++ b/crops/pumpkin.lua
@@ -183,7 +183,7 @@ minetest.register_node("farming:pumpkin_8", {
 	description = S("Pumpkin"),
 	tiles = {
 		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_bottom.png",
 		"farming_pumpkin_side.png"
 	},
 	groups = {
@@ -191,7 +191,9 @@ minetest.register_node("farming:pumpkin_8", {
 		flammable = 2, plant = 1
 	},
 	drop = "farming:pumpkin_8",
-	sounds = default.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
 })
 
 minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
diff --git a/hoes.lua b/hoes.lua
index b7dcfd9..9340d55 100644
--- a/hoes.lua
+++ b/hoes.lua
@@ -361,7 +361,7 @@ farming.add_to_scythe_not_drops = function(item)
 end
 
 minetest.register_tool("farming:scythe_mithril", {
-	description = S("Mithril Scythe (Right-click to harvest and replant crops)"),
+	description = S("Mithril Scythe (Use to harvest and replant crops)"),
 	inventory_image = "farming_scythe_mithril.png",
 	sound = {breaks = "default_tool_breaks"},
 
diff --git a/textures/farming_pumpkin_bottom.png b/textures/farming_pumpkin_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..b23d241372bcb3b187f44c7c2de334e5fbbab78b
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU<x^qz))eG*=g)Iv&`oCV
zi)CGt$g(JdDWrp8YaZ+L8l#gHd^h^J9<OFTz9#U&afZ`e=_WwEy`C<PAsp9v&l&O^
zQV?N#@Lz1+(Pk6bIddcmjJ;+}%Rccyd7hKZuLxEBH@O^NG}OxexAD)NXQ%j*@9&(7
zDO;3+GedG%#aC_oBhfrPz}+liJ5P|T^N~0?%`^eu>&<t?Iu?Hp>}r%N`sHW0`20bQ
zt4tNe?{|L{jk=ZnZMR|EtmR+3gTH*#{Moj5VMO6~_O|yyLjS9K?f@Oe;OXk;vd$@?
F2>^&^V-o-X

literal 0
HcmV?d00001