Merge branch 'master' into newstuff

crafts.lua

@@ -46,20 +46,104 @@ minetest.register_craft({
 	burntime = 1,
 })
 
--- extra crafting in case user has old jungle trees.
+-- Food recipes!
+
+minetest.register_craftitem("moretrees:coconut_milk", {
+	description = "Coconut Milk",
+	inventory_image = "moretrees_coconut_milk_inv.png",
+	wield_image = "moretrees_coconut_milk.png",
+	on_use = minetest.item_eat(2),
+})
+
+minetest.register_craftitem("moretrees:raw_coconut", {
+	description = "Raw Coconut",
+	inventory_image = "moretrees_raw_coconut.png",
+	on_use = minetest.item_eat(4),
+})
+
+minetest.register_craftitem("moretrees:acorn_muffin_batter", {
+	description = "Acorn Muffin batter",
+	inventory_image = "moretrees_acorn_muffin_batter.png",
+})
+
+minetest.register_craftitem("moretrees:acorn_muffin", {
+	description = "Acorn Muffin",
+	inventory_image = "moretrees_acorn_muffin.png",
+	on_use = minetest.item_eat(4),
+})
+
+minetest.register_craftitem("moretrees:spruce_nuts", {
+	description = "Roasted Spruce Cone Nuts",
+	inventory_image = "moretrees_spruce_nuts.png",
+	on_use = minetest.item_eat(1),
+})
+
+minetest.register_craftitem("moretrees:pine_nuts", {
+	description = "Roasted Pine Cone Nuts",
+	inventory_image = "moretrees_pine_nuts.png",
+	on_use = minetest.item_eat(1),
+})
+
+minetest.register_craftitem("moretrees:fir_nuts", {
+	description = "Roasted Fir Cone Nuts",
+	inventory_image = "moretrees_fir_nuts.png",
+	on_use = minetest.item_eat(1),
+})
+
+for i in ipairs(moretrees.cutting_tools) do
+	local tool = moretrees.cutting_tools[i]
+	minetest.register_craft({
+		type = "shapeless",
+		output = "moretrees:coconut_milk",
+		recipe = {
+			"moretrees:coconut",
+			"vessels:drinking_glass",
+			tool
+		},
+		replacements = {
+			{ "moretrees:coconut", "moretrees:raw_coconut" },
+			{ tool, tool }
+		}
+	})
+end
 
 minetest.register_craft({
-	output = "moretrees:jungletree_trunk_sideways 2",
+	type = "shapeless",
+	output = "moretrees:acorn_muffin_batter",
 	recipe = {
-		{"default:jungletree", "default:jungletree"},
+		"moretrees:acorn",
+		"moretrees:acorn",
+		"moretrees:acorn",
+		"moretrees:acorn",
+		"moretrees:coconut_milk",
+	},
+	replacements = {
+		{ "moretrees:coconut_milk", "vessels:drinking_glass" }
 	}
 })
 
 minetest.register_craft({
-	output = "moretrees:jungletree_planks 4",
+	type = "cooking",
-	recipe = {
+	output = "moretrees:acorn_muffin 4",
-		{"default:jungletree"}
+	recipe = "moretrees:acorn_muffin_batter",
-	}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "moretrees:spruce_nuts 4",
+	recipe = "moretrees:spruce_cone",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "moretrees:pine_nuts 4",
+	recipe = "moretrees:pine_cone",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "moretrees:fir_nuts 4",
+	recipe = "moretrees:fir_cone",
 })
 
 

init.lua

@@ -42,6 +42,18 @@ else
 	dofile(worldpath.."/moretrees_settings.txt")
 end
 
+moretrees.cutting_tools = {
+	"default:axe_bronze",
+	"default:axe_diamond",
+	"default:axe_mese",
+	"default:axe_steel",
+	"glooptest:axe_alatro",
+	"glooptest:axe_arol",
+	"moreores:axe_mithril",
+	"moreores:axe_silver",
+	"titanium:axe",
+}
+
 dofile(modpath.."/tree_models.lua")
 dofile(modpath.."/biome_defs.lua")
 dofile(modpath.."/node_defs.lua")

node_defs.lua

@@ -195,24 +195,6 @@ for color = 1, 3 do
 	})
 end
 
--- sideways jungle tree trunk:
-
-minetest.register_node("moretrees:jungletree_trunk_sideways", {
-	description = "Sideways Jungle Tree Trunk",
-	tiles = {
-		"default_jungletree.png^[transformR90",
-		"default_jungletree.png^[transformR90",
-		"default_jungletree_top.png",
-		"default_jungletree_top.png",
-		"default_jungletree.png^[transformR90",
-		"default_jungletree.png^[transformR90"
-	},
-	is_ground_content = true,
-	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
-	sounds = default.node_sound_wood_defaults(),
-	paramtype2 = "facedir",
-})
-
 -- Extra needles for firs
 
 minetest.register_node("moretrees:fir_leaves_bright", {
@@ -257,13 +239,55 @@ table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
 table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
 table.insert(moretrees.avoidnodes, "default:tree")
 
+-- "empty" (tapped) rubber tree nodes
+
+minetest.register_node("moretrees:rubber_tree_trunk_empty", {
+	description = "Rubber Tree Trunk (Empty)",
+	tiles = {
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_empty.png"
+	},
+	is_ground_content = true,
+	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("moretrees:rubber_tree_trunk_empty_sideways", {
+	description = "Sideways Rubber Tree Trunk (Empty)",
+	tiles = {
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_top.png",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90",
+		"moretrees_rubber_tree_trunk_empty.png^[transformR90"
+	},
+	is_ground_content = true,
+	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+})
+
+
 -- For compatibility with old nodes and recently-changed nodes.
 
+minetest.register_alias("technic:rubber_tree_full",      "moretrees:rubber_tree_trunk")
+minetest.register_alias("farming_plus:rubber_tree_full", "moretrees:rubber_tree_trunk")
+
+minetest.register_alias("technic:rubber_leaves",      "moretrees:rubber_tree_leaves")
+minetest.register_alias("farming_plus:rubber_leaves", "moretrees:rubber_tree_leaves")
+
+minetest.register_alias("farming_plus:rubber_sapling", "moretrees:rubber_tree_sapling")
+minetest.register_alias("technic:rubber_tree_sapling", "moretrees:rubber_tree_sapling")
+
 minetest.register_alias("moretrees:jungletree_trunk", "default:jungletree")
 minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
 minetest.register_alias("moretrees:jungletree_sapling", "default:junglesapling")
 minetest.register_alias("jungletree:sapling", "default:junglesapling")
 
+minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree")
+
 minetest.register_alias("jungletree:leaves_green", "moretrees:jungletree_leaves_green")
 minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red")
 minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow")