Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2

mods/ENTITIES/mcl_minecarts/init.lua

@@ -12,15 +12,14 @@ local function detach_driver(self)
 	if not self._driver then
 		return
 	end
-	mcl_player.player_attached[self._driver] = nil
+	if self._driver:is_player() then
-	local player = minetest.get_player_by_name(self._driver)
+		mcl_player.player_attached[self._driver:get_player_name()] = nil
+		self._driver:set_detach()
+		self._driver:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
+		mcl_player.player_set_animation(self._driver, "stand" , 30)
+	end
 	self._driver = nil
 	self._start_pos = nil
-	if player then
-		player:set_detach()
-		player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
-		mcl_player.player_set_animation(player, "stand" , 30)
-	end
 end
 
 local function activate_tnt_minecart(self, timer)
@@ -62,7 +61,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 
 		on_rightclick = on_rightclick,
 
-		_driver = nil, -- player who sits in and controls the minecart (only for minecart!)
+		_driver = nil, -- player (or mob) who sits in and controls the minecart (only for minecart!)
 		_punched = false, -- used to re-send _velocity and position
 		_velocity = {x=0, y=0, z=0}, -- only used on punch
 		_start_pos = nil, -- Used to calculate distance for “On A Rail” achievement
@@ -97,111 +96,101 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 	end
 
 	function cart:on_punch(puncher, time_from_last_punch, tool_capabilities, direction)
+		-- Punch: Pick up minecart (unless TNT was ignited)
+		if self._boomtimer then return end
+		if self._driver then
+			detach_driver(self)
+		end
 		local pos = self.object:get_pos()
-		if not self._railtype then
+
-			local node = minetest.get_node(vector.floor(pos)).name
+		-- Disable detector rail
-			self._railtype = minetest.get_item_group(node, "connect_to_raillike")
+		local rou_pos = vector.round(pos)
+		local node = minetest.get_node(rou_pos)
+		if node.name == "mcl_minecarts:detector_rail_on" then
+			local newnode = {name="mcl_minecarts:detector_rail", param2 = node.param2}
+			minetest.swap_node(rou_pos, newnode)
+			mesecon.receptor_off(rou_pos)
 		end
 
-		if not puncher or not puncher:is_player() then
+		-- Drop items and remove cart entity
-			local cart_dir = mcl_minecarts:get_rail_direction(pos, {x=1, y=0, z=0}, nil, nil, self._railtype)
+		if not minetest.is_creative_enabled(puncher:get_player_name()) then
-			if vector.equals(cart_dir, {x=0, y=0, z=0}) then
+			for d=1, #drop do
-				return
+				minetest.add_item(self.object:get_pos(), drop[d])
 			end
-			self._velocity = vector.multiply(cart_dir, 3)
+		elseif puncher and puncher:is_player() then
-			self._old_pos = nil
+			local inv = puncher:get_inventory()
-			self._punched = true
+			for d=1, #drop do
-			return
+				if not inv:contains_item("main", drop[d]) then
-		end
+					inv:add_item("main", drop[d])
-
-		-- Punch+sneak: Pick up minecart (unless TNT was ignited)
-		if puncher:get_player_control().sneak and not self._boomtimer then
-			if self._driver then
-				if self._old_pos then
-					self.object:set_pos(self._old_pos)
-				end
-				detach_driver(self)
-			end
-
-			-- Disable detector rail
-			local rou_pos = vector.round(pos)
-			local node = minetest.get_node(rou_pos)
-			if node.name == "mcl_minecarts:detector_rail_on" then
-				local newnode = {name="mcl_minecarts:detector_rail", param2 = node.param2}
-				minetest.swap_node(rou_pos, newnode)
-				mesecon.receptor_off(rou_pos)
-			end
-
-			-- Drop items and remove cart entity
-			if not minetest.is_creative_enabled(puncher:get_player_name()) then
-				for d=1, #drop do
-					minetest.add_item(self.object:get_pos(), drop[d])
-				end
-			elseif puncher and puncher:is_player() then
-				local inv = puncher:get_inventory()
-				for d=1, #drop do
-					if not inv:contains_item("main", drop[d]) then
-						inv:add_item("main", drop[d])
-					end
 				end
 			end
-
-			self.object:remove()
-			return
 		end
 
-		local vel = self.object:get_velocity()
+		self.object:remove()
-		if puncher:get_player_name() == self._driver then
-			if math.abs(vel.x + vel.z) > 7 then
-				return
-			end
-		end
-
-		local punch_dir = mcl_minecarts:velocity_to_dir(puncher:get_look_dir())
-		punch_dir.y = 0
-		local cart_dir = mcl_minecarts:get_rail_direction(pos, punch_dir, nil, nil, self._railtype)
-		if vector.equals(cart_dir, {x=0, y=0, z=0}) then
-			return
-		end
-
-		time_from_last_punch = math.min(time_from_last_punch, tool_capabilities.full_punch_interval)
-		local f = 3 * (time_from_last_punch / tool_capabilities.full_punch_interval)
-
-		self._velocity = vector.multiply(cart_dir, f)
-		self._old_pos = nil
-		self._punched = true
 	end
 
 	cart.on_activate_by_rail = on_activate_by_rail
 
 	function cart:on_step(dtime)
 		local ctrl, player = nil, nil
-		if self._driver then
+		local update = {}
-			player = minetest.get_player_by_name(self._driver)
+		local vel = self.object:get_velocity()
-			if player then
+		local pos, rou_pos, node
-				ctrl = player:get_player_control()
+		pos = self.object:get_pos()
-				-- player detach
+		rou_pos = vector.round(pos)
-				if ctrl.sneak then
+		node = minetest.get_node(rou_pos)
-					detach_driver(self)
+		local g = minetest.get_item_group(node.name, "connect_to_raillike")
-					return
+		if self._driver and self._driver:is_player() then
+			player = self._driver
+			ctrl = player:get_player_control()
+			-- player detach
+			if ctrl.sneak then
+				detach_driver(self)
+				return
+			end
+			if g == self._railtype then
+				if ctrl.right then
+					local c = vector.multiply(minetest.yaw_to_dir(self._driver:get_look_horizontal()-1.57), 0.2)
+					self.object:set_velocity(vector.add(vel, {x=c.x, y=0, z=c.z}))
+				end
+				if ctrl.left then
+					local c = vector.multiply(minetest.yaw_to_dir(self._driver:get_look_horizontal()+1.57), 0.2)
+					self.object:set_velocity(vector.add(vel, {x=c.x, y=0, z=c.z}))
+				end
+				if ctrl.up then
+					local c = vector.multiply(self._driver:get_look_dir(), 0.2)
+					self.object:set_velocity(vector.add(vel, {x=c.x, y=0, z=c.z}))
+				end
+				if ctrl.down then
+					local c = vector.multiply(self._driver:get_look_dir(), 0.2)
+					self.object:set_velocity(vector.subtract(vel, {x=c.x, y=0, z=c.z}))
 				end
 			end
 		end
 
-		local vel = self.object:get_velocity()
-		local update = {}
 		if self._last_float_check == nil then
 			self._last_float_check = 0
 		else
 			self._last_float_check = self._last_float_check + dtime
 		end
-		local pos, rou_pos, node
 		-- Drop minecart if it isn't on a rail anymore
 		if self._last_float_check >= mcl_minecarts.check_float_time then
-			pos = self.object:get_pos()
+
-			rou_pos = vector.round(pos)
+
-			node = minetest.get_node(rou_pos)
+			for _,object in pairs(minetest.get_objects_inside_radius(pos, 1.3)) do
-			local g = minetest.get_item_group(node.name, "connect_to_raillike")
+				if object ~= self.object then
+					local mob = object:get_luaentity()
+					if mob then mob = mob._cmi_is_mob == true end
+					if mob and (not self._driver) and not object:get_attach() then
+						self._driver = object
+						object:set_attach(self.object, "", {x=0, y=-1.75, z=-2}, {x=0, y=0, z=0})
+						mobs:set_animation(self.object, "stand")
+						return
+					end
+				end
+			end
+
+
 			if g ~= self._railtype and self._railtype ~= nil then
 				-- Detach driver
 				if player then
@@ -300,8 +289,12 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 			end
 		end
 
-		if self._punched then
+		if update.vel then
 			vel = vector.add(vel, self._velocity)
+			if vel.x>8 then vel.x = 8 end
+			if vel.x<-8 then vel.x = -8 end
+			if vel.z>8 then vel.z = 8 end
+			if vel.z<-8 then vel.z = -8 end
 			self.object:set_velocity(vel)
 			self._old_dir.y = 0
 		elseif vector.equals(vel, {x=0, y=0, z=0}) and (not has_fuel) then
@@ -626,17 +619,14 @@ register_minecart(
 	"mcl_minecarts_minecart_normal.png",
 	{"mcl_minecarts:minecart"},
 	function(self, clicker)
-		local name = clicker:get_player_name()
+		if not clicker or not clicker:is_player() then return end
-		if not clicker or not clicker:is_player() then
+		if clicker == self._driver then
-			return
-		end
-		local player_name = clicker:get_player_name()
-		if self._driver and player_name == self._driver then
 			detach_driver(self)
-		elseif not self._driver then
+		else
-			self._driver = player_name
+			local name = clicker:get_player_name()
+			self._driver = clicker
 			self._start_pos = self.object:get_pos()
-			mcl_player.player_attached[player_name] = true
+			mcl_player.player_attached[name] = true
 			clicker:set_attach(self.object, "", {x=0, y=-1.75, z=-2}, {x=0, y=0, z=0})
 			mcl_player.player_attached[name] = true
 			minetest.after(0.2, function(name)
@@ -647,6 +637,7 @@ register_minecart(
 					mcl_tmp_message.message(clicker, S("Sneak to dismount"))
 				end
 			end, name)
+			clicker:set_look_horizontal(self.object:get_yaw())
 		end
 	end, activate_normal_minecart
 )

mods/ENTITIES/mobs_mc/villager.lua

@@ -412,6 +412,7 @@ local init_trades = function(self, inv)
 					offered_stack = mcl_enchanting.get_uniform_randomly_enchanted_book({"soul_speed"})
 				else
 					mcl_enchanting.enchant_randomly(offered_stack, math.random(5, 19), false, false, true)
+					mcl_enchanting.unload_enchantments(offered_stack)
 				end
 			end
 
@@ -457,7 +458,9 @@ local set_trade = function(trader, player, inv, concrete_tradenum)
 	player_tradenum[name] = concrete_tradenum
 	local trade = trades[concrete_tradenum]
 	inv:set_stack("wanted", 1, ItemStack(trade.wanted[1]))
-	inv:set_stack("offered", 1, ItemStack(trade.offered))
+	local offered = ItemStack(trade.offered)
+	mcl_enchanting.load_enchantments(offered)
+	inv:set_stack("offered", 1, offered)
 	if trade.wanted[2] then
 		local wanted2 = ItemStack(trade.wanted[2])
 		inv:set_stack("wanted", 2, wanted2)

mods/ITEMS/mcl_enchanting/enchantments.lua

@@ -124,8 +124,8 @@ mcl_enchanting.enchantments.curse_of_vanishing = {
 	inv_tool_tab = true,
 }
 
--- unimplemented
+-- implemented in mcl_playerplus
---[[mcl_enchanting.enchantments.depth_strider = {
+mcl_enchanting.enchantments.depth_strider = {
 	name = S("Depth Strider"),
 	max_level = 3,
 	primary = {},
@@ -141,7 +141,7 @@ mcl_enchanting.enchantments.curse_of_vanishing = {
 	power_range_table = {{10, 25}, {20, 35}, {30, 45}},
 	inv_combat_tab = true,
 	inv_tool_tab = false,
-}]]--
+}
 
 -- implemented via on_enchant
 mcl_enchanting.enchantments.efficiency = {

mods/ITEMS/mcl_enchanting/engine.lua

@@ -9,14 +9,21 @@ function mcl_enchanting.get_enchantments(itemstack)
 	return minetest.deserialize(itemstack:get_meta():get_string("mcl_enchanting:enchantments")) or {}
 end
 
-function mcl_enchanting.set_enchantments(itemstack, enchantments)
+function mcl_enchanting.unload_enchantments(itemstack)
-	itemstack:get_meta():set_string("mcl_enchanting:enchantments", minetest.serialize(enchantments))
 	local itemdef = itemstack:get_definition()
+	if itemdef.tool_capabilities then
+		itemstack:get_meta():set_tool_capabilities(itemdef.tool_capabilities)
+	end
+	local meta = itemstack:get_meta()
+	if meta:get_string("name") == "" then
+		meta:set_string("description", "")
+	end
+end
+
+function mcl_enchanting.load_enchantments(itemstack, enchantments)
 	if not mcl_enchanting.is_book(itemstack:get_name()) then
-		if itemdef.tool_capabilities then
+		mcl_enchanting.unload_enchantments(itemstack)		
-			itemstack:get_meta():set_tool_capabilities(itemdef.tool_capabilities)
+		for enchantment, level in pairs(enchantments or mcl_enchanting.get_enchantments(itemstack)) do
-		end
-		for enchantment, level in pairs(enchantments) do
 			local enchantment_def = mcl_enchanting.enchantments[enchantment]
 			if enchantment_def.on_enchant then
 				enchantment_def.on_enchant(itemstack, level)
@@ -26,6 +33,11 @@ function mcl_enchanting.set_enchantments(itemstack, enchantments)
 	tt.reload_itemstack_description(itemstack)
 end
 
+function mcl_enchanting.set_enchantments(itemstack, enchantments)
+	itemstack:get_meta():set_string("mcl_enchanting:enchantments", minetest.serialize(enchantments))
+	mcl_enchanting.load_enchantments(itemstack)
+end
+
 function mcl_enchanting.get_enchantment(itemstack, enchantment)
 	return mcl_enchanting.get_enchantments(itemstack)[enchantment] or 0
 end

mods/PLAYER/mcl_playerplus/init.lua

@@ -197,6 +197,18 @@ minetest.register_globalstep(function(dtime)
 			playerphysics.remove_physics_factor(player, "speed", "mcl_playerplus:surface")
 		end
 
+		-- Swimming? Check if boots are enchanted with depth strider
+		if minetest.get_item_group(node_feet, "liquid") ~= 0 and mcl_enchanting.get_enchantment(player:get_inventory():get_stack("armor", 5), "depth_strider") then
+			local boots = player:get_inventory():get_stack("armor", 5)
+			local depth_strider = mcl_enchanting.get_enchantment(boots, "depth_strider")
+			
+			if depth_strider > 0 then
+				playerphysics.add_physics_factor(player, "speed", "mcl_playerplus:surface", (depth_strider / 3) + 0.75)
+			end
+		else
+			playerphysics.remove_physics_factor(player, "speed", "mcl_playerplus:surface")
+		end
+
 		-- Is player suffocating inside node? (Only for solid full opaque cube type nodes
 		-- without group disable_suffocation=1)
 		local ndef = minetest.registered_nodes[node_head]