more items usable to smelt (#4184)

- group:bee_nest
- group:beehive
- mcl_cartography_table:cartography_table
- mcl_core:deadbush
- mcl_fletching_table:fletching_table
- mcl_lectern:lectern
- mcl_loom:loom
- mcl_mangrove:mangrove_roots
- mcl_smithing_table:table

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4184
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>

mods/ENTITIES/mcl_boats/init.lua

@@ -168,7 +168,7 @@ end
 
 
 function boat.on_activate(self, staticdata, dtime_s)
-	self.object:set_armor_groups({fleshy = 100})
+	self.object:set_armor_groups({fleshy = 125})
 	local data = minetest.deserialize(staticdata)
 	if type(data) == "table" then
 		self._v = data.v

mods/ENTITIES/mobs_mc/villager.lua

@@ -1989,6 +1989,17 @@ local trade_inventory = {
 					-- Otherwise, 20% chance to unlock if used freshly reset trade
 					unlock_stuff = true
 				end
+				-- calculate xp based on the price
+				local emeralds = 0
+				if wanted1:get_name() == "mcl_core:emerald" then
+					emeralds = wanted1:get_count()
+				elseif wanted2:get_name() == "mcl_core:emerald" then
+					emeralds = wanted2:get_count()
+				else
+					local offered = inv:get_stack("offered", 1)
+					emeralds = offered:get_name() == "mcl_core:emerald" and offered:get_count() or 0
+				end
+				local xp = 2 + math.ceil(emeralds / (64/4)) -- 1..64 emeralds = 3..6 xp
 				local update_formspec = false
 				if unlock_stuff then
 					-- First-time trade unlock all trades and unlock next trade tier
@@ -2000,6 +2011,7 @@ local trade_inventory = {
 						set_textures(trader)
 						update_max_tradenum(trader)
 						update_formspec = true
+						xp = xp + 5
 					end
 					for t=1, #trades do
 						trades[t].locked = false
@@ -2010,6 +2022,7 @@ local trade_inventory = {
 					-- TODO: Replace by Regeneration I
 					trader.health = math.min(trader.hp_max, trader.health + 4)
 				end
+				mcl_experience.add_xp(player, xp)
 				trade.trade_counter = trade.trade_counter + 1
 				mcl_log("Trade counter is: ".. trade.trade_counter)
 				-- Semi-randomly lock trade for repeated trade (not if there's only 1 trade)
@@ -2047,6 +2060,7 @@ local trade_inventory = {
 				if update_formspec then
 					show_trade_formspec(name, trader, tradenum)
 				end
+
 			else
 				minetest.log("error", "[mobs_mc] Player took item from trader output but player_trading_with or player_tradenum is nil!")
 			end

mods/ITEMS/mcl_beehives/init.lua

@@ -191,6 +191,18 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:bee_nest",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:beehive",
+	burntime = 15,
+})
+
 -- Temporary ABM to update honey levels
 minetest.register_abm({
 	label = "Update Beehive Honey Levels",

mods/ITEMS/mcl_cartography_table/init.lua

@@ -26,3 +26,9 @@ minetest.register_craft({
 		{ "group:wood", "group:wood", "" },
 	}
 })
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_cartography_table:cartography_table",
+	burntime = 15,
+})

mods/ITEMS/mcl_core/nodes_misc.lua

@@ -164,6 +164,12 @@ minetest.register_node("mcl_core:deadbush", {
 	_mcl_hardness = 0,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_core:deadbush",
+	burntime = 5,
+})
+
 minetest.register_node("mcl_core:barrier", {
 	description = S("Barrier"),
 	_doc_items_longdesc = S("Barriers are invisible walkable blocks. They are used to create boundaries of adventure maps and the like. Monsters and animals won't appear on barriers, and fences do not connect to barriers. Other blocks can be built on barriers like on any other block."),

mods/ITEMS/mcl_end/building.lua

@@ -74,6 +74,7 @@ local end_rod_def = {
 	light_source = minetest.LIGHT_MAX,
 	sunlight_propagates = true,
 	groups = { dig_immediate=3, deco_block=1, destroy_by_lava_flow=1, end_rod=1 },
+	use_texture_alpha = "clip",
 	selection_box = {
 		type = "fixed",
 		fixed = {
@@ -153,6 +154,7 @@ for num, row in ipairs(colored_end_rods) do
 	def.description = desc
 	def._doc_items_longdesc = nil
 	def._doc_items_create_entry = false
+	def.use_texture_alpha = "clip"
 	local side_tex
 	if name == "pink" then
 		def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. end_rod_mask .. "^[multiply:" .. name .. "^[hsl:0:300)"

mods/ITEMS/mcl_fletching_table/init.lua

@@ -24,3 +24,9 @@ minetest.register_craft({
 		{ "group:wood", "group:wood", "" },
 	}
 })
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_fletching_table:fletching_table",
+	burntime = 15,
+})

mods/ITEMS/mcl_flowers/init.lua

@@ -195,6 +195,7 @@ def_clover.tiles = { "mcl_flowers_clover.png" }
 def_clover.inventory_image = "mcl_flowers_clover_inv.png"
 def_clover.wield_image = "mcl_flowers_clover_inv.png"
 def_clover.drop = nil
+def_clover.use_texture_alpha = "clip"
 def_clover.selection_box = {
 	type = "fixed",
 	fixed = { -4/16, -0.5, -4/16, 4/16, 0, 4/16 },
@@ -210,6 +211,7 @@ def_4l_clover.mesh = "mcl_clover_4leaf.obj"
 def_4l_clover.tiles = { "mcl_flowers_fourleaf_clover.png" }
 def_4l_clover.inventory_image = "mcl_flowers_fourleaf_clover_inv.png"
 def_4l_clover.wield_image = "mcl_flowers_fourleaf_clover_inv.png"
+def_4l_clover.use_texture_alpha = "clip"
 
 minetest.register_node("mcl_flowers:fourleaf_clover", def_4l_clover)
 
@@ -268,6 +270,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 	end
 	-- Sunflower mesh and tiles
 	local top_drawtype, bottom_drawtype
+	local alpha = nil
 	local bottom_tiles = {}
 	if not mesh then
 		top_drawtype = "plantlike"
@@ -277,6 +280,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 		top_drawtype = "airlike"
 		bottom_drawtype = "mesh"
 		bottom_tiles = bottom_img
+		alpha = "clip"
 	end
 	-- Bottom
 	minetest.register_node("mcl_flowers:"..name, {
@@ -298,6 +302,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 		_mcl_shears_drop = shears_drop,
 		_mcl_fortune_drop = fortune_drop,
 		node_placement_prediction = "",
+		use_texture_alpha = alpha,
 		selection_box = {
 			type = "fixed",
 			fixed = { -selbox_radius, -0.5, -selbox_radius, selbox_radius, 0.5, selbox_radius },
@@ -397,6 +402,7 @@ local function add_large_plant(name, desc, longdesc, bottom_img, top_img, inv_im
 		palette = palette,
 		walkable = false,
 		buildable_to = false,
+		use_texture_alpha = alpha,
 		selection_box = {
 			type = "fixed",
 			fixed = { -selbox_radius, -0.5, -selbox_radius, selbox_radius, selbox_top_height, selbox_radius },

mods/ITEMS/mcl_lectern/init.lua

@@ -76,8 +76,7 @@ local lectern_def = {
 		if wdir == 0 then
 			return itemstack
 			-- IE., no Hanging Lecterns for you!
-		end
+		else
-		if wdir == 1 then
 			-- (only make standing nodes...)
 			-- Determine the rotation based on player's yaw
 			local yaw = pi * 2 - placer:get_look_horizontal()
@@ -136,5 +135,11 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_lectern:lectern",
+	burntime = 15,
+})
+
 -- Base Aliases.
 minetest.register_alias("lectern", "mcl_lectern:lectern")

mods/ITEMS/mcl_loom/init.lua

@@ -26,3 +26,9 @@ minetest.register_craft({
 		{ "group:wood", "group:wood", "" },
 	}
 })
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_loom:loom",
+	burntime = 15,
+})

mods/ITEMS/mcl_mangrove/init.lua

@@ -426,6 +426,12 @@ minetest.register_craft({
 	burntime = 15,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_mangrove:mangrove_roots",
+	burntime = 15,
+})
+
 local adjacents = {
 	vector.new(1,0,0),
 	vector.new(-1,0,0),

mods/ITEMS/mcl_smithing_table/init.lua

@@ -257,6 +257,12 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "mcl_smithing_table:table",
+	burntime = 15,
+})
+
 -- this is the exact same as mcl_smithing_table.upgrade_item_netherite , in case something relies on the old function
 function mcl_smithing_table.upgrade_item(itemstack)
 	return mcl_smithing_table.upgrade_item_netherite(itemstack)

mods/ITEMS/vl_hollow_logs/API.md

@@ -1,28 +0,0 @@
-# ```vl_hollow_logs```
-
-This mod registers hollow logs derived from normal logs.
-Hollow logs mostly have a decorative function, but some of them can be used in recipes. Changes may appear soon.
-
-## Functions:
-### ```vl_hollow_logs.register_hollow_log(defs)```
-This is the function that registers the hollow trunk.
-For a hollow log to be registered, the <span style="color:firebrick"> defs </span> parameter must be a table that contains up to 5 values, which are, in this order, the <span style="color:firebrick"> itemstring </span>  of the hollow log, the <span style="color:firebrick"> itemstring </span>  of the stripped hollow log, the <span style="color:firebrick"> description </span>  of the hollow log, the <span style="color:firebrick"> description </span>  of the stripped hollow log and, optionally, a <span style="color:turquoise"> boolean </span>  to inform whether this trunk is NOT flammable. If the hollow log is defined as flammable, it becomes part of the <span style="color:springgreen"> hollow_log_flammable </span> group, which allows the log to be used as fuel for furnaces and also allows it to be an ingredient for chacoal.
-
-Examples:
-```lua
--- Flammable
-{"tree", "stripped_oak", "Hollow Oak Log", "Stripped Hollow Oak Log"}
-
--- Not flammable
-{"crimson_hyphae", "stripped_crimson_hyphae", "Hollow Crimson Stem", "Stripped Hollow Crimson Stem", true}
-```
-### ```vl_hollow_logs.register_craft(material, result)```
-
-This function records the crafting recipe for a hollow log based on its non-hollow variant.
-This function also defines a recipe for the stonecutter. The <span style="color:firebrick"> material </span>  and <span style="color:firebrick"> result </span>  parameters must be, respectively, the <span style="color:firebrick"> complete itemstring </span>  of the source material and the (partial) <span style="color:firebrick"> itemstring </span>  of the result. See the following examples:
-
-```lua
-vl_hollow_logs.register_craft("mcl_core:tree", "tree")
-
-vl_hollow_logs.register_craft("mcl_crimson:stripped_crimson_hyphae", "stripped_crimson_hyphae")
-```

mods/ITEMS/vl_hollow_logs/init.lua

@@ -1,108 +0,0 @@
-local modpath = minetest.get_modpath(minetest.get_current_modname())
-local S = minetest.get_translator(minetest.get_current_modname())
-
-vl_hollow_logs = {}
---- Function to register a hollow log. See API.md to learn how to use this function.
----@param defs table {name:string, stripped_name>string, desc:string, stripped_desc:string, not_flammable:boolean|nil}
-function vl_hollow_logs.register_hollow_log(defs)
-	if not defs or #defs < 4 then
-		error("Incomplete definition provided")
-	end
-
-	for i = 1, #defs do
-		if i == 5 then
-			if type(defs[i]) ~= "boolean" and type(defs[i]) ~= "nil" then
-				error("Invalid arg #5")
-			end
-		else
-			if type(defs[i]) ~= "string" then
-				error("Invalid arg #".. tostring(i))
-			end
-		end
-	end
-
-	local name = defs[1]
-	local stripped_name = defs[2]
-	local desc = defs[3]
-	local stripped_desc = defs[4]
-
-	local collisionbox = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 0.5, -0.375},
-			{-0.5, -0.5, -0.5, -0.375, 0.5, 0.5},
-			{0.375, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.5, -0.5, 0.375, 0.5, 0.5, 0.5},
-		}
-	}
-
-	local groups = {axey = 1, building_block = 1, handy = 1, hollow_log = 1}
-
-	if not defs[5] then
-		groups = table.insert(groups, {fire_encouragement = 5, fire_flammability = 5, flammable = 2, hollow_log_burnable = 1})
-	end
-
-	minetest.register_node("vl_hollow_logs:"..name.."_hollow", {
-		collision_box = collisionbox,
-		description = S(desc),
-		drawtype = "mesh",
-		groups = groups,
-		mesh = "vl_hollow_logs_log.obj",
-		on_place = mcl_util.rotate_axis,
-		paramtype = "light",
-		paramtype2 = "facedir",
-		use_texture_alpha = "clip",
-		sounds = mcl_sounds.node_sound_wood_defaults(),
-		sunlight_propagates = true,
-		tiles = {"vl_hollow_logs_"..name..".png"},
-		_mcl_blast_resistance = 2,
-		_mcl_hardness = 2,
-		_mcl_stripped_variant = "vl_hollow_logs:stripped_"..name.."_hollow"
-	})
-
-	minetest.register_node("vl_hollow_logs:"..stripped_name.."_hollow", {
-		collision_box = collisionbox,
-		description = S(stripped_desc),
-		drawtype = "mesh",
-		groups = groups,
-		mesh = "vl_hollow_logs_log.obj",
-		on_place = mcl_util.rotate_axis,
-		paramtype = "light",
-		paramtype2 = "facedir",
-		use_texture_alpha = "clip",
-		sounds = mcl_sounds.node_sound_wood_defaults(),
-		sunlight_propagates = true,
-		tiles = {"vl_hollow_logs_stripped_"..name..".png"},
-		_mcl_blast_resistance = 2,
-		_mcl_hardness = 2
-	})
-end
-
-vl_hollow_logs.logs = {
-	{"acaciatree", "stripped_acacia", "Hollow Acacia Log", "Stripped Hollow Acacia Log"},
-	{"birchtree", "stripped_birch", "Hollow Birch Log", "Stripped Hollow Birch Log"},
-	{"darktree", "stripped_dark_oak", "Hollow Dark Oak Log", "Stripped Hollow Dark Oak Log"},
-	{"jungletree", "stripped_jungle", "Hollow Jungle Log", "Stripped Hollow Jungle Log"},
-	{"sprucetree", "stripped_spruce", "Hollow Spruce Log", "Stripped Hollow Spruce Log"},
-	{"tree", "stripped_oak", "Hollow Oak Log", "Stripped Hollow Oak Log"}
-}
-
-
-if minetest.get_modpath("mcl_cherry_blossom") then
-	table.insert(vl_hollow_logs.logs, {"cherrytree", "stripped_cherrytree", "Hollow Cherry Log", "Stripped Hollow Cherry Log"})
-end
-
-if minetest.get_modpath("mcl_mangrove") then
-	table.insert(vl_hollow_logs.logs, {"mangrove_tree", "mangrove_stripped", "Hollow Mangrove Log", "Stripped Hollow Mangrove Log"})
-end
-
-if minetest.get_modpath("mcl_crimson") then
-	table.insert(vl_hollow_logs.logs, {"crimson_hyphae", "stripped_crimson_hyphae", "Hollow Crimson Stem", "Stripped Hollow Crimson Stem", true})
-	table.insert(vl_hollow_logs.logs, {"warped_hyphae", "stripped_warped_hyphae", "Hollow Warped Stem", "Stripped Hollow Warped Stem", true})
-end
-
-for _, defs in pairs(vl_hollow_logs.logs) do
-	vl_hollow_logs.register_hollow_log(defs)
-end
-
-dofile(modpath.."/recipes.lua")

mods/ITEMS/vl_hollow_logs/locale/template.txt

@@ -1,21 +0,0 @@
-# textdomain: mcl_hollow_logs
-Hollow Acacia Log=
-Hollow Birch Log=
-Hollow Cherry Log=
-Hollow Dark Oak Log=
-Hollow Jungle Log=
-Hollow Mangrove Log=
-Hollow Oak Log=
-Hollow Spruce Log=
-Hollow Crimson Stem=
-Hollow Warped Stem=
-Stripped Hollow Acacia Log=
-Stripped Hollow Birch Log=
-Stripped Hollow Cherry Log=
-Stripped Hollow Dark Oak Log=
-Stripped Hollow Jungle Log=
-Stripped Hollow Mangrove Log=
-Stripped Hollow Oak Log=
-Stripped Hollow Spruce Log=
-Stripped Hollow Crimson Stem=
-Stripped Hollow Warped Stem=

mods/ITEMS/vl_hollow_logs/locale/vl_hollow_logs.pt_BR.tr

@@ -1,21 +0,0 @@
-# textdomain: mcl_hollow_logs
-Hollow Acacia Log=Tronco Oco de Acácia
-Hollow Birch Log=Tronco Oco de Bétula
-Hollow Cherry Log=Tronco Oco de Cerejeira
-Hollow Dark Oak Log=Tronco Oco de Carvalho Escuro
-Hollow Jungle Log=Tronco Oco da Selva
-Hollow Mangrove Log=Tronco Oco de Mangue
-Hollow Oak Log=Tronco Oco de Carvalho
-Hollow Spruce Log=Tronco Oco de Pinheiro
-Hollow Crimson Stem=Caule Oco Carmesim
-Hollow Warped Stem=Caule Oco Distorcido
-Stripped Hollow Acacia Log=Tronco Oco Descascado de Acácia
-Stripped Hollow Birch Log=Tronco Oco Descascado de Bétula
-Stripped Hollow Cherry Log=Tronco Oco Descascado de Cerejeira
-Stripped Hollow Dark Oak Log=Tronco Oco Descascado de Carvalho Escuro
-Stripped Hollow Jungle Log=Tronco Oco Descascado da Selva
-Stripped Hollow Mangrove Log=Tronco Oco Descascado de Mangue
-Stripped Hollow Oak Log=Tronco Oco Descascado de Carvalho
-Stripped Hollow Spruce Log=Tronco Oco Descascado de Pinheiro
-Stripped Hollow Crimson Stem=Caule Oco Descascado Carmesim
-Stripped Hollow Warped Stem=Caule Oco Descascado Distorcido

mods/ITEMS/vl_hollow_logs/mod.conf

@@ -1,4 +0,0 @@
-name = vl_hollow_logs
-depends = mcl_core, mcl_sounds, mcl_util
-optional_depends = mcl_cherry_blossom, mcl_crimson, mcl_mangrove
-author = JoseDouglas26

mods/ITEMS/vl_hollow_logs/models/vl_hollow_logs_log.obj

@@ -1,54 +0,0 @@
-# Blender 3.6.7
-# www.blender.org
-o hollow_log
-v -0.312500 -0.500000 0.312500
-v -0.312500 0.500000 0.312500
-v -0.312500 -0.500000 -0.312500
-v -0.312500 0.500000 -0.312500
-v 0.312500 -0.500000 0.312500
-v 0.312500 0.500000 0.312500
-v 0.312500 -0.500000 -0.312500
-v 0.312500 0.500000 -0.312500
-v -0.500000 -0.500000 -0.500000
-v -0.500000 -0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v 0.500000 0.500000 0.500000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -0.0000 -1.0000 -0.0000
-vn -0.0000 1.0000 -0.0000
-vt 0.380952 0.000000
-vt 0.380952 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.619048 0.000000
-vt 0.619048 1.000000
-vt 0.928571 0.187500
-vt 0.928571 0.812500
-vt 1.000000 1.000000
-vt 1.000000 -0.000000
-vt 0.690476 0.187500
-vt 0.690476 0.812500
-s 0
-f 10/1/1 11/2/1 12/3/1 9/4/1
-f 9/1/2 12/2/2 14/3/2 13/4/2
-f 13/1/3 14/2/3 16/3/3 15/4/3
-f 15/1/4 16/2/4 11/3/4 10/4/4
-f 7/5/4 8/6/4 4/2/4 3/1/4
-f 5/5/1 6/6/1 8/2/1 7/1/1
-f 3/7/5 1/8/5 10/9/5 9/10/5
-f 2/8/6 4/7/6 12/10/6 11/9/6
-f 7/11/5 3/7/5 9/10/5 13/5/5
-f 4/7/6 8/11/6 14/5/6 12/10/6
-f 5/12/5 7/11/5 13/5/5 15/6/5
-f 8/11/6 6/12/6 16/6/6 14/5/6
-f 1/8/5 5/12/5 15/6/5 10/9/5
-f 6/12/6 2/8/6 11/9/6 16/6/6
-f 3/5/3 4/6/3 2/2/3 1/1/3
-f 1/5/2 2/6/2 6/2/2 5/1/2

mods/ITEMS/vl_hollow_logs/recipes.lua

@@ -1,48 +0,0 @@
-function vl_hollow_logs.register_craft(material, result)
-	minetest.register_craft({
-		output = "vl_hollow_logs:"..result.."_hollow 4",
-		recipe = {
-			{"",  material, ""},
-			{material, "", material},
-			{"", material, ""}
-		},
-		type = "shaped"
-	})
-
-	mcl_stonecutter.register_recipe(material, "vl_hollow_logs:"..result.."_hollow", 1)
-end
-
-for _, defs in pairs(vl_hollow_logs.logs) do
-	local mod, material, stripped_material
-	local name = defs[1]
-	local stripped_name = defs[2]
-
-	if name:find("cherry") then
-		mod = "mcl_cherry_blossom:"
-	elseif name:find("mangrove") then
-		mod = "mcl_mangrove:"
-	elseif name:find("hyphae") then
-		mod = "mcl_crimson:"
-	else
-		mod = "mcl_core:"
-	end
-
-	material = mod..name
-	stripped_material = mod..stripped_name
-
-	vl_hollow_logs.register_craft(material, name)
-	vl_hollow_logs.register_craft(stripped_material, stripped_name)
-end
-
-minetest.register_craft({
-	burntime = 10,
-	recipe = "group:hollow_log_burnable",
-	type = "fuel",
-})
-
-minetest.register_craft({
-	cooktime = 5,
-	output = "mcl_core:charcoal_lump",
-	recipe = "group:hollow_log_burnable",
-	type = "cooking"
-})