Added spears

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 = 125})
+	self.object:set_armor_groups({fleshy = 100})
 	local data = minetest.deserialize(staticdata)
 	if type(data) == "table" then
 		self._v = data.v

mods/ENTITIES/mcl_item_entity/init.lua

@@ -6,6 +6,9 @@ local pool = {}
 
 local tick = false
 
+
+
+
 minetest.register_on_joinplayer(function(player)
 	pool[player:get_player_name()] = 0
 end)
@@ -169,17 +172,17 @@ minetest.register_globalstep(function(_)
 
 			local pos = player:get_pos()
 
-			if tick == true and (pool[name] or 0) > 0 then
+			if tick == true and pool[name] > 0 then
 				minetest.sound_play("item_drop_pickup", {
 					pos = pos,
 					gain = 0.3,
 					max_hear_distance = 16,
 					pitch = math.random(70, 110) / 100
 				})
-				if (pool[name] or 0) > 6 then
+				if pool[name] > 6 then
 					pool[name] = 6
 				else
-					pool[name] = (pool[name] or 1) - 1
+					pool[name] = pool[name] - 1
 				end
 			end
 

mods/ENTITIES/mcl_mobs/combat.lua

@@ -524,10 +524,11 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 	local is_player = hitter:is_player()
 	local mob_pos = self.object:get_pos()
 	local player_pos = hitter:get_pos()
+	local weapon = hitter:get_wielded_item()
 
 	if is_player then
 		-- is mob out of reach?
-		if vector.distance(mob_pos, player_pos) > 3 then
+		if vector.distance(mob_pos, player_pos) > (weapon:get_definition().range or 3) then
 			return
 		end
 		-- is mob protected?
@@ -572,7 +573,6 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 
 
 	-- punch interval
-	local weapon = hitter:get_wielded_item()
 	local punch_interval = 1.4
 
 	-- exhaust attacker
@@ -725,6 +725,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
 			if hitter and is_player then
 				local wielditem = hitter:get_wielded_item()
 				kb = kb + 9 * mcl_enchanting.get_enchantment(wielditem, "knockback")
+				kb = kb + 9 * minetest.get_item_group(wielditem:get_name(), "hammer")
 				-- add player velocity to mob knockback
 				local hv = hitter:get_velocity()
 				local dir_dot = (hv.x * dir.x) + (hv.z * dir.z)

mods/ENTITIES/mcl_mobs/init.lua

@@ -374,7 +374,7 @@ function mcl_mobs.register_arrow(name, def)
 		rotate = def.rotate,
 		on_punch = def.on_punch or function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
 			local vel = self.object:get_velocity():length()
-			self.object:set_velocity(dir * vel)
+			self.object:set_velocity({x=dir.x * vel, y=dir.y * vel, z=dir.z * vel})
 			self._puncher = puncher
 		end,
 		collisionbox = def.collisionbox or {0, 0, 0, 0, 0, 0},

mods/ENTITIES/mcl_mobs/items.lua

@@ -87,8 +87,7 @@ function mob_class:check_item_pickup()
 				end
 				if self.pick_up then
 					for k,v in pairs(self.pick_up) do
-						local itemstack = ItemStack(l.itemstring)
-						if not player_near(p) and self.on_pick_up and itemstack:get_name():find(v) then
+						if not player_near(p) and self.on_pick_up and l.itemstring:find(v) then
 							local r =  self.on_pick_up(self,l)
 							if  r and r.is_empty and not r:is_empty() then
 								l.itemstring = r:to_string()

mods/ENTITIES/mobs_mc/ghast.lua

@@ -126,14 +126,13 @@ mcl_mobs.register_arrow("mobs_mc:fireball", {
 	end,
 
 	hit_mob = function(self, mob)
-		local name = mob:get_luaentity().name
 		mob:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 6},
 		}, nil)
 		mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1, true)
 		local ent = mob:get_luaentity()
-		if (not ent or ent.health <= 0) and self._puncher and name == "mobs_mc:ghast" then
+		if not ent or ent.health <= 0 then
 			awards.unlock(self._puncher:get_player_name(), "mcl:fireball_redir_serv")
 		end
 	end,

mods/ENTITIES/mobs_mc/horse.lua

@@ -122,10 +122,10 @@ local horse = {
 		stand_speed = 25,
 		stand_start = 0,
 		stand_end = 0,
-		walk_speed = 100,
+		walk_speed = 25,
 		walk_start = 0,
 		walk_end = 40,
-		run_speed = 200,
+		run_speed = 60,
 		run_start = 0,
 		run_end = 40,
 	},
@@ -543,6 +543,11 @@ donkey.description = S("Donkey")
 donkey.textures = {{"blank.png", "mobs_mc_donkey.png", "blank.png"}}
 donkey.spawn_in_group = 3
 donkey.spawn_in_group_min = 1
+donkey.animation = {
+	speed_normal = 25,
+	stand_start = 0, stand_end = 0,
+	walk_start = 0, walk_end = 40,
+}
 donkey.sounds = {
 	random = "mobs_mc_donkey_random",
 	damage = "mobs_mc_donkey_hurt",

mods/ENTITIES/mobs_mc/villager.lua

@@ -1989,17 +1989,6 @@ 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
@@ -2011,7 +2000,6 @@ 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
@@ -2022,7 +2010,6 @@ 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)
@@ -2060,7 +2047,6 @@ 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/mcl_craftguide/init.lua

@@ -106,31 +106,6 @@ local item_lists = {
 	"craftpreview",
 }
 
-local function init_data(name)
-	player_data[name] = {
-		filter  = "",
-		pagenum = 1,
-		iX      = sfinv_only and 8 or DEFAULT_SIZE,
-		items   = init_items,
-		items_raw = init_items,
-		lang_code = M.get_player_information(name).lang_code or 'en',
-	}
-end
-local function get_player_data(name)
-	-- If the data alrady exists, use it
-	local data = player_data[name]
-	if data then return data end
-
-	-- Initialize player data if it doesn't exist
-	init_data(name)
-	local player = minetest.get_player_by_name(name)
-	local meta = player:get_meta()
-	local data = player_data[name]
-
-	data.inv_items = deserialize(meta:get_string("inv_items")) or {}
-	return data
-end
-
 local function table_merge(t, t2)
 	t, t2 = t or {}, t2 or {}
 	local c = #t
@@ -649,7 +624,7 @@ local function get_recipe_fs(data, iY)
 end
 
 local function make_formspec(name)
-	local data = get_player_data(name)
+	local data = player_data[name]
 	local iY = sfinv_only and 4 or data.iX - 5
 	local ipp = data.iX * iY
 
@@ -856,6 +831,17 @@ local function get_inv_items(player)
 	return inv_items
 end
 
+local function init_data(name)
+	player_data[name] = {
+		filter  = "",
+		pagenum = 1,
+		iX      = sfinv_only and 8 or DEFAULT_SIZE,
+		items   = init_items,
+		items_raw = init_items,
+		lang_code = M.get_player_information(name).lang_code or 'en',
+	}
+end
+
 local function reset_data(data)
 	data.filter      = ""
 	data.pagenum     = 1
@@ -891,7 +877,7 @@ end
 
 local function on_receive_fields(player, fields)
 	local name = player:get_player_name()
-	local data = get_player_data(name)
+	local data = player_data[name]
 
 	for elem_name, def in pairs(formspec_elements) do
 		if fields[elem_name] and def.action then
@@ -995,7 +981,7 @@ if sfinv_only then
 		on_enter = function(self, player, context)
 			if next(recipe_filters) then
 				local name = player:get_player_name()
-				local data = get_player_data(name)
+				local data = player_data[name]
 
 				data.items_raw = get_filtered_items(player)
 				search(data)
@@ -1019,7 +1005,7 @@ else
 		local name = user:get_player_name()
 
 		if next(recipe_filters) then
-			local data = get_player_data(name)
+			local data = player_data[name]
 			data.items_raw = get_filtered_items(user)
 			search(data)
 		end
@@ -1065,7 +1051,7 @@ if progressive_mode then
 
 	local function progressive_filter(recipes, player)
 		local name = player:get_player_name()
-		local data = get_player_data(name)
+		local data = player_data[name]
 
 		if #data.inv_items == 0 then
 			return {}
@@ -1090,7 +1076,7 @@ if progressive_mode then
 		for i = 1, #players do
 			local player = players[i]
 			local name   = player:get_player_name()
-			local data   = get_player_data(name)
+			local data   = player_data[name]
 			local inv_items = get_inv_items(player)
 			local diff      = table_diff(inv_items, data.inv_items)
 
@@ -1109,7 +1095,12 @@ if progressive_mode then
 	mcl_craftguide.add_recipe_filter("Default progressive filter", progressive_filter)
 
 	M.register_on_joinplayer(function(player)
-		get_player_data(player:get_player_name())
+		local name = player:get_player_name()
+		init_data(name)
+		local meta = player:get_meta()
+		local data = player_data[name]
+
+		data.inv_items = deserialize(meta:get_string("inv_items")) or {}
 	end)
 
 	local function save_meta(player)
@@ -1154,7 +1145,7 @@ end
 function mcl_craftguide.show(name)
 	local player = get_player_by_name(name)
 	if next(recipe_filters) then
-		local data = get_player_data(name)
+		local data = player_data[name]
 		data.items_raw = get_filtered_items(player)
 		search(data)
 	end

mods/HELP/tt/init.lua

@@ -76,7 +76,6 @@ 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/HUD/mcl_inventory/survival.lua

@@ -36,14 +36,9 @@ function mcl_inventory.register_survival_inventory_tab(def)
 end
 
 local player_current_tab = {}
-function get_player_tab(player)
-	local tab = player_current_tab[player] or "main"
-	player_current_tab[player] = tab
-	return tab
-end
 
 minetest.register_on_joinplayer(function(player, last_login)
-	get_player_tab(player)
+	player_current_tab[player] = "main"
 end)
 
 minetest.register_on_leaveplayer(function(player, timed_out)
@@ -189,7 +184,7 @@ function mcl_inventory.build_survival_formspec(player)
 	inv:set_width("craft", 2)
 	inv:set_size("craft", 4)
 
-	local tab = get_player_tab(player)
+	local tab = player_current_tab[player]
 
 	local tab_def = nil
 
@@ -218,7 +213,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 
 		for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do
-			if get_player_tab(player) == d.id and d.access(player) then
+			if player_current_tab[player] == d.id and d.access(player) then
 				d.handle(player, fields)
 				return
 			end

mods/HUD/mcl_offhand/init.lua

@@ -16,31 +16,19 @@ local function offhand_get_count(player)
 	return mcl_offhand.get_offhand(player):get_count()
 end
 
-local function get_offhand(player)
-	-- Get offhand data if it already exists
-	local offhand = mcl_offhand[player]
-	if offhand then return offhand end
-
-	-- Otherwise initialize it
-	offhand = {
+minetest.register_on_joinplayer(function(player, last_login)
+	mcl_offhand[player] = {
 		hud = {},
 		last_wear = offhand_get_wear(player),
 		last_count = offhand_get_count(player),
 	}
-	mcl_offhand[player] = offhand
-	return offhand
-end
-
-minetest.register_on_joinplayer(function(player, last_login)
-	get_offhand(player)
 end)
 
 local function remove_hud(player, hud)
-	local offhand = get_offhand(player)
-	local offhand_hud = offhand.hud[hud]
+	local offhand_hud = mcl_offhand[player].hud[hud]
 	if offhand_hud then
 		player:hud_remove(offhand_hud)
-		offhand.hud[hud] = nil
+		mcl_offhand[player].hud[hud] = nil
 	end
 end
 
@@ -60,8 +48,7 @@ local function update_wear_bar(player, itemstack)
 	else
 		color = {255, 511 - wear_i, 0}
 	end
-	local offhand = get_offhand(player)
-	local wear_bar = offhand.hud.wear_bar
+	local wear_bar = mcl_offhand[player].hud.wear_bar
 	player:hud_change(wear_bar, "text", "mcl_wear_bar.png^[colorize:#" .. rgb_to_hex(color[1], color[2], color[3]))
 	player:hud_change(wear_bar, "scale", {x = 40 * wear_bar_percent, y = 3})
 	player:hud_change(wear_bar, "offset", {x = -320 - (20 - player:hud_get(wear_bar).scale.x / 2), y = -13})
@@ -71,8 +58,7 @@ minetest.register_globalstep(function(dtime)
 	for _, player in pairs(minetest.get_connected_players()) do
 		local itemstack = mcl_offhand.get_offhand(player)
 		local offhand_item = itemstack:get_name()
-		local offhand = get_offhand(player)
-		local offhand_hud = offhand.hud
+		local offhand_hud = mcl_offhand[player].hud
 		local item = minetest.registered_items[offhand_item]
 		if offhand_item ~= "" and item then
 			local item_texture = item.inventory_image .. "^[resize:" .. max_offhand_px .. "x" .. max_offhand_px
@@ -159,8 +145,7 @@ minetest.register_globalstep(function(dtime)
 			end
 
 		elseif offhand_hud.slot then
-			local offhand = get_offhand(player)
-			for index, _ in pairs(offhand.hud) do
+			for index, _ in pairs(mcl_offhand[player].hud) do
 				remove_hud(player, index)
 			end
 		end

mods/ITEMS/mcl_beds/functions.lua

@@ -8,7 +8,7 @@ local is_sp = minetest.is_singleplayer()
 local weather_mod = minetest.get_modpath("mcl_weather")
 local explosions_mod = minetest.get_modpath("mcl_explosions")
 local spawn_mod = minetest.get_modpath("mcl_spawn")
-local pos_to_dim = minetest.get_modpath("mcl_worlds") and mcl_worlds.pos_to_dimension or function(pos) return "overworld" end
+local worlds_mod = minetest.get_modpath("mcl_worlds")
 
 local function mcl_log (message)
 	mcl_util.mcl_log (message, "[Beds]")
@@ -38,16 +38,6 @@ local function is_night_skip_enabled()
 	return players_in_bed_setting() <= 100
 end
 
-local function players_in_overworld(players)
-	local count = 0
-	for _, player in pairs(players) do
-		if player and pos_to_dim(player:get_pos()) == "overworld" then
-			count = count +1
-		end
-	end
-	return count
-end
-
 local function check_in_beds(players)
 	if not players then
 		players = minetest.get_connected_players()
@@ -55,7 +45,7 @@ local function check_in_beds(players)
 	if player_in_bed <= 0 then
 		return false
 	end
-	return players_in_bed_setting() <= (player_in_bed * 100) / players_in_overworld(players)
+	return players_in_bed_setting() <= (player_in_bed * 100) / #players
 end
 
 -- These monsters do not prevent sleep
@@ -216,10 +206,10 @@ local function lay_down(player, pos, bed_pos, state, skip)
 	return true
 end
 
-local function update_formspecs(finished, players)
-	local ges = players_in_overworld(players or minetest.get_connected_players())
+local function update_formspecs(finished, ges)
+	local ges = ges or #minetest.get_connected_players()
 	local form_n = "size[12,5;true]"
-	local all_in_bed = ges and players_in_bed_setting() <= (player_in_bed * 100) / ges or 0
+	local all_in_bed = players_in_bed_setting() <= (player_in_bed * 100) / ges
 	local night_skip = is_night_skip_enabled()
 	local button_leave = "button_exit[4,3;4,0.75;leave;"..F(S("Leave bed")).."]"
 	local button_abort = "button_exit[4,3;4,0.75;leave;"..F(S("Abort sleep")).."]"
@@ -359,36 +349,25 @@ function mcl_beds.get_bed_bottom (pos)
 	return bed_bottom
 end
 
-local function recheck_in_beds()
-	if check_in_beds() then
-		update_formspecs(is_night_skip_enabled())
-		mcl_beds.sleep()
-	end
-
-	-- check again (a player can change the dimension)
-	if player_in_bed > 0 then
-		update_formspecs(false)
-		minetest.after(5, recheck_in_beds)
-	end
-end
-
 function mcl_beds.on_rightclick(pos, player, is_top)
 	-- Anti-Inception: Don't allow to sleep while you're sleeping
 	if player:get_meta():get_string("mcl_beds:sleeping") == "true" then
 		return
 	end
-	local dim = pos_to_dim(pos)
-	if dim == "nether" or dim == "end" then
-		-- Bed goes BOOM in the Nether or End.
-		local node = minetest.get_node(pos)
-		local dir = minetest.facedir_to_dir(node.param2)
+	if worlds_mod then
+		local dim = mcl_worlds.pos_to_dimension(pos)
+		if dim == "nether" or dim == "end" then
+			-- Bed goes BOOM in the Nether or End.
+			local node = minetest.get_node(pos)
+			local dir = minetest.facedir_to_dir(node.param2)
 
-		minetest.remove_node(pos)
-		minetest.remove_node(string.sub(node.name, -4) == "_top" and vector.subtract(pos, dir) or vector.add(pos, dir))
-		if explosions_mod then
-			mcl_explosions.explode(pos, 5, {drop_chance = 1.0, fire = true})
+			minetest.remove_node(pos)
+			minetest.remove_node(string.sub(node.name, -4) == "_top" and vector.subtract(pos, dir) or vector.add(pos, dir))
+			if explosions_mod then
+				mcl_explosions.explode(pos, 5, {drop_chance = 1.0, fire = true})
+			end
+			return
 		end
-		return
 	end
 	local name = player:get_player_name()
 	local ppos = player:get_pos()
@@ -406,13 +385,10 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 			mcl_title.set(player, "actionbar", {text=message, color="white", stay=60})
 		else -- someone just successfully entered a bed
 			local connected_players = minetest.get_connected_players()
-			local ges = players_in_overworld(connected_players)
-			local sleep_hud_message = S("@1/@2 players currently in bed.", player_in_bed, math.ceil(players_in_bed_setting() * ges / 100))
+			local sleep_hud_message = S("@1/@2 players currently in bed.", player_in_bed, math.ceil(players_in_bed_setting() * #connected_players / 100))
 			for _, player in pairs(connected_players) do
-				-- only send message to players not sleeping and in the "overworld"
-				if not mcl_beds.player[player:get_player_name()] and pos_to_dim(player:get_pos()) == "overworld" then
-					-- clear, old message is still being displayed
-					if mcl_title.params_get(player) then mcl_title.clear(player) end
+				if not mcl_beds.player[player:get_player_name()] then -- only send message to players not sleeping.
+					if mcl_title.params_get(player) then mcl_title.clear(player) end -- clear, old message is still being displayed
 					mcl_title.set(player, "actionbar", {text=sleep_hud_message, color="white", stay=60})
 				end
 			end
@@ -424,8 +400,13 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 	update_formspecs(false)
 
 	-- skip the night and let all players stand up
-	if player_in_bed > 0 then
-		minetest.after(5, recheck_in_beds)
+	if check_in_beds() then
+		minetest.after(5, function()
+			if check_in_beds() then
+				update_formspecs(is_night_skip_enabled())
+				mcl_beds.sleep()
+			end
+		end)
 	end
 end
 
@@ -452,10 +433,15 @@ minetest.register_on_leaveplayer(function(player)
 			break
 		end
 	end
-	if player_in_bed > 0 then
-		minetest.after(5, recheck_in_beds)
+	if check_in_beds(players) then
+		minetest.after(5, function()
+			if check_in_beds() then
+				update_formspecs(is_night_skip_enabled())
+				mcl_beds.sleep()
+			end
+		end)
 	end
-	update_formspecs(false, players)
+	update_formspecs(false, #players)
 end)
 
 local message_rate_limit = tonumber(minetest.settings:get("chat_message_limit_per_10sec")) or 8 --NEVER change this! if this was java, i would've declared it as final

mods/ITEMS/mcl_beehives/init.lua

@@ -8,60 +8,36 @@ local S = minetest.get_translator(minetest.get_current_modname())
 -- Function to allow harvesting honey and honeycomb from the beehive and bee nest.
 local honey_harvest = function(pos, node, player, itemstack, pointed_thing)
 	local inv = player:get_inventory()
-	local item = player:get_wielded_item()
+	local shears = minetest.get_item_group(player:get_wielded_item():get_name(), "shears") > 0
+	local bottle = player:get_wielded_item():get_name() == "mcl_potions:glass_bottle"
+	local beehive = "mcl_beehives:beehive"
 	local is_creative = minetest.is_creative_enabled(player:get_player_name())
 
-	-- Determine the node name to replace the beehive with if harvest is successful
-	local beehive = "mcl_beehives:beehive"
 	if node.name == "mcl_beehives:beehive_5" then
 		beehive = "mcl_beehives:beehive"
 	elseif node.name == "mcl_beehives:bee_nest_5" then
 		beehive = "mcl_beehives:bee_nest"
 	end
 
-	-- Check for a campfire within 5 blocks below the beehive
 	local campfire_area = vector.offset(pos, 0, -5, 0)
 	local campfire = minetest.find_nodes_in_area(pos, campfire_area, "group:lit_campfire")
 
-	-- Player used a bottle
-	if item:get_name() == "mcl_potions:glass_bottle" then
+	if bottle then
 		local honey = "mcl_honey:honey_bottle"
 		if inv:room_for_item("main", honey) then
-			-- Replace the beehive with the version without honey or comb
 			node.name = beehive
 			minetest.set_node(pos, node)
-
-			-- Give honey bottle and take the empty bottle if survival mode
 			inv:add_item("main", "mcl_honey:honey_bottle")
 			if not is_creative then
 				itemstack:take_item()
 			end
-
-			-- Hurt the player if there was no campfire, or give award if there was
-			if not campfire[1] then
-				mcl_util.deal_damage(player, 10)
-			else
-				awards.unlock(player:get_player_name(), "mcl:bee_our_guest")
-			end
+			if not campfire[1] then mcl_util.deal_damage(player, 10) else awards.unlock(player:get_player_name(), "mcl:bee_our_guest") end
 		end
-
-	-- Player used shears
-	elseif minetest.get_item_group(item:get_name(), "shears") > 0 then
-		-- Give honeycomb
+	elseif shears then
 		minetest.add_item(pos, "mcl_honey:honeycomb 3")
-
-		-- Replace the beehive with the version without honey or comb
 		node.name = beehive
 		minetest.set_node(pos, node)
-
-		-- Hurt the player if there was no campfire
 		if not campfire[1] then mcl_util.deal_damage(player, 10) end
-
-		-- Add wear to the shears
-		if not is_creative then
-			mcl_util.use_item_durability(item, 1)
-			return item
-		end
 	end
 end
 
@@ -215,18 +191,6 @@ 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_bows/arrow.lua

@@ -35,6 +35,7 @@ local function random_arrow_positions(positions, placement)
 	end
 	return 0
 end
+mcl_bows.random_arrow_positions = random_arrow_positions
 
 local mod_awards = minetest.get_modpath("awards") and minetest.get_modpath("mcl_achievements")
 local mod_button = minetest.get_modpath("mesecons_button")

mods/ITEMS/mcl_bows/bow.lua

@@ -1,6 +1,5 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
-mcl_bows = {}
 
 -- local arrows = {
 -- 	["mcl_bows:arrow"] = "mcl_bows:arrow_entity",

mods/ITEMS/mcl_bows/init.lua

@@ -1,3 +1,5 @@
+mcl_bows = {}
+
 --Bow
 dofile(minetest.get_modpath("mcl_bows") .. "/arrow.lua")
 dofile(minetest.get_modpath("mcl_bows") .. "/bow.lua")

mods/ITEMS/mcl_cartography_table/init.lua

@@ -26,9 +26,3 @@ 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_glass.lua

@@ -12,7 +12,7 @@ minetest.register_node("mcl_core:glass", {
 	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
 	stack_max = 64,
-	groups = {handy=1, glass=1, building_block=1, material_glass=1},
+	groups = {handy=1, glass=1, building_block=1, material_glass=1, crushable=1},
 	sounds = mcl_sounds.node_sound_glass_defaults(),
 	drop = "",
 	_mcl_blast_resistance = 0.3,

mods/ITEMS/mcl_core/nodes_misc.lua

@@ -164,12 +164,6 @@ 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_enchanting/enchantments.lua

@@ -284,7 +284,8 @@ function minetest.calculate_knockback(player, hitter, time_from_last_punch, tool
 		local wielditem = hitter:get_wielded_item()
 		--knockback = knockback + 3 * mcl_enchanting.get_enchantment(wielditem, "knockback")
 		local enchant = mcl_enchanting.get_enchantment(wielditem, "knockback")
-		knockback = knockback + 3.22 * enchant
+		local hammer = minetest.get_item_group(wielditem:get_name(), "hammer")
+		knockback = knockback + 3.22 * enchant + 3.22 * hammer
 		-- add vertical lift to knockback
 		local v = player:get_velocity()
 		local added_v = 0

mods/ITEMS/mcl_end/building.lua

@@ -74,7 +74,6 @@ 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 = {
@@ -154,7 +153,6 @@ 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_farming/hoes.lua

@@ -54,7 +54,7 @@ local uses = {
 	stone = 132,
 	iron = 251,
 	gold = 33,
-	diamond = 1562,
+	diamond = 1562,
 	netherite = 2031,
 }
 
@@ -64,7 +64,7 @@ local hoe_usagehelp = S("Use the hoe on a cultivatable block (by rightclicking i
 
 minetest.register_tool("mcl_farming:hoe_wood", {
 	description = S("Wood Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.wood),
+	_tt_help = hoe_tt,
 	_doc_items_longdesc = hoe_longdesc,
 	_doc_items_usagehelp = hoe_usagehelp,
 	_doc_items_hidden = false,
@@ -108,7 +108,7 @@ minetest.register_craft({
 
 minetest.register_tool("mcl_farming:hoe_stone", {
 	description = S("Stone Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.stone),
+	_tt_help = hoe_tt,
 	_doc_items_longdesc = hoe_longdesc,
 	_doc_items_usagehelp = hoe_usagehelp,
 	inventory_image = "farming_tool_stonehoe.png",
@@ -146,7 +146,7 @@ minetest.register_craft({
 
 minetest.register_tool("mcl_farming:hoe_iron", {
 	description = S("Iron Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.iron),
+	_tt_help = hoe_tt,
 	_doc_items_longdesc = hoe_longdesc,
 	_doc_items_usagehelp = hoe_usagehelp,
 	inventory_image = "farming_tool_steelhoe.png",
@@ -192,7 +192,7 @@ minetest.register_craft({
 
 minetest.register_tool("mcl_farming:hoe_gold", {
 	description = S("Golden Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.gold),
+	_tt_help = hoe_tt,
 	_doc_items_longdesc = hoe_longdesc,
 	_doc_items_usagehelp = hoe_usagehelp,
 	inventory_image = "farming_tool_goldhoe.png",
@@ -239,7 +239,7 @@ minetest.register_craft({
 
 minetest.register_tool("mcl_farming:hoe_diamond", {
 	description = S("Diamond Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.diamond),
+	_tt_help = hoe_tt,
 	_doc_items_longdesc = hoe_longdesc,
 	_doc_items_usagehelp = hoe_usagehelp,
 	inventory_image = "farming_tool_diamondhoe.png",
@@ -274,26 +274,26 @@ minetest.register_craft({
 		{"mcl_core:diamond", "mcl_core:diamond"},
 		{"mcl_core:stick", ""},
 		{"mcl_core:stick", ""}
-	}
-})
-
-minetest.register_tool("mcl_farming:hoe_netherite", {
-	description = S("Netherite Hoe"),
-	_tt_help = hoe_tt.."\n"..S("Uses: @1", uses.netherite),
-	_doc_items_longdesc = hoe_longdesc,
-	_doc_items_usagehelp = hoe_usagehelp,
-	inventory_image = "farming_tool_netheritehoe.png",
-	wield_scale = mcl_vars.tool_wield_scale,
-	on_place = hoe_on_place_function(uses.netherite),
-	groups = { tool=1, hoe=1, enchantability=10, fire_immune=1 },
-	tool_capabilities = {
-		full_punch_interval = 0.25,
-		damage_groups = { fleshy = 4, },
-		punch_attack_uses = uses.netherite,
-	},
-	_repair_material = "mcl_nether:netherite_ingot",
-	_mcl_toollike_wield = true,
-	_mcl_diggroups = {
-		hoey = { speed = 8, level = 5, uses = uses.netherite }
-	},
-})
+	}
+})
+
+minetest.register_tool("mcl_farming:hoe_netherite", {
+	description = S("Netherite Hoe"),
+	_tt_help = hoe_tt,
+	_doc_items_longdesc = hoe_longdesc,
+	_doc_items_usagehelp = hoe_usagehelp,
+	inventory_image = "farming_tool_netheritehoe.png",
+	wield_scale = mcl_vars.tool_wield_scale,
+	on_place = hoe_on_place_function(uses.netherite),
+	groups = { tool=1, hoe=1, enchantability=10, fire_immune=1 },
+	tool_capabilities = {
+		full_punch_interval = 0.25,
+		damage_groups = { fleshy = 4, },
+		punch_attack_uses = uses.netherite,
+	},
+	_repair_material = "mcl_nether:netherite_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 8, level = 5, uses = uses.netherite }
+	},
+})

mods/ITEMS/mcl_fletching_table/init.lua

@@ -23,10 +23,4 @@ minetest.register_craft({
 		{ "group:wood", "group:wood", "" },
 		{ "group:wood", "group:wood", "" },
 	}
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "mcl_fletching_table:fletching_table",
-	burntime = 15,
-})
+})

mods/ITEMS/mcl_flowers/init.lua

@@ -195,7 +195,6 @@ 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 },
@@ -211,7 +210,6 @@ 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)
 
@@ -270,7 +268,6 @@ 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"
@@ -280,7 +277,6 @@ 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, {
@@ -302,7 +298,6 @@ 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 },
@@ -402,7 +397,6 @@ 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_itemframes/item_frames_API.lua

@@ -638,7 +638,7 @@ function mcl_itemframes.create_base_definitions()
 		paramtype = "light",
 		paramtype2 = "facedir",
 		sunlight_propagates = true,
-		groups = { dig_immediate = 3, deco_block = 1, dig_by_piston = 1, container = 1, attached_node_facedir = 1 },
+		groups = { dig_immediate = 3, deco_block = 1, dig_by_piston = 1, container = 1, }, -- attached_node_facedir = 1 }, -- allows for more placement options.
 		sounds = mcl_sounds.node_sound_defaults(),
 		node_placement_prediction = "",
 

mods/ITEMS/mcl_lectern/init.lua

@@ -76,7 +76,8 @@ local lectern_def = {
 		if wdir == 0 then
 			return itemstack
 			-- IE., no Hanging Lecterns for you!
-		else
+		end
+		if wdir == 1 then
 			-- (only make standing nodes...)
 			-- Determine the rotation based on player's yaw
 			local yaw = pi * 2 - placer:get_look_horizontal()
@@ -135,11 +136,5 @@ 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,9 +26,3 @@ 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,12 +426,6 @@ 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_shields/init.lua

@@ -251,15 +251,6 @@ local function remove_shield_entity(player, i)
 	end
 end
 
-local function is_node_stack(itemstack)
-	return itemstack:get_definition().drawtype -- only node's definition table contains element "drawtype"
-end
-
-local function is_rmb_conflicting_node(nodename)
-	local nodedef = minetest.registered_nodes[nodename]
-	return nodedef.on_rightclick
-end
-
 local function handle_blocking(player)
 	local player_shield = mcl_shields.players[player]
 	local rmb = player:get_player_control().RMB
@@ -275,7 +266,7 @@ local function handle_blocking(player)
 	local pos = player:get_pos()
 	if shield_in_hand then
 		if not_blocking then
-			minetest.after(0.05, function()
+			minetest.after(0.25, function()
 				if (not_blocking or not shield_in_offhand) and shield_in_hand and rmb then
 					player_shield.blocking = 2
 					set_shield(player, true, 2)
@@ -286,16 +277,11 @@ local function handle_blocking(player)
 		end
 	elseif shield_in_offhand then
 		local pointed_thing = mcl_util.get_pointed_thing(player, true)
-		local wielded_stack = player:get_wielded_item()
-		local offhand_can_block = (minetest.get_item_group(wielded_item(player), "bow") ~= 1
-		and minetest.get_item_group(wielded_item(player), "crossbow") ~= 1)
+		local offhand_can_block = (wielded_item(player) == "" or not pointed_thing)
+		and (minetest.get_item_group(wielded_item(player), "bow") ~= 1 and minetest.get_item_group(wielded_item(player), "crossbow") ~= 1)
 
 		if pointed_thing and pointed_thing.type == "node" then
-			local pointed_node = minetest.get_node(pointed_thing.under)
-			if minetest.get_item_group(pointed_node.name, "container") > 1
-			or is_rmb_conflicting_node(pointed_node.name)
-			or is_node_stack(wielded_stack)
-			then
+			if minetest.get_item_group(minetest.get_node(pointed_thing.under).name, "container") > 1 then
 				return
 			end
 		end
@@ -304,7 +290,7 @@ local function handle_blocking(player)
 			return
 		end
 		if not_blocking then
-			minetest.after(0.05, function()
+			minetest.after(0.25, function()
 				if (not_blocking or not shield_in_hand) and shield_in_offhand and rmb  and offhand_can_block then
 					player_shield.blocking = 1
 					set_shield(player, true, 1)

mods/ITEMS/mcl_smithing_table/init.lua

@@ -257,12 +257,6 @@ 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/mcl_tools/init.lua

@@ -22,9 +22,13 @@ dig_speed_class group:
 -- Help texts
 local pickaxe_longdesc = S("Pickaxes are mining tools to mine hard blocks, such as stone. A pickaxe can also be used as weapon, but it is rather inefficient.")
 local axe_longdesc = S("An axe is your tool of choice to cut down trees, wood-based blocks and other blocks. Axes deal a lot of damage as well, but they are rather slow.")
+
 local sword_longdesc = S("Swords are great in melee combat, as they are fast, deal high damage and can endure countless battles. Swords can also be used to cut down a few particular blocks, such as cobwebs.")
+local sword_use = S("To slash multiple enemies, hold the sword in your hand, then use (rightclick) an enemy.")
+
 local shovel_longdesc = S("Shovels are tools for digging coarse blocks, such as dirt, sand and gravel. They can also be used to turn grass blocks to grass paths. Shovels can be used as weapons, but they are very weak.")
 local shovel_use = S("To turn a grass block into a grass path, hold the shovel in your hand, then use (rightclick) the top or side of a grass block. This only works when there's air above the grass block.")
+
 local shears_longdesc = S("Shears are tools to shear sheep and to mine a few block types. Shears are a special mining tool and can be used to obtain the original item from grass, leaves and similar blocks that require cutting.")
 local shears_use = S("To shear sheep or carve faceless pumpkins, use the “place” key on them. Faces can only be carved at the side of faceless pumpkins. Mining works as usual, but the drops are different for a few blocks.")
 

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,112 +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, 4 do
-		if type(defs[i]) ~= "string" then
-			error("defs["..i.."] must be a string")
-		end
-	end
-	if defs[5] and type(defs[5]) ~= "boolean" then
-		error("defs[5] must be a boolean if present")
-	end
-
-	local modname = minetest.get_current_modname()
-
-	if #defs > 5 then
-		minetest.log("warning", "[vl_hollow_logs] unused vars passed, dumping the table")
-		minetest.log("warning", "from mod " .. modname .. ": " .. dump(defs))
-	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(modname .. ":"..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 = {modname .. "_"..name..".png"},
-		_mcl_blast_resistance = 2,
-		_mcl_hardness = 2,
-		_mcl_stripped_variant = modname .. ":stripped_"..name.."_hollow"
-	})
-
-	minetest.register_node(modname .. ":"..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 = {modname .. "_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"
-})

mods/ITEMS/vl_weaponry/init.lua

@@ -0,0 +1,844 @@
+local modname = minetest.get_current_modname()
+local modpath = minetest.get_modpath(modname)
+local S = minetest.get_translator(modname)
+
+
+local hammer_tt = S("Can crush blocks") .. "\n" .. S("Increased knockback")
+local hammer_longdesc = S("Hammers are great in melee combat, as they deal high damage with increased knockback and can endure countless battles. Hammers can also be used to crush things.")
+local hammer_use = S("To crush a block, hold the hammer in your hand, then use (rightclick) the block. This only works with some blocks.")
+
+local spear_tt = S("Reaches farther") .. "\n" .. S("Can be thrown")
+local spear_longdesc = S("Spears are great in melee combat, as they have an increased reach. They can also be thrown.")
+local spear_use = S("To throw a spear, hold it in your hand, then hold use (rightclick) in the air.")
+
+local wield_scale = mcl_vars.tool_wield_scale
+
+local function crush(pos)
+	if pos == nil then
+		return false
+	end
+	local node = minetest.get_node(pos)
+	local name = node.name
+	if minetest.get_item_group(name, "crushable") == 2 then
+		node.name = minetest.registered_nodes[name]._mcl_crushed_into
+		if node.name then
+			minetest.set_node(pos, node)
+			minetest.sound_play("default_dig_cracky", { pos = pos, gain = 0.5 }, true)
+			return true
+		end
+	elseif minetest.get_item_group(name, "crushable") == 1 then
+		minetest.set_node(pos, {name="air"})
+		minetest.sound_play(mcl_sounds.node_sound_glass_defaults().dug, { pos = pos, gain = 0.5 }, true)
+		return true
+	end
+	return false
+end
+
+local hammer_on_place = function(wear_divisor)
+	return function(itemstack, user, pointed_thing)
+		-- Call on_rightclick if the pointed node defines it
+		local node = minetest.get_node(pointed_thing.under)
+		if user and not user:get_player_control().sneak then
+			if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+				return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
+			end
+		end
+
+		if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
+			minetest.record_protection_violation(pointed_thing.under, user:get_player_name())
+			return itemstack
+		end
+
+		if crush(pointed_thing.under) then
+			if not minetest.is_creative_enabled(user:get_player_name()) then
+				itemstack:add_wear(65535/wear_divisor)
+			end
+			return itemstack
+		end
+	end
+end
+
+local GRAVITY = 9.81
+local YAW_OFFSET = -math.pi/2
+local function dir_to_pitch(dir)
+	--local dir2 = vector.normalize(dir)
+	local xz = math.abs(dir.x) + math.abs(dir.z)
+	return -math.atan2(-dir.y, xz)
+end
+-- Time after which stuck spear is rechecked for being stuck
+local STUCK_RECHECK_TIME = 5
+-- Time in seconds after which a stuck spear is deleted
+local SPEAR_TIMEOUT = 180
+local SPEAR_ENTITY={
+	physical = true,
+	pointable = false,
+	visual = "item",
+	visual_size = {x=-0.5, y=-0.5},
+	textures = {"vl_weaponry:spear_wood"},
+	collisionbox = {-0.19, -0.125, -0.19, 0.19, 0.125, 0.19},
+	collide_with_objects = false,
+	_fire_damage_resistant = true,
+
+	_lastpos={},
+	_startpos=nil,
+	_damage=1,	-- Damage on impact
+	_is_critical=false, -- Whether this spear would deal critical damage
+	_stuck=false,   -- Whether spear is stuck
+	_stucktimer=nil,-- Amount of time (in seconds) the spear has been stuck so far
+	_stuckrechecktimer=nil,-- An additional timer for periodically re-checking the stuck status of an spear
+	_stuckin=nil,	--Position of node in which spear is stuck.
+	_shooter=nil,	-- ObjectRef of player or mob who threw it
+	_is_arrow = true,
+	_in_player = false,
+	_blocked = false,
+	_viscosity = 0,   -- Viscosity of node the spear is currently in
+	_deflection_cooloff = 0, -- Cooloff timer after an spear deflection, to prevent many deflections in quick succession
+	_itemstack = nil, -- ItemStack of the original object
+}
+
+-- Destroy spear entity self at pos and drops it as an item
+local function spawn_item(self, pos)
+	if not minetest.is_creative_enabled("") then
+		local item = minetest.add_item(pos, self._itemstack)
+		item:set_velocity(vector.new(0, 0, 0))
+		item:set_yaw(self.object:get_yaw())
+	end
+	mcl_burning.extinguish(self.object)
+	self.object:remove()
+end
+
+local function damage_particles(pos, is_critical)
+	if is_critical then
+		minetest.add_particlespawner({
+			amount = 15,
+			time = 0.1,
+			minpos = vector.offset(pos, -0.5, -0.5, -0.5),
+			maxpos = vector.offset(pos, 0.5, 0.5, 0.5),
+			minvel = vector.new(-0.1, -0.1, -0.1),
+			maxvel = vector.new(0.1, 0.1, 0.1),
+			minexptime = 1,
+			maxexptime = 2,
+			minsize = 1.5,
+			maxsize = 1.5,
+			collisiondetection = false,
+			vertical = false,
+			texture = "mcl_particles_crit.png^[colorize:#bc7a57:127",
+		})
+	end
+end
+
+function SPEAR_ENTITY.on_step(self, dtime)
+	mcl_burning.tick(self.object, dtime, self)
+	-- mcl_burning.tick may remove object immediately
+	if not self.object:get_pos() then return end
+
+	self._time_in_air = self._time_in_air + .001
+
+	local pos = self.object:get_pos()
+	local dpos = vector.round(vector.new(pos)) -- digital pos
+	local node = minetest.get_node(dpos)
+
+	if self._stuck then
+		self._stucktimer = self._stucktimer + dtime
+		self._stuckrechecktimer = self._stuckrechecktimer + dtime
+		if self._stucktimer > SPEAR_TIMEOUT then
+			spawn_item(self, pos)
+			return
+		end
+		-- Drop spear as item when it is no longer stuck
+		if self._stuckrechecktimer > STUCK_RECHECK_TIME then
+			local stuckin_def
+			if self._stuckin then
+				stuckin_def = minetest.registered_nodes[minetest.get_node(self._stuckin).name]
+			end
+			-- TODO: fall down without turning into an item?
+			if stuckin_def and stuckin_def.walkable == false then
+				spawn_item(self, pos)
+				return
+			end
+			self._stuckrechecktimer = 0
+		end
+		-- Pickup spear if player is nearby (not in Creative Mode)
+		local objects = minetest.get_objects_inside_radius(pos, 1)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() then
+				if self._collectable and not minetest.is_creative_enabled(obj:get_player_name()) then
+					if obj:get_inventory():room_for_item("main", self._itemstack) then
+						obj:get_inventory():add_item("main", self._itemstack)
+						minetest.sound_play("item_drop_pickup", {
+							pos = pos,
+							max_hear_distance = 16,
+							gain = 1.0,
+						}, true)
+						mcl_burning.extinguish(self.object)
+						self.object:remove()
+					end
+				else
+					spawn_item(self, pos)
+				end
+				return
+			end
+		end
+
+	-- Check for object "collision". Done every tick (hopefully this is not too stressing)
+	else
+
+		if self._damage >= 9 and self._in_player == false then
+			minetest.add_particlespawner({
+				amount = 20,
+				time = .2,
+				minpos = vector.new(0,0,0),
+				maxpos = vector.new(0,0,0),
+				minvel = vector.new(-0.1,-0.1,-0.1),
+				maxvel = vector.new(0.1,0.1,0.1),
+				minexptime = 0.5,
+				maxexptime = 0.5,
+				minsize = 2,
+				maxsize = 2,
+				attached = self.object,
+				collisiondetection = false,
+				vertical = false,
+				texture = "mobs_mc_arrow_particle.png",
+				glow = 1,
+			})
+		end
+
+		local closest_object
+		local closest_distance
+
+		if self._deflection_cooloff > 0 then
+			self._deflection_cooloff = self._deflection_cooloff - dtime
+		end
+
+		local spear_dir = self.object:get_velocity()
+		--create a raycast from the spear based on the velocity of the spear to deal with lag
+		local raycast = minetest.raycast(pos, vector.add(pos, vector.multiply(spear_dir, 0.1)), true, false)
+		for hitpoint in raycast do
+			if hitpoint.type == "object" then
+				-- find the closest object that is in the way of the spear
+				local ok = false
+				if hitpoint.ref:is_player() and enable_pvp then
+					ok = true
+				elseif not hitpoint.ref:is_player() and hitpoint.ref:get_luaentity() then
+					if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then
+						ok = true
+					end
+				end
+				if ok then
+					local dist = vector.distance(hitpoint.ref:get_pos(), pos)
+					if not closest_object or not closest_distance then
+						closest_object = hitpoint.ref
+						closest_distance = dist
+					elseif dist < closest_distance then
+						closest_object = hitpoint.ref
+						closest_distance = dist
+					end
+				end
+			end
+		end
+
+		if closest_object then
+			local obj = closest_object
+			local is_player = obj:is_player()
+			local lua = obj:get_luaentity()
+			if obj == self._shooter and self._time_in_air > 1.02 or obj ~= self._shooter and (is_player or (lua and (lua.is_mob or lua._hittable_by_projectile))) then
+				if obj:get_hp() > 0 then
+					-- Check if there is no solid node between spear and object
+					local ray = minetest.raycast(self.object:get_pos(), obj:get_pos(), true)
+					for pointed_thing in ray do
+						if pointed_thing.type == "object" and pointed_thing.ref == closest_object then
+							-- Target reached! We can proceed now.
+							break
+						elseif pointed_thing.type == "node" then
+							local nn = minetest.get_node(minetest.get_pointed_thing_position(pointed_thing)).name
+							local def = minetest.registered_nodes[nn]
+							if (not def) or def.walkable then
+								-- There's a node in the way. Delete spear without damage
+								spawn_item(self, pos)
+								return
+							end
+						end
+					end
+
+					-- Punch target object but avoid hurting enderman.
+					if not lua or lua.name ~= "mobs_mc:enderman" then
+						if not self._in_player then
+							damage_particles(vector.add(pos, vector.multiply(self.object:get_velocity(), 0.1)), self._is_critical)
+						end
+						if mcl_burning.is_burning(self.object) then
+							mcl_burning.set_on_fire(obj, 5)
+						end
+						if not self._in_player and not self._blocked then
+							obj:punch(self.object, 1.0, {
+								full_punch_interval=1.0,
+								damage_groups={fleshy=self._damage},
+							}, self.object:get_velocity())
+							if obj:is_player() then
+								if not mcl_shields.is_blocking(obj) then
+									spawn_item(self, pos)
+								else
+									self._blocked = true
+									self.object:set_velocity(vector.multiply(self.object:get_velocity(), -0.25))
+								end
+								minetest.after(150, function()
+									spawn_item(self, pos)
+								end)
+							else
+								spawn_item(self, pos)
+							end
+						end
+					end
+
+
+					if is_player then
+						if self._shooter and self._shooter:is_player() and not self._in_player and not self._blocked then
+							-- “Ding” sound for hitting another player
+							minetest.sound_play({name="mcl_bows_hit_player", gain=0.1}, {to_player=self._shooter:get_player_name()}, true)
+						end
+					end
+
+					if not self._in_player and not self._blocked then
+						minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
+					end
+				end
+				if not obj:is_player() then
+					mcl_burning.extinguish(self.object)
+					if self._piercing == 0 then
+						spawn_item(self, pos)
+					end
+				end
+				return
+			end
+		end
+	end
+
+	-- Check for node collision
+	if self._lastpos.x~=nil and not self._stuck then
+		local def = minetest.registered_nodes[node.name]
+		local vel = self.object:get_velocity()
+		-- Spear has stopped in one axis, so it probably hit something.
+		-- This detection is a bit clunky, but sadly, MT does not offer a direct collision detection for us. :-(
+		if (math.abs(vel.x) < 0.0001) or (math.abs(vel.z) < 0.0001) or (math.abs(vel.y) < 0.00001) then
+			-- Check for the node to which the spear is pointing
+			local dir
+			if math.abs(vel.y) < 0.00001 then
+				if self._lastpos.y < pos.y then
+					dir = vector.new(0, 1, 0)
+				else
+					dir = vector.new(0, -1, 0)
+				end
+			else
+				dir = minetest.facedir_to_dir(minetest.dir_to_facedir(minetest.yaw_to_dir(self.object:get_yaw()-YAW_OFFSET)))
+			end
+			self._stuckin = vector.add(dpos, dir)
+			local snode = minetest.get_node(self._stuckin)
+			local sdef = minetest.registered_nodes[snode.name]
+
+			-- If node is non-walkable, unknown or ignore, don't make spear stuck.
+			-- This causes a deflection in the engine.
+			if not sdef or sdef.walkable == false or snode.name == "ignore" then
+				self._stuckin = nil
+				if self._deflection_cooloff <= 0 then
+					-- Lose 1/3 of velocity on deflection
+					local newvel = vector.multiply(vel, 0.6667)
+
+					self.object:set_velocity(newvel)
+					-- Reset deflection cooloff timer to prevent many deflections happening in quick succession
+					self._deflection_cooloff = 1.0
+				end
+			else
+
+				-- Node was walkable, make spear stuck
+				self._stuck = true
+				self._stucktimer = 0
+				self._stuckrechecktimer = 0
+
+				self.object:set_velocity(vector.new(0, 0, 0))
+				self.object:set_acceleration(vector.new(0, 0, 0))
+
+				minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
+
+				if mcl_burning.is_burning(self.object) and snode.name == "mcl_tnt:tnt" then
+					tnt.ignite(self._stuckin)
+				end
+
+				-- Ignite Campfires
+				if mod_campfire and mcl_burning.is_burning(self.object) and minetest.get_item_group(snode.name, "campfire") ~= 0 then
+					mcl_campfires.light_campfire(self._stuckin)
+				end
+
+				-- Activate target
+				if mod_target and snode.name == "mcl_target:target_off" then
+					mcl_target.hit(self._stuckin, 1) --10 redstone ticks
+				end
+
+				-- Push the button! Push, push, push the button!
+				if mod_button and minetest.get_item_group(node.name, "button") > 0 and minetest.get_item_group(node.name, "button_push_by_arrow") == 1 then
+					local bdir = minetest.wallmounted_to_dir(node.param2)
+					-- Check the button orientation
+					if vector.equals(vector.add(dpos, bdir), self._stuckin) then
+						mesecon.push_button(dpos, node)
+					end
+				end
+			end
+		elseif (def and def.liquidtype ~= "none") then
+			-- Slow down spear in liquids
+			local v = def.liquid_viscosity
+			if not v then
+				v = 0
+			end
+			--local old_v = self._viscosity
+			self._viscosity = v
+			local vpenalty = math.max(0.1, 0.98 - 0.1 * v)
+			if math.abs(vel.x) > 0.001 then
+				vel.x = vel.x * vpenalty
+			end
+			if math.abs(vel.z) > 0.001 then
+				vel.z = vel.z * vpenalty
+			end
+			self.object:set_velocity(vel)
+		end
+	end
+
+	-- Update yaw
+	if not self._stuck then
+		local vel = self.object:get_velocity()
+		local yaw = minetest.dir_to_yaw(vel)+YAW_OFFSET
+		local pitch = dir_to_pitch(vel)
+		self.object:set_rotation({ x = 0, y = yaw, z = pitch })
+	end
+
+	-- Update internal variable
+	self._lastpos = pos
+end
+
+-- Force recheck of stuck spears when punched.
+-- Otherwise, punching has no effect.
+function SPEAR_ENTITY.on_punch(self)
+	if self._stuck then
+		self._stuckrechecktimer = STUCK_RECHECK_TIME
+	end
+end
+
+function SPEAR_ENTITY.get_staticdata(self)
+	local out = {
+		lastpos = self._lastpos,
+		startpos = self._startpos,
+		damage = self._damage,
+		is_critical = self._is_critical,
+		stuck = self._stuck,
+		stuckin = self._stuckin,
+		stuckin_player = self._in_player,
+	}
+	if self._stuck then
+		-- If _stucktimer is missing for some reason, assume the maximum
+		if not self._stucktimer then
+			self._stucktimer = SPEAR_TIMEOUT
+		end
+		out.stuckstarttime = minetest.get_gametime() - self._stucktimer
+	end
+	if self._shooter and self._shooter:is_player() then
+		out.shootername = self._shooter:get_player_name()
+	end
+	return minetest.serialize(out)
+end
+
+function SPEAR_ENTITY.on_activate(self, staticdata, dtime_s)
+	self._time_in_air = 1.0
+	local data = minetest.deserialize(staticdata)
+	if data then
+		self._stuck = data.stuck
+		if data.stuck then
+			if data.stuckstarttime then
+				-- First, check if the stuck spear is aleady past its life timer.
+				-- If yes, delete it.
+				self._stucktimer = minetest.get_gametime() - data.stuckstarttime
+				if self._stucktimer > SPEAR_TIMEOUT then
+					spawn_item(self, pos)
+					return
+				end
+			end
+
+			-- Perform a stuck recheck on the next step.
+			self._stuckrechecktimer = STUCK_RECHECK_TIME
+
+			self._stuckin = data.stuckin
+		end
+
+		-- Get the remaining spear state
+		self._lastpos = data.lastpos
+		self._startpos = data.startpos
+		self._damage = data.damage
+		self._is_critical = data.is_critical
+		if data.shootername then
+			local shooter = minetest.get_player_by_name(data.shootername)
+			if shooter and shooter:is_player() then
+				self._shooter = shooter
+			end
+		end
+
+		if data.stuckin_player then
+			spawn_item(self, pos)
+		end
+	end
+	self.object:set_armor_groups({ immortal = 1 })
+end
+
+minetest.register_entity("vl_weaponry:spear_entity", SPEAR_ENTITY)
+
+local spear_throw_power = 25
+
+local spear_on_place = function(wear_divisor)
+	return function(itemstack, user, pointed_thing)
+		if pointed_thing.type == "node" then
+			-- Call on_rightclick if the pointed node defines it
+			local node = minetest.get_node(pointed_thing.under)
+			if user and not user:get_player_control().sneak then
+				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+					return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
+				end
+			end
+		end
+
+		if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
+			minetest.record_protection_violation(pointed_thing.under, user:get_player_name())
+			return itemstack
+		end
+
+		local pos = user:get_pos()
+		pos.y = pos.y + 1.5
+		local dir = user:get_look_dir()
+		local yaw = user:get_look_horizontal()
+		local obj = minetest.add_entity({x=pos.x,y=pos.y,z=pos.z}, "vl_weaponry:spear_entity")
+		obj:set_velocity({x=dir.x*spear_throw_power, y=dir.y*spear_throw_power, z=dir.z*spear_throw_power})
+		obj:set_acceleration({x=0, y=-GRAVITY, z=0})
+		obj:set_yaw(yaw-math.pi/2)
+		obj:set_properties({textures = {itemstack:get_name()}})
+		local le = obj:get_luaentity()
+		le._shooter = user
+		le._source_object = user
+		le._damage = itemstack:get_definition()._mcl_spear_thrown_damage
+		le._is_critical = false
+		le._startpos = pos
+		le._collectable = true
+		le._itemstack = itemstack
+		minetest.sound_play("mcl_bows_bow_shoot", {pos=pos, max_hear_distance=16}, true)
+		if user and user:is_player() then
+			if obj:get_luaentity().player == "" then
+				obj:get_luaentity().player = user
+			end
+-- 			obj:get_luaentity().node = shooter:get_inventory():get_stack("main", 1):get_name()
+		end
+
+		return ItemStack()
+	end
+end
+
+local uses = {
+	wood = 60,
+	stone = 132,
+	iron = 251,
+	gold = 33,
+	diamond = 1562,
+	netherite = 2031,
+}
+
+local SPEAR_RANGE = 4.5
+
+--Hammers
+minetest.register_tool("vl_weaponry:hammer_wood", {
+	description = S("Wooden Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	_doc_items_hidden = false,
+	inventory_image = "vl_tool_woodhammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.wood),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=15 },
+	tool_capabilities = {
+		full_punch_interval = 1.2,
+		max_drop_level=1,
+		damage_groups = {fleshy=4},
+		punch_attack_uses = 60,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "group:wood",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 60 }
+	},
+})
+minetest.register_tool("vl_weaponry:hammer_stone", {
+	description = S("Stone Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	inventory_image = "vl_tool_stonehammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.stone),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=5 },
+	tool_capabilities = {
+		full_punch_interval = 1.3,
+		max_drop_level=3,
+		damage_groups = {fleshy=5},
+		punch_attack_uses = 132,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "group:cobble",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 132 }
+	},
+})
+minetest.register_tool("vl_weaponry:hammer_iron", {
+	description = S("Iron Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	inventory_image = "vl_tool_steelhammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.iron),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=14 },
+	tool_capabilities = {
+		full_punch_interval = 1.2,
+		max_drop_level=4,
+		damage_groups = {fleshy=6},
+		punch_attack_uses = 251,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:iron_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 251 }
+	},
+})
+minetest.register_tool("vl_weaponry:hammer_gold", {
+	description = S("Golden Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	inventory_image = "vl_tool_goldhammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.gold),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=22 },
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=2,
+		damage_groups = {fleshy=5},
+		punch_attack_uses = 33,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:gold_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 33 }
+	},
+})
+minetest.register_tool("vl_weaponry:hammer_diamond", {
+	description = S("Diamond Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	inventory_image = "vl_tool_diamondhammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.diamond),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=10 },
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=5,
+		damage_groups = {fleshy=7},
+		punch_attack_uses = 1562,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:diamond",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 1562 }
+	},
+	_mcl_upgradable = true,
+	_mcl_upgrade_item = "vl_weaponry:hammer_netherite"
+})
+minetest.register_tool("vl_weaponry:hammer_netherite", {
+	description = S("Netherite Hammer"),
+	_tt_help = hammer_tt,
+	_doc_items_longdesc = hammer_longdesc,
+	_doc_items_usagehelp = hammer_use,
+	inventory_image = "vl_tool_netheritehammer.png",
+	wield_scale = wield_scale,
+	on_place = hammer_on_place(uses.netherite),
+	groups = { weapon=1, hammer=1, dig_speed_class=2, enchantability=10, fire_immune=1 },
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=5,
+		damage_groups = {fleshy=9},
+		punch_attack_uses = 2031,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_nether:netherite_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		pickaxey = { speed = 2, level = 1, uses = 2031 }
+	},
+})
+
+--Spears
+minetest.register_tool("vl_weaponry:spear_wood", {
+	description = S("Wooden Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	_doc_items_hidden = false,
+	inventory_image = "vl_tool_woodspear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.wood),
+	on_secondary_use = spear_on_place(uses.wood),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=15 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=1,
+		damage_groups = {fleshy=3},
+		punch_attack_uses = 60,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "group:wood",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 60 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 60 }
+	},
+	_mcl_spear_thrown_damage = 5,
+})
+minetest.register_tool("vl_weaponry:spear_stone", {
+	description = S("Stone Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	inventory_image = "vl_tool_stonespear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.stone),
+	on_secondary_use = spear_on_place(uses.stone),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=5 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=3,
+		damage_groups = {fleshy=4},
+		punch_attack_uses = 132,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "group:cobble",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 132 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 132 }
+	},
+	_mcl_spear_thrown_damage = 6,
+})
+minetest.register_tool("vl_weaponry:spear_iron", {
+	description = S("Iron Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	inventory_image = "vl_tool_steelspear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.iron),
+	on_secondary_use = spear_on_place(uses.iron),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=14 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=4,
+		damage_groups = {fleshy=5},
+		punch_attack_uses = 251,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:iron_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 251 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 251 }
+	},
+	_mcl_spear_thrown_damage = 7,
+})
+minetest.register_tool("vl_weaponry:spear_gold", {
+	description = S("Golden Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	inventory_image = "vl_tool_goldspear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.gold),
+	on_secondary_use = spear_on_place(uses.gold),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=22 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=2,
+		damage_groups = {fleshy=3},
+		punch_attack_uses = 33,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:gold_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 33 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 33 }
+	},
+	_mcl_spear_thrown_damage = 5,
+})
+minetest.register_tool("vl_weaponry:spear_diamond", {
+	description = S("Diamond Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	inventory_image = "vl_tool_diamondspear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.diamond),
+	on_secondary_use = spear_on_place(uses.diamond),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=10 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=5,
+		damage_groups = {fleshy=6},
+		punch_attack_uses = 1562,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_core:diamond",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 1562 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 1562 }
+	},
+	_mcl_spear_thrown_damage = 8,
+	_mcl_upgradable = true,
+	_mcl_upgrade_item = "vl_weaponry:spear_netherite"
+})
+minetest.register_tool("vl_weaponry:spear_netherite", {
+	description = S("Netherite Spear"),
+	_tt_help = spear_tt,
+	_doc_items_longdesc = spear_longdesc,
+	_doc_items_usagehelp = spear_use,
+	inventory_image = "vl_tool_netheritespear.png",
+	wield_scale = wield_scale,
+	on_place = spear_on_place(uses.netherite),
+	on_secondary_use = spear_on_place(uses.netherite),
+	groups = { weapon=1, spear=1, dig_speed_class=2, enchantability=10, fire_immune=1 },
+	range = SPEAR_RANGE,
+	tool_capabilities = {
+		full_punch_interval = 0.75,
+		max_drop_level=5,
+		damage_groups = {fleshy=8},
+		punch_attack_uses = 2031,
+	},
+	sound = { breaks = "default_tool_breaks" },
+	_repair_material = "mcl_nether:netherite_ingot",
+	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		swordy = { speed = 2, level = 1, uses = 2031 },
+		swordy_cobweb = { speed = 2, level = 1, uses = 2031 }
+	},
+	_mcl_spear_thrown_damage = 12,
+})

mods/ITEMS/vl_weaponry/mod.conf

@@ -0,0 +1,3 @@
+name = vl_weaponry
+author = Herowl
+depends = mcl_sounds, mcl_init, mcl_bows

mods/MAPGEN/mcl_dungeons/init.lua

@@ -406,16 +406,13 @@ local function dungeons_nodes(minp, maxp, blockseed)
 	local pr = PseudoRandom(blockseed)
 	for a=1, attempts do
 		local dim = dungeonsizes[pr:next(1, #dungeonsizes)]
-
-		if ymin <= ymax - dim.y - 1 then
-			local x = pr:next(minp.x, maxp.x-dim.x-1)
-			local y = pr:next(ymin  , ymax  -dim.y-1)
-			local z = pr:next(minp.z, maxp.z-dim.z-1)
-			local p1 = {x=x,y=y,z=z}
-			local p2 = {x = x+dim.x+1, y = y+dim.y+1, z = z+dim.z+1}
-			minetest.log("verbose","[mcl_dungeons] size=" ..minetest.pos_to_string(dim) .. ", emerge from "..minetest.pos_to_string(p1) .. " to " .. minetest.pos_to_string(p2))
-			emerge_area(p1, p2, ecb_spawn_dungeon, {p1=p1, p2=p2, dim=dim, pr=pr})
-		end
+		local x = pr:next(minp.x, maxp.x-dim.x-1)
+		local y = pr:next(ymin  , ymax  -dim.y-1)
+		local z = pr:next(minp.z, maxp.z-dim.z-1)
+		local p1 = {x=x,y=y,z=z}
+		local p2 = {x = x+dim.x+1, y = y+dim.y+1, z = z+dim.z+1}
+		minetest.log("verbose","[mcl_dungeons] size=" ..minetest.pos_to_string(dim) .. ", emerge from "..minetest.pos_to_string(p1) .. " to " .. minetest.pos_to_string(p2))
+		emerge_area(p1, p2, ecb_spawn_dungeon, {p1=p1, p2=p2, dim=dim, pr=pr})
 	end
 end
 

mods/PLAYER/mcl_player/init.lua

@@ -38,19 +38,9 @@ local player_sneak = {}
 local player_visible = {}
 mcl_player.player_attached = {}
 
-local function get_player_textures(name)
-	local textures = player_textures[name]
-	if textures then return textures end
-
-	local textures = { "character.png", "blank.png", "blank.png" }
-	player_textures[name] = textures
-	return textures
-
-end
-
 function mcl_player.player_get_animation(player)
 	local name = player:get_player_name()
-	local textures = get_player_textures(name)
+	local textures = player_textures[name]
 
 	if not player_visible[name] then
 		textures = table.copy(textures)
@@ -73,7 +63,7 @@ end
 
 local function update_player_textures(player)
 	local name = player:get_player_name()
-	local textures = get_player_textures(name)
+	local textures = player_textures[name]
 
 	if not player_visible[name] then
 		textures = table.copy(textures)
@@ -135,21 +125,18 @@ end
 
 function mcl_player.player_set_skin(player, texture)
 	local name = player:get_player_name()
-	local textures = get_player_textures(name)
-	textures[1] = texture
+	player_textures[name][1] = texture
 	update_player_textures(player)
 end
 
 function mcl_player.player_get_skin(player)
 	local name = player:get_player_name()
-	local textures = get_player_textures(name)
-	return textures[1]
+	return player_textures[name][1]
 end
 
 function mcl_player.player_set_armor(player, texture)
 	local name = player:get_player_name()
-	local textures = get_player_textures(name)
-	textures[2] = texture
+	player_textures[name][2] = texture
 	update_player_textures(player)
 end
 
@@ -164,7 +151,7 @@ function mcl_player.get_player_formspec_model(player, x, y, w, h, fsname)
 	local name = player:get_player_name()
 	local model = player_model[name]
 	local anim = models[model].animations[player_anim[name]]
-	local textures = get_player_textures(name)
+	local textures = player_textures[name]
 	if not player_visible[name] then
 		textures = table.copy(textures)
 		textures[1] = "blank.png"
@@ -192,7 +179,7 @@ minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
 	mcl_player.player_attached[name] = false
 	player_visible[name] = true
-	get_player_textures(name)
+	player_textures[name] = { "character.png", "blank.png", "blank.png" }
 
 	--player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
 -- 	player:set_fov(86.1) -- see <https://minecraft.gamepedia.com/Options#Video_settings>>>>

mods/PLAYER/mcl_playerplus/init.lua

@@ -732,9 +732,10 @@ end, -200)
 minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
 	-- attack reach limit
 	if hitter and hitter:is_player() then
+		local weapon = hitter:get_wielded_item()
 		local player_pos = player:get_pos()
 		local hitter_pos = hitter:get_pos()
-		if vector.distance(player_pos, hitter_pos) > 3 then
+		if vector.distance(player_pos, hitter_pos) > (weapon:get_definition().range or 3) then
 			damage = 0
 			return damage
 		end

mods/PLAYER/mcl_skins/edit_skin.lua

@@ -59,50 +59,6 @@ mcl_skins = {
 	player_formspecs = {},
 }
 
-local player_skins = mcl_skins.player_skins
-
-local function get_player_skins(player)
-	local player_skins = player_skins[player]
-	if player_skins then return player_skins end
-
-	local skin = player:get_meta():get_string("mcl_skins:skin")
-	if skin then
-		skin = minetest.deserialize(skin)
-	end
-	if skin then
-		if not mcl_skins.texture_to_simple_skin[skin.simple_skins_id] then
-			skin.simple_skins_id = nil
-		end
-
-		mcl_skins.player_skins[player] = skin
-	else
-		if math.random() > 0.5 then
-			skin = table.copy(mcl_skins.template1)
-		else
-			skin = table.copy(mcl_skins.template2)
-		end
-		mcl_skins.player_skins[player] = skin
-	end
-
-	mcl_skins.player_formspecs[player] = {
-		active_tab = "skin",
-		page_num = 1
-	}
-
-	if #mcl_skins.simple_skins > 0 then
-		local skin_id = tonumber(player:get_meta():get_string("mcl_skins:skin_id"))
-		if skin_id and mcl_skins.simple_skins[skin_id] then
-			local texture = mcl_skins.simple_skins[skin_id].texture
-			local player_skins = get_player_skins(player)
-			player_skins.simple_skins_id = texture
-		end
-	end
-	mcl_skins.save(player)
-	mcl_skins.update_player_skin(player)
-
-	return mcl_skins.player_skins[player]
-end
-
 function mcl_skins.register_item(item)
 	assert(mcl_skins[item.type], "Skin item type " .. item.type .. " does not exist.")
 
@@ -204,7 +160,7 @@ function mcl_skins.update_player_skin(player)
 		return
 	end
 
-	local skin = get_player_skins(player)
+	local skin = mcl_skins.player_skins[player]
 	local skinval = mcl_skins.compile_skin(skin)
 
 	if not skin.cape then skin.cape = "blank.png" end
@@ -230,7 +186,39 @@ end
 
 -- Load player skin on join
 minetest.register_on_joinplayer(function(player)
-	get_player_skins(player)
+	local skin = player:get_meta():get_string("mcl_skins:skin")
+	if skin then
+		skin = minetest.deserialize(skin)
+	end
+	if skin then
+		if not mcl_skins.texture_to_simple_skin[skin.simple_skins_id] then
+			skin.simple_skins_id = nil
+		end
+
+		mcl_skins.player_skins[player] = skin
+	else
+		if math.random() > 0.5 then
+			skin = table.copy(mcl_skins.template1)
+		else
+			skin = table.copy(mcl_skins.template2)
+		end
+		mcl_skins.player_skins[player] = skin
+	end
+
+	mcl_skins.player_formspecs[player] = {
+		active_tab = "skin",
+		page_num = 1
+	}
+
+	if #mcl_skins.simple_skins > 0 then
+		local skin_id = tonumber(player:get_meta():get_string("mcl_skins:skin_id"))
+		if skin_id and mcl_skins.simple_skins[skin_id] then
+			local texture = mcl_skins.simple_skins[skin_id].texture
+			mcl_skins.player_skins[player].simple_skins_id = texture
+		end
+	end
+	mcl_skins.save(player)
+	mcl_skins.update_player_skin(player)
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -257,7 +245,7 @@ end
 
 function mcl_skins.show_formspec(player, active_tab, page_num)
 	local formspec_data = mcl_skins.player_formspecs[player]
-	local skin = get_player_skins(player)
+	local skin = mcl_skins.player_skins[player]
 	formspec_data.active_tab = active_tab
 
 	local page_count = calculate_page_count(active_tab, player)
@@ -567,8 +555,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		mcl_skins.show_formspec(player, active_tab, page_num)
 		return true
 	elseif fields.nocape then
-		local player_skins = get_player_skins(player)
-		player_skins.cape = "blank.png"
+		mcl_skins.player_skins[player].cape = "blank.png"
 		mcl_skins.update_player_skin(player)
 		mcl_armor.update(player) --update elytra cape
 		mcl_skins.show_formspec(player, active_tab, page_num)
@@ -577,8 +564,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		for cape_index = ((page_num - 1) * 5) + 1, math.min(#mcl_skins.cape, page_num * 5) do
 			local cape = mcl_skins.cape[cape_index]
 			if fields[cape.name] then
-				local player_skins = get_player_skins(player)
-				player_skins.cape = cape.mask -- the actual overlay image
+				mcl_skins.player_skins[player].cape = cape.mask -- the actual overlay image
 				mcl_skins.update_player_skin(player)
 				mcl_armor.update(player) --update elytra cape
 				mcl_skins.show_formspec(player, active_tab, page_num)
@@ -594,7 +580,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 	end
 
-	local skin = get_player_skins(player)
+	local skin = mcl_skins.player_skins[player]
 	if not skin then return true end
 
 	if fields.next_page then

tools/Conversion_Table.csv

@@ -1151,28 +1151,15 @@ 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_acacia_sign.png,,,,,,,
+/assets/minecraft/textures/entity/signs,acacia.png,mcl_signs_sign_acacia.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,birch_sign.png,mcl_signs_birch_sign_inv.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,cherry_sign.png,mcl_cherry_blossom_sign_inv.png,,,,,,,
+/assets/minecraft/textures/item,dark_oak_sign.png,mcl_signs_default_sign_dark.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,9 +122,6 @@ 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

@@ -1,57 +0,0 @@
-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