Merge branch 'master' of yunohost.local:mtcontrib/moretrees into nalc-1.2-dev

* Cela fait gagner un peu de la place dans l'inventaire.

biome_defs.lua

@@ -125,7 +125,10 @@ moretrees.willow_biome = {
 }
 
 moretrees.rubber_tree_biome = {
-	surface = "default:dirt_with_grass",
+	surface = {
+		"default:dirt_with_grass",
+		"default:sand",
+	},
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 10,
 	seed_diff = 338,

crafts.lua

@@ -117,39 +117,10 @@ for i in ipairs(moretrees.cutting_tools) do
 		},
 		replacements = {
 			{ "moretrees:coconut", "moretrees:raw_coconut" },
+			{ tool, tool }
 		}
 	})
 end
--- give tool back with wear preserved
-minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
-	if (itemstack:get_name() == "moretrees:coconut_milk") then
-		for i, j in pairs(old_craft_grid) do
-			-- find tool used to do the craft
-			local ocg_name = j:get_name()
-			if ((ocg_name ~= "") and (ocg_name ~= "moretrees:coconut") and (ocg_name ~= "vessels:drinking_glass")) then
-				-- create a new tool and set wear
-				local t = ItemStack(ocg_name)
-				local w = j:get_wear()
-				-- works if tool used is an axe
-				local uses = j:get_tool_capabilities().groupcaps.choppy.uses or 0
-				if (w == 0 and uses ~= 0) then
-					-- tool has never been used
-					-- use tool once
-					t:set_wear(65535/(9*(uses - 1)))
-				else
-					-- set wear back
-					t:set_wear(w)
-					-- use tool once
-					if (uses ~= 0) then
-						t:add_wear(65535/(9*(uses - 1)))
-					end
-				end
-				-- add to craft inventory
-				craft_inv:add_item("craft", t)
-			end
-		end
-  	end
-end)
 
 minetest.register_craft({
 	type = "shapeless",

mod.conf

@@ -1,4 +1 @@
 name = moretrees
-depends = default, biome_lib, vessels
-optional_depends = doors, stairs, moreblocks, intllib, farming
-min_minetest_version = 5.2.0

node_defs.lua

@@ -119,18 +119,6 @@ for i in ipairs(moretrees.treelist) do
 			},
 			groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
 			sounds = default.node_sound_defaults(),
-			on_place = function(itemstack, placer, pointed_thing)
-				itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
-					"moretrees:" ..treename.. "_sapling",
-					-- minp, maxp to be checked, relative to sapling pos
-					-- minp_relative.y = 1 because sapling pos has been checked
-					{x = -3, y = 1, z = -3},
-					{x = 3, y = 6, z = 3},
-					-- maximum interval of interior volume check
-					4)
-
-				return itemstack
-			end,
 		})
 
 		local moretrees_leaves_inventory_image = nil
@@ -273,19 +261,7 @@ for i in ipairs(moretrees.treelist) do
 		},
 		groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
 		sounds = default.node_sound_defaults(),
-		drop = "moretrees:"..treename.."_sapling",
-		on_place = function(itemstack, placer, pointed_thing)
-				itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
-					"moretrees:" ..treename.. "_sapling_ongen",
-					-- minp, maxp to be checked, relative to sapling pos
-					-- minp_relative.y = 1 because sapling pos has been checked
-					{x = -3, y = 1, z = -3},
-					{x = 3, y = 6, z = 3},
-					-- maximum interval of interior volume check
-					4)
-
-				return itemstack
-			end,
+		drop = "moretrees:"..treename.."_sapling"
 	})
 
 	local fruitname = nil
@@ -419,7 +395,8 @@ end
 -- we need our own copy of that node, which moretrees will match against.
 
 local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
-jungle_tree.drop = "default:jungletree"
+jungle_tree.drop = jungle_tree.drop or { items = {} }
+table.insert(jungle_tree.drop.items, { items = {"default:jungletree"}})
 minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
 
 default.register_leafdecay({