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/HELP/tt/init.lua

@@ -76,6 +76,7 @@ function tt.reload_itemstack_description(itemstack)
 			orig_desc = minetest.colorize(tt.NAME_COLOR, meta:get_string("name"))
 		end
 		local desc = apply_snippets(orig_desc, itemstring, toolcaps or def.tool_capabilities, itemstack)
+		if desc == def.description and meta:get_string("description") == "" then return end
 		meta:set_string("description", desc)
 	end
 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)

tools/Conversion_Table.csv

@@ -1151,15 +1151,28 @@ Source path,Source file,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,redstone_dust_line1.png,redstone_redstone_dust_line1.png,,,,,,,
 /assets/minecraft/textures/block,attached_melon_stem.png,mcl_farming_melon_stem_connected.png,,,,,,,
 /assets/minecraft/textures/block,melon_stem.png,mcl_farming_melon_stem_disconnected.png,,,,,,,
-/assets/minecraft/textures/entity/signs,acacia.png,mcl_signs_sign_acacia.png,,,,,,,
+/assets/minecraft/textures/entity/signs,acacia.png,mcl_signs_acacia_sign.png,,,,,,,
 /assets/minecraft/textures/entity/signs,bamboo.png,mcl_bamboo_bamboo_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,birch.png,mcl_signs_birch_sign.png,,,,,,,
 /assets/minecraft/textures/entity/signs,cherry.png,mcl_cherry_blossom_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,crimson.png,mcl_signs_crimson_sign.png,,,,,,,
 /assets/minecraft/textures/entity/signs,dark_oak.png,mcl_signs_sign_dark.png,,,,,,,
+/assets/minecraft/textures/entity/signs,jungle.png,mcl_signs_jungle_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,mangrove.png,mcl_signs_mangrove_sign.png,,,,,,,
 /assets/minecraft/textures/entity/signs,oak.png,mcl_signs_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,spruce.png,mcl_signs_spruce_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,warped.png,mcl_signs_warped_sign.png,,,,,,,
+/assets/minecraft/textures/item,acacia_sign.png,mcl_signs_acacia_sign_inv.png,,,,,,,
 /assets/minecraft/textures/item,bamboo_sign.png,mcl_bamboo_bamboo_sign_wield.png,,,,,,,
-/assets/minecraft/textures/item,cherry_sign.png,mcl_cherry_blossom_sign_inv.png,,,,,,,
+/assets/minecraft/textures/item,birch_sign.png,mcl_signs_birch_sign_inv.png,,,,,,,
-/assets/minecraft/textures/item,dark_oak_sign.png,mcl_signs_default_sign_dark.png,,,,,,,
+/assets/minecraft/textures/item,cherry_sign.png,mcl_cherry_blossom_inv.png,,,,,,,
+/assets/minecraft/textures/item,crimson_sign.png,mcl_signs_crimson_sign_inv.png,,,,,,,
+/assets/minecraft/textures/item,dark_oak_sign.png,mcl_signs_default_dark.png,,,,,,,
+/assets/minecraft/textures/item,jungle_sign.png,mcl_signs_jungle_sign_inv.png,,,,,,,
+/assets/minecraft/textures/item,mangrove_sign.png,mcl_signs_mangrove_sign_inv.png,,,,,,,
 /assets/minecraft/textures/item,oak_sign.png,mcl_signs_default_sign.png,,,,,,,
+/assets/minecraft/textures/item,spruce_sign.png,mcl_signs_spruce_sign_inv.png,,,,,,,
+/assets/minecraft/textures/item,warped_sign.png,mcl_signs_warped_sign_inv.png,,,,,,,
 /assets/minecraft/textures/entity,banner_base.png,mcl_banners_banner_base.png,,,,,,,
 /assets/minecraft/textures/entity/banner,base.png,mcl_banners_base.png,,,,,,,
 /assets/minecraft/textures/block,nether_portal.png,mcl_portals_portal.png,,,,,,,

tools/libtextureconverter/convert.py

@@ -122,6 +122,9 @@ def convert_textures(make_texture_pack, dry_run, verbose, base_dir, tex_dir, tem
 		description_file.write(description)
 		description_file.close()
 
+		# Create override file
+		shutil.copyfile("override.txt", target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/override.txt")
+
 		# Create preview image (screenshot.png)
 		os.system("convert -size 300x200 canvas:transparent "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png")
 		os.system("composite "+base_dir+"/pack.png "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png -gravity center "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png")

tools/override.txt

@@ -0,0 +1,57 @@
+Signs:
+
+mcl_signs:wall_sign_warped_hyphae_wood inventory mcl_signs_warped_sign_inv.png
+mcl_signs:wall_sign_warped_hyphae_wood wield mcl_signs_warped_sign_inv.png
+mcl_signs:wall_sign_warped_hyphae_wood all mcl_signs_warped_sign.png
+mcl_signs:standing_sign_warped_hyphae_wood all mcl_signs_warped_sign.png
+mcl_signs:standing_sign22_5_warped_hyphae_wood all mcl_signs_warped_sign.png
+mcl_signs:standing_sign45_warped_hyphae_wood all mcl_signs_warped_sign.png
+mcl_signs:standing_sign67_5_warped_hyphae_wood all mcl_signs_warped_sign.png
+
+mcl_signs:wall_sign_c	rimson_hyphae_wood inventory mcl_signs_crimson_sign_inv.png
+mcl_signs:wall_sign_crimson_hyphae_wood wield mcl_signs_crimson_sign_inv.png
+mcl_signs:wall_sign_crimson_hyphae_wood all mcl_signs_crimson_sign.png
+mcl_signs:standing_sign_crimson_hyphae_wood all mcl_signs_crimson_sign.png
+mcl_signs:standing_sign22_5_crimson_hyphae_wood all mcl_signs_crimson_sign.png
+mcl_signs:standing_sign45_crimson_hyphae_wood all mcl_signs_crimson_sign.png
+mcl_signs:standing_sign67_5_crimson_hyphae_wood all mcl_signs_crimson_sign.png
+
+mcl_signs:wall_sign_acaciawood inventory mcl_signs_acacia_sign_inv.png
+mcl_signs:wall_sign_acaciawood wield mcl_signs_acacia_sign_inv.png
+mcl_signs:wall_sign_acaciawood all mcl_signs_acacia_sign.png
+mcl_signs:standing_sign_acaciawood all mcl_signs_acacia_sign.png
+mcl_signs:standing_sign22_5_acaciawood all mcl_signs_acacia_sign.png
+mcl_signs:standing_sign45_acaciawood all mcl_signs_acacia_sign.png
+mcl_signs:standing_sign67_5_acaciawood all mcl_signs_acacia_sign.png
+
+mcl_signs:wall_sign_birchwood inventory mcl_signs_birch_sign_inv.png
+mcl_signs:wall_sign_birchwood wield mcl_signs_birch_sign_inv.png
+mcl_signs:wall_sign_birchwood all mcl_signs_birch_sign.png
+mcl_signs:standing_sign_birchwood all mcl_signs_birch_sign.png
+mcl_signs:standing_sign22_5_birchwood all mcl_signs_birch_sign.png
+mcl_signs:standing_sign45_birchwood all mcl_signs_birch_sign.png
+mcl_signs:standing_sign67_5_birchwood all mcl_signs_birch_sign.png
+
+mcl_signs:wall_sign_junglewood inventory mcl_signs_jungle_sign_inv.png
+mcl_signs:wall_sign_junglewood wield mcl_signs_jungle_sign_inv.png
+mcl_signs:wall_sign_junglewood all mcl_signs_jungle_sign.png
+mcl_signs:standing_sign_junglewood all mcl_signs_jungle_sign.png
+mcl_signs:standing_sign22_5_junglewood all mcl_signs_jungle_sign.png
+mcl_signs:standing_sign45_junglewood all mcl_signs_jungle_sign.png
+mcl_signs:standing_sign67_5_junglewood all mcl_signs_jungle_sign.png
+
+mcl_signs:wall_sign_mangrove_wood inventory mcl_signs_mangrove_sign_inv.png
+mcl_signs:wall_sign_mangrove_wood wield mcl_signs_mangrove_sign_inv.png
+mcl_signs:wall_sign_mangrove_wood all mcl_signs_mangrove_sign.png
+mcl_signs:standing_sign_mangrove_wood all mcl_signs_mangrove_sign.png
+mcl_signs:standing_sign22_5_mangrove_wood all mcl_signs_mangrove_sign.png
+mcl_signs:standing_sign45_mangrove_wood all mcl_signs_mangrove_sign.png
+mcl_signs:standing_sign67_5_mangrove_wood all mcl_signs_mangrove_sign.png
+
+mcl_signs:wall_sign_sprucewood inventory mcl_signs_spruce_sign_inv.png
+mcl_signs:wall_sign_sprucewood wield mcl_signs_spruce_sign_inv.png
+mcl_signs:wall_sign_sprucewood all mcl_signs_spruce_sign.png
+mcl_signs:standing_sign_sprucewood all mcl_signs_spruce_sign.png
+mcl_signs:standing_sign22_5_sprucewood all mcl_signs_spruce_sign.png
+mcl_signs:standing_sign45_sprucewood all mcl_signs_spruce_sign.png
+mcl_signs:standing_sign67_5_sprucewood all mcl_signs_spruce_sign.png