Merge pull request 'master' (#1736) from master into mineclone5

Reviewed-on: MineClone2/MineClone2#1736

CREDITS.md

@@ -22,6 +22,7 @@
 * Nicu
 * aligator
 * Code-Sploit
+* NO11
 
 ## Contributors
 * Laurent Rocher
@@ -40,7 +41,6 @@
 * Jared Moody
 * Li0n
 * Midgard
-* NO11
 * Saku Laesvuori
 * Yukitty
 * ZedekThePD
@@ -102,6 +102,7 @@
 * leorockway
 * xMrVizzy
 * yutyo
+* NO11
 
 ## Translations
 * Wuzzy

mods/ENTITIES/mcl_mobs/mod.conf

@@ -2,4 +2,4 @@ name = mcl_mobs
 author = PilzAdam
 description = Adds a mob API for mods to add animals or monsters, etc.
 depends = mcl_particles
-optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience
+optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience

mods/HUD/mcl_credits/init.lua

@@ -28,6 +28,7 @@ mcl_credits.people = {
 		"Nicu",
 		"aligator",
 		"Code-Sploit",
+		"NO11",
 	}},
 	{"Contributors", 0x52FF00, {
 		"Laurent Rocher",
@@ -46,7 +47,6 @@ mcl_credits.people = {
 		"Jared Moody",
 		"Li0n",
 		"Midgard",
-		"NO11",
 		"Saku Laesvuori",
 		"Yukitty",
 		"ZedekThePD",
@@ -107,7 +107,8 @@ mcl_credits.people = {
 		"kingoscargames",
 		"leorockway",
 		"xMrVizzy",
-		"yutyo"
+		"yutyo",
+		"NO11",
 	}},
 	{"Translations", 0x00FF60, {
 		"Wuzzy",

mods/ITEMS/mcl_bows/arrow.lua

@@ -118,16 +118,6 @@ ARROW_ENTITY.on_step = function(self, dtime)
 	dpos = vector.round(dpos)
 	local node = minetest.get_node(dpos)
 
-	if self.object:get_attach() ~= nil and self.object:get_attach(parent):get_hp() < 1 then
-		self.object:remove()
-	end
-
-	minetest.register_on_leaveplayer(function(player)
-		if self.object:get_attach(parent) == player then
-			self.object:remove()
-		end
-	end)
-
 	if self._stuck then
 		self._stucktimer = self._stucktimer + dtime
 		self._stuckrechecktimer = self._stuckrechecktimer + dtime

mods/ITEMS/mcl_core/crafting.lua

@@ -4,47 +4,45 @@
 -- Crafting definition
 --
 
-minetest.register_craft({
-	output = 'mcl_core:wood 4',
+local craft_planks = function(output, input)
+	minetest.register_craft({
+		output = "mcl_core:"..output.."wood 4",
 		recipe = {
-		{'mcl_core:tree'},
+			{"mcl_core:"..input},
 		}
-})
+	})
+end
 
-minetest.register_craft({
-	output = 'mcl_core:darkwood 4',
-	recipe = {
-		{'mcl_core:darktree'},
-	}
-})
+craft_planks("", "tree")
+craft_planks("", "tree_bark")
+craft_planks("", "stripped_oak")
+craft_planks("", "stripped_oak_bark")
 
-minetest.register_craft({
-	output = 'mcl_core:junglewood 4',
-	recipe = {
-		{'mcl_core:jungletree'},
-	}
-})
+craft_planks("dark", "darktree")
+craft_planks("dark", "darktree_bark")
+craft_planks("dark", "stripped_dark_oak")
+craft_planks("dark", "stripped_dark_oak_bark")
 
-minetest.register_craft({
-	output = 'mcl_core:acaciawood 4',
-	recipe = {
-		{'mcl_core:acaciatree'},
-	}
-})
+craft_planks("jungle", "jungletree")
+craft_planks("jungle", "jungletree_bark")
+craft_planks("jungle", "stripped_jungle")
+craft_planks("jungle", "stripped_jungle_bark")
 
-minetest.register_craft({
-	output = 'mcl_core:sprucewood 4',
-	recipe = {
-		{'mcl_core:sprucetree'},
-	}
-})
+craft_planks("acacia", "acaciatree")
+craft_planks("acacia", "acaciatree_bark")
+craft_planks("acacia", "stripped_acacia")
+craft_planks("acacia", "stripped_acacia_bark")
+
+craft_planks("spruce", "sprucetree")
+craft_planks("spruce", "sprucetree_bark")
+craft_planks("spruce", "stripped_spruce")
+craft_planks("spruce", "stripped_spruce_bark")
+
+craft_planks("birch", "birchtree")
+craft_planks("birch", "birchtree_bark")
+craft_planks("birch", "stripped_birch")
+craft_planks("birch", "stripped_birch_bark")
 
-minetest.register_craft({
-	output = 'mcl_core:birchwood 4',
-	recipe = {
-		{'mcl_core:birchtree'},
-	}
-})
 
 minetest.register_craft({
 	type = 'shapeless',

mods/PLAYER/mcl_hunger/init.lua

@@ -137,14 +137,14 @@ local timerMult = 1	-- Cycles from 0 to 7, each time when timer hits half a seco
 minetest.register_globalstep(function(dtime)
 	main_timer = main_timer + dtime
 	timer = timer + dtime
-	if main_timer > mcl_hunger.HUD_TICK or timer > 0.5 then
+	if main_timer > mcl_hunger.HUD_TICK or timer > 0.25 then
 		if main_timer > mcl_hunger.HUD_TICK then main_timer = 0 end
 		for _,player in pairs(minetest.get_connected_players()) do
 		local name = player:get_player_name()
 
 		local h = tonumber(mcl_hunger.get_hunger(player))
 		local hp = player:get_hp()
-		if timer > 0.5 then
+		if timer > 0.25 then
 			-- Slow health regeneration, and hunger damage (every 4s).
 			-- Regeneration rate based on tutorial video <https://www.youtube.com/watch?v=zs2t-xCVHBo>.
 			-- Minecraft Wiki seems to be wrong in claiming that full hunger gives 0.5s regen rate.
@@ -166,9 +166,9 @@ minetest.register_globalstep(function(dtime)
 		end
 		end
 	end
-	if timer > 0.5 then
+	if timer > 0.25 then
 		timer = 0
-		timerMult = timerMult + 1
+		timerMult = timerMult + 2
 		if timerMult > 7 then
 			timerMult = 0
 		end