update plantlife, farming_redo, nixie tubes

add my led_marquee mod

6 files changed, 117 insertions, 116 deletions

diff --git a/farming/README.md b/farming/README.md
index 99ac101..272ff79 100644
--- a/farming/README.md
+++ b/farming/README.md
@@ -13,6 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
+- 1.38 - Pumpkin grows into block, use chopping board to cut into slices, same with melon block, cocoa pods are no longer walkable
 - 1.37 - Added custom 'growth_check(pos, nodename) function for crop nodes to use (check cocoa.lua for example)
 - 1.36 - Added Beetroot, Beetroot Soup (6x beetroot, 1x bowl), fix register_plant() issue, add new recipes
 - 1.35 - Deprecated bronze/mese/diamond hoe's, added hoe bomb and deprecated hoe's as lucky block prizes
diff --git a/farming/compatibility.lua b/farming/compatibility.lua
index afa98d6..808000d 100644
--- a/farming/compatibility.lua
+++ b/farming/compatibility.lua
@@ -1,8 +1,13 @@
 
--- wait until mods are finished loading
-minetest.after(0, function()
+--= Helpers
+
+local eth = minetest.get_modpath("ethereal")
+local alias = function(orig, new)
+	minetest.register_alias(orig, new)
+end
+
+--= Overrides (add food_* group to apple and brown mushroom)
 
--- add food group to default apple and brown mushroom
 minetest.override_item("default:apple", {
 	groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2,
 		leafdecay = 3, leafdecay_drop = 1},
@@ -15,14 +20,13 @@ minetest.override_item("flowers:mushroom_brown", {
 })
 end
 
--- is Ethereal mod installed?
-local eth = minetest.get_modpath("ethereal")
+--= Aliases
 
 -- Banana
 if eth then
-	minetest.register_alias("farming_plus:banana_sapling", "ethereal:banana_tree_sapling")
-	minetest.register_alias("farming_plus:banana_leaves", "ethereal:bananaleaves")
-	minetest.register_alias("farming_plus:banana", "ethereal:banana")
+	alias("farming_plus:banana_sapling", "ethereal:banana_tree_sapling")
+	alias("farming_plus:banana_leaves", "ethereal:bananaleaves")
+	alias("farming_plus:banana", "ethereal:banana")
 else
 	minetest.register_node(":ethereal:banana", {
 		description = "Banana",
@@ -42,35 +46,45 @@ else
 		sounds = default.node_sound_leaves_defaults(),
 	})
 
-	minetest.register_alias("farming_plus:banana_sapling", "default:sapling")
-	minetest.register_alias("farming_plus:banana_leaves", "default:leaves")
-	minetest.register_alias("farming_plus:banana", "ethereal:banana")
+	minetest.register_node(":ethereal:bananaleaves", {
+		description = "Banana Leaves",
+		tiles = {"banana_leaf.png"},
+		inventory_image = "banana_leaf.png",
+		wield_image = "banana_leaf.png",
+		paramtype = "light",
+		waving = 1,
+		groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
+		sounds = default.node_sound_leaves_defaults(),
+	})
+
+	alias("farming_plus:banana_sapling", "default:sapling")
+	alias("farming_plus:banana_leaves", "ethereal:bananaleaves")
+	alias("farming_plus:banana", "ethereal:banana")
 end
 
 -- Carrot
-minetest.register_alias("farming_plus:carrot_seed", "farming:carrot")
-minetest.register_alias("farming_plus:carrot_1", "farming:carrot_1")
-minetest.register_alias("farming_plus:carrot_2", "farming:carrot_4")
-minetest.register_alias("farming_plus:carrot_3", "farming:carrot_6")
-minetest.register_alias("farming_plus:carrot", "farming:carrot_8")
-minetest.register_alias("farming_plus:carrot_item", "farming:carrot")
+alias("farming_plus:carrot_seed", "farming:carrot")
+alias("farming_plus:carrot_1", "farming:carrot_1")
+alias("farming_plus:carrot_2", "farming:carrot_4")
+alias("farming_plus:carrot_3", "farming:carrot_6")
+alias("farming_plus:carrot", "farming:carrot_8")
+alias("farming_plus:carrot_item", "farming:carrot")
 
 -- Cocoa
-minetest.register_alias("farming_plus:cocoa_sapling", "farming:cocoa_2")
-minetest.register_alias("farming_plus:cocoa_leaves", "default:leaves")
-minetest.register_alias("farming_plus:cocoa", "default:apple")
-minetest.register_alias("farming_plus:cocoa_bean", "farming:cocoa_beans")
+alias("farming_plus:cocoa_sapling", "farming:cocoa_beans")
+alias("farming_plus:cocoa_leaves", "default:leaves")
+alias("farming_plus:cocoa", "default:apple")
+alias("farming_plus:cocoa_bean", "farming:cocoa_beans")
 
 -- Orange
-minetest.register_alias("farming_plus:orange_1", "farming:tomato_1")
-minetest.register_alias("farming_plus:orange_2", "farming:tomato_4")
-minetest.register_alias("farming_plus:orange_3", "farming:tomato_6")
---minetest.register_alias("farming_plus:orange", "farming:tomato_8")
+alias("farming_plus:orange_1", "farming:tomato_1")
+alias("farming_plus:orange_2", "farming:tomato_4")
+alias("farming_plus:orange_3", "farming:tomato_6")
 
 if eth then
-	minetest.register_alias("farming_plus:orange_item", "ethereal:orange")
-	minetest.register_alias("farming_plus:orange", "ethereal:orange")
-	minetest.register_alias("farming_plus:orange_seed", "ethereal:orange_tree_sapling")
+	alias("farming_plus:orange_item", "ethereal:orange")
+	alias("farming_plus:orange", "ethereal:orange")
+	alias("farming_plus:orange_seed", "ethereal:orange_tree_sapling")
 else
 	minetest.register_node(":ethereal:orange", {
 		description = "Orange",
@@ -90,45 +104,45 @@ else
 		sounds = default.node_sound_leaves_defaults(),
 	})
 
-	minetest.register_alias("farming_plus:orange_item", "ethereal:orange")
-	minetest.register_alias("farming_plus:orange", "ethereal:orange")
-	minetest.register_alias("farming_plus:orange_seed", "default:sapling")
+	alias("farming_plus:orange_item", "ethereal:orange")
+	alias("farming_plus:orange", "ethereal:orange")
+	alias("farming_plus:orange_seed", "default:sapling")
 end
 
 -- Potato
-minetest.register_alias("farming_plus:potato_item", "farming:potato")
-minetest.register_alias("farming_plus:potato_1", "farming:potato_1")
-minetest.register_alias("farming_plus:potato_2", "farming:potato_2")
-minetest.register_alias("farming_plus:potato", "farming:potato_3")
-minetest.register_alias("farming_plus:potato_seed", "farming:potato")
+alias("farming_plus:potato_item", "farming:potato")
+alias("farming_plus:potato_1", "farming:potato_1")
+alias("farming_plus:potato_2", "farming:potato_2")
+alias("farming_plus:potato", "farming:potato_3")
+alias("farming_plus:potato_seed", "farming:potato")
 
 -- Pumpkin
-minetest.register_alias("farming:pumpkin_seed", "farming:pumpkin_slice")
-minetest.register_alias("farming:pumpkin_face", "farming:jackolantern")
-minetest.register_alias("farming:pumpkin_face_light", "farming:jackolantern_on")
-minetest.register_alias("farming:big_pumpkin", "farming:pumpkin")
-minetest.register_alias("farming:big_pumpkin_side", "air")
-minetest.register_alias("farming:big_pumpkin_corner", "air")
-minetest.register_alias("farming:big_pumpkin_top", "air")
-minetest.register_alias("farming:scarecrow", "farming:jackolantern")
-minetest.register_alias("farming:scarecrow_light", "farming:jackolantern_on")
-minetest.register_alias("farming:pumpkin_flour", "farming:pumpkin_dough")
+alias("farming:pumpkin_seed", "farming:pumpkin_slice")
+alias("farming:pumpkin_face", "farming:jackolantern")
+alias("farming:pumpkin_face_light", "farming:jackolantern_on")
+alias("farming:big_pumpkin", "farming:jackolantern")
+alias("farming:big_pumpkin_side", "air")
+alias("farming:big_pumpkin_top", "air")
+alias("farming:big_pumpkin_corner", "air")
+alias("farming:scarecrow", "farming:jackolantern")
+alias("farming:scarecrow_light", "farming:jackolantern_on")
+alias("farming:pumpkin_flour", "farming:pumpkin_dough")
 
 -- Rhubarb
-minetest.register_alias("farming_plus:rhubarb_seed", "farming:rhubarb")
-minetest.register_alias("farming_plus:rhubarb_1", "farming:rhubarb_1")
-minetest.register_alias("farming_plus:rhubarb_2", "farming:rhubarb_2")
-minetest.register_alias("farming_plus:rhubarb", "farming:rhubarb_3")
-minetest.register_alias("farming_plus:rhubarb_item", "farming:rhubarb")
+alias("farming_plus:rhubarb_seed", "farming:rhubarb")
+alias("farming_plus:rhubarb_1", "farming:rhubarb_1")
+alias("farming_plus:rhubarb_2", "farming:rhubarb_2")
+alias("farming_plus:rhubarb", "farming:rhubarb_3")
+alias("farming_plus:rhubarb_item", "farming:rhubarb")
 
 -- Strawberry
 if eth then
-	minetest.register_alias("farming_plus:strawberry_item", "ethereal:strawberry")
-	minetest.register_alias("farming_plus:strawberry_seed", "ethereal:strawberry")
-	minetest.register_alias("farming_plus:strawberry_1", "ethereal:strawberry_1")
-	minetest.register_alias("farming_plus:strawberry_2", "ethereal:strawberry_3")
-	minetest.register_alias("farming_plus:strawberry_3", "ethereal:strawberry_5")
-	minetest.register_alias("farming_plus:strawberry", "ethereal:strawberry_7")
+	alias("farming_plus:strawberry_item", "ethereal:strawberry")
+	alias("farming_plus:strawberry_seed", "ethereal:strawberry")
+	alias("farming_plus:strawberry_1", "ethereal:strawberry_1")
+	alias("farming_plus:strawberry_2", "ethereal:strawberry_3")
+	alias("farming_plus:strawberry_3", "ethereal:strawberry_5")
+	alias("farming_plus:strawberry", "ethereal:strawberry_7")
 else
 	minetest.register_craftitem(":ethereal:strawberry", {
 		description = "Strawberry",
@@ -138,39 +152,21 @@ else
 		on_use = minetest.item_eat(1),
 	})
 
-	minetest.register_alias("farming_plus:strawberry_item", "ethereal:strawberry")
-	minetest.register_alias("farming_plus:strawberry_seed", "ethereal:strawberry")
-	minetest.register_alias("farming_plus:strawberry_1", "farming:raspberry_1")
-	minetest.register_alias("farming_plus:strawberry_2", "farming:raspberry_2")
-	minetest.register_alias("farming_plus:strawberry_3", "farming:raspberry_3")
-	minetest.register_alias("farming_plus:strawberry", "farming:raspberry_4")
+	alias("farming_plus:strawberry_item", "ethereal:strawberry")
+	alias("farming_plus:strawberry_seed", "ethereal:strawberry")
+	alias("farming_plus:strawberry_1", "farming:raspberry_1")
+	alias("farming_plus:strawberry_2", "farming:raspberry_2")
+	alias("farming_plus:strawberry_3", "farming:raspberry_3")
+	alias("farming_plus:strawberry", "farming:raspberry_4")
 end
 
-minetest.register_alias("bushes:strawberry", "ethereal:strawberry")
-
-
 -- Tomato
-minetest.register_alias("farming_plus:tomato_seed", "farming:tomato")
-minetest.register_alias("farming_plus:tomato_item", "farming:tomato")
-minetest.register_alias("farming_plus:tomato_1", "farming:tomato_2")
-minetest.register_alias("farming_plus:tomato_2", "farming:tomato_4")
-minetest.register_alias("farming_plus:tomato_3", "farming:tomato_6")
-minetest.register_alias("farming_plus:tomato", "farming:tomato_8")
+alias("farming_plus:tomato_seed", "farming:tomato")
+alias("farming_plus:tomato_item", "farming:tomato")
+alias("farming_plus:tomato_1", "farming:tomato_2")
+alias("farming_plus:tomato_2", "farming:tomato_4")
+alias("farming_plus:tomato_3", "farming:tomato_6")
+alias("farming_plus:tomato", "farming:tomato_8")
 
 -- Weed
-minetest.register_alias("farming:weed", "default:grass_2")
-
---[[ Classic Bushes compatibility
-if minetest.get_modpath("bushes_classic") then
-
-	if eth then
-		minetest.register_alias("bushes:strawberry", "farming:strawberry")
-	else
-		minetest.register_alias("bushes:strawberry", "farming:raspberries")
-	end
-
-	minetest.register_alias("bushes:blueberry", "farming:blueberries")
-	minetest.register_alias("bushes:raspberry", "farming:raspberries")
-end]]
-
-end)
+alias("farming:weed", "default:grass_2")
diff --git a/farming/crops/cocoa.lua b/farming/crops/cocoa.lua
index 19e9c6b..ecefcea 100644
--- a/farming/crops/cocoa.lua
+++ b/farming/crops/cocoa.lua
@@ -113,7 +113,7 @@ local crop_def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cocoa_1.png"},
 	paramtype = "light",
-	walkable = true,
+	walkable = false,
 	drop = {
 		items = {
 			{items = {'farming:cocoa_beans 1'}, rarity = 2},
diff --git a/farming/crops/melon.lua b/farming/crops/melon.lua
index 2165558..1791fdf 100644
--- a/farming/crops/melon.lua
+++ b/farming/crops/melon.lua
@@ -22,10 +22,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:melon_slice 9",
-	recipe = {
-		{"", "farming:melon_8", ""},
-	}
+	recipe = {"farming:melon_8", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- melon definition
@@ -82,5 +82,6 @@ crop_def.groups = {
 	food_melon = 1, snappy = 1, oddly_breakable_by_hand = 1,
 	flammable = 2, plant = 1
 }
-crop_def.drop = "farming:melon_slice 9"
+--crop_def.drop = "farming:melon_slice 9"
+crop_def.drop = "farming:melon_8"
 minetest.register_node("farming:melon_8", table.copy(crop_def))
diff --git a/farming/crops/pumpkin.lua b/farming/crops/pumpkin.lua
index d8e8ec6..4abbe13 100644
--- a/farming/crops/pumpkin.lua
+++ b/farming/crops/pumpkin.lua
@@ -5,26 +5,6 @@
 
 local S = farming.intllib
 
--- pumpkin
-minetest.register_node("farming:pumpkin", {
-	description = S("Pumpkin"),
-	tiles = {
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_side.png"
-	},
-	groups = {
-		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
-		flammable = 2, plant = 1
-	},
-	drop = {
-		items = {
-			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
-		}
-	},
-	sounds = default.node_sound_wood_defaults(),
-})
-
 -- pumpkin slice
 minetest.register_craftitem("farming:pumpkin_slice", {
 	description = S("Pumpkin Slice"),
@@ -46,10 +26,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:pumpkin_slice 9",
-	recipe = {
-		{"", "farming:pumpkin", ""},
-	}
+	recipe = {"farming:pumpkin", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- jack 'o lantern
@@ -201,6 +181,7 @@ crop_def.tiles = {"farming_pumpkin_7.png"}
 minetest.register_node("farming:pumpkin_7", table.copy(crop_def))
 
 -- stage 8 (final)
+--[[
 crop_def.tiles = {"farming_pumpkin_8.png"}
 crop_def.groups.growing = 0
 crop_def.drop = {
@@ -209,3 +190,25 @@ crop_def.drop = {
 	}
 }
 minetest.register_node("farming:pumpkin_8", table.copy(crop_def))
+]]
+
+minetest.register_node("farming:pumpkin_8", {
+	description = S("Pumpkin"),
+	tiles = {
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png"
+	},
+	groups = {
+		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
+		flammable = 2, plant = 1
+	},
+--	drop = {
+--		items = {
+--			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
+--		}
+--	},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
diff --git a/farming/textures/banana_leaf.png b/farming/textures/banana_leaf.png
new file mode 100644
index 0000000..5800cbf
--- /dev/null
+++ b/farming/textures/banana_leaf.png