Move data from deprecated files to mod.conf

Move data from deprecated files (depends.txt and description.txt) into
fields in mod.conf for all mods.

.gitea/issue_template/bug-report.md

@@ -1,38 +0,0 @@
----
-
-name: "Bug Report"
-about: "Use this for when something's broken."
-labels:
- - bug
- - unconfirmed
-
----
-
-##### What happened?
-
-<!-- Describe what's wrong. -->
-
-##### What did I expect?
-
-<!-- Describe what should be happening instead -->
-
-##### How to get it to happen
-
-<!--
-Write down exactly what you did to get the bug to happen
-If you need more steps, just keep adding numbers. If you
-don't need them all, delete the empty numbers.
--->
-1. 
-2. 
-3. 
-
-##### Environment
-
-Mineclonia Version: <!-- Paste the version of Mineclonia here, if you know it. -->
-
-<!--
-Please refer to https://git.minetest.land/Mineclonia/Mineclonia/wiki/Reporting-Bugs
-if you need help finding your Minetest version.
--->
-Minetest Version:

.gitea/issue_template/feature-request.md

@@ -1,22 +0,0 @@
----
-
-name: "Feature Request"
-about: "Mineclonia doesn't do something you need it to"
-labels:
- - "feature request"
-
----
-
-##### Problem
-
-<!--
-Describe what's wrong.
-
-If you're reporting a missing feature from Minecraft,
-please include a link to the Minetest wiki or Mojang bug
-tracker entry describing that feature.
--->
-
-##### Solution
-
-<!-- Write down an example of what you'd like to happen. -->

.gitea/pull_request_template.md

@@ -1,51 +0,0 @@
-<!--
-Please include the main mod this PR affects in the title, including
-the leading directory. For example, if you have added a new
-type of banner to mcl_banners, the title should look like:
-
-    items/mcl_banners: add new banner type
-
--->
-##### Problem
-TRACKING ISSUE: #<!-- Tracking issue number -->
-
-<!--
-Describe WHAT problem this pull request solves.
-If the tracking issue includes all the needed
-information, you can leave this section empty.
--->
-
-##### Solution
-
-<!-- Describe HOW this pull request solves its problem. -->
-
-##### Details
-
-<!-- Include any additional information here. -->
-
-##### Testing Steps
-
-<!--
-Write how we can verify this patch addresses its problem.
-If you need more steps, just keep adding numbers. If you
-don't need them all, delete the empty numbers.
--->
-1. 
-2. 
-3. 
-
-<!--
-If your pull request still needs work, uncomment the
-following section and include a list of things that
-need to be done before it's ready for us to look at.
-
-Please remember to put WIP: in front of the title as well.
--->
-
-<!--
-##### To do
-
-- [ ] Item 1
-- [ ] Item 2
-- [ ] Item 3
--->

API.md

@@ -17,10 +17,6 @@ Items can have these fields:
    anvil.
    See `mcl_banners` for an example.
 
-Tools can have these fields:
-* `_mcl_diggroups`: Specifies the digging groups that a tool can dig and how
-  efficiently.  See `_mcl_autogroup` for more information.
-
 All nodes can have these fields:
 
 * `_mcl_hardness`: Hardness of the block, ranges from 0 to infinity (represented by -1). Determines digging times. Default: 0

README.md

@@ -1,5 +1,5 @@
-# Mineclonia
+# MineClone 2
-An unofficial Minecraft-like game for Minetest. Forked from MineClone2.
+An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
 Developed by many people. Not developed or endorsed by Mojang AB.
 
 Version: 0.71.0
@@ -74,24 +74,24 @@ These items do not work yet, but you can get them with `/giveme` for testing:
 * Minecart with Command Block: `mcl_minecarts:command_block_minecart`
 
 ## Installation
-This game requires [Minetest](http://minetest.net) to run (version 5.4.0 or
+This game requires [Minetest](http://minetest.net) to run (version 5.0.0 or
 later). So you need to install Minetest first. Only stable versions of Minetest
 are officially supported.
-There is no support for running Mineclonia in development versions of Minetest.
+There is no support for running MineClone 2 in development versions of Minetest.
 
-To install Mineclonia (if you haven't already), move this directory into the
+To install MineClone 2 (if you haven't already), move this directory into the
 “games” directory of your Minetest data directory. Consult the help of
 Minetest to learn more.
 
 ## Project description
-The main goal of **Mineclonia** is to be a clone of Minecraft and to be released as free software.
+The main goal of **MineClone 2** is to be a clone of Minecraft and to be released as free software.
 
 * **Target of development: Minecraft, PC Edition, version 1.12** (later known as “Java Edition”)
-* Mineclonia also includes Optifine features supported by the Minetest
+* MineClone2 also includes Optifine features supported by the Minetest
 * Features of later Minecraft versions might sneak in, but they have a low priority
 * In general, Minecraft is aimed to be cloned as good as Minetest currently permits (no hacks)
 * Cloning the gameplay has highest priority
-* Mineclonia will use different graphics and sounds, but with a similar style
+* MineClone 2 will use different graphics and sounds, but with a similar style
 * Cloning the interface has no priority. It will only be roughly imitated
 * Limitations found in Minetest will be written down and reported in the course of development
 
@@ -178,18 +178,18 @@ Technical differences from Minecraft:
 * Different sounds (various sources)
 * Different engine (Minetest)
 
-… and finally, Mineclonia is free software (“free” as in “freedom”)!
+… and finally, MineClone 2 is free software (“free” as in “freedom”)!
 
 ## Reporting bugs
 Please report all bugs and missing Minecraft features here:
 
-<https://git.minetest.land/Mineclonia/Mineclonia/issues>
+<https://git.minetest.land/MineClone2/MineClone2/issues>
 
 ## Other readme files
 
 * `LICENSE.txt`: The GPLv3 license text
 * `CONTRIBUTING.md`: Information for those who want to contribute
-* `MISSING_ENGINE_FEATURES.md`: List of missing features in Minetest which Mineclonia would need for improvement
+* `MISSING_ENGINE_FEATURES.md`: List of missing features in Minetest which MineClone 2 would need for improvement
 * `API.md`: For Minetest modders who want to mod this game
 
 ## Credits
@@ -197,15 +197,15 @@ There are so many people to list (sorry). Check out the respective mod directori
 
 ### Coding
 * [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082): Main programmer of most mods (retired)
-* davedevils: Creator of MineClone on which Mineclonia is based on
+* davedevils: Creator of MineClone on which MineClone 2 is based on
 * [ex-bart](https://github.com/ex-bart): Redstone comparators
 * [Rootyjr](https://github.com/Rootyjr): Fishing rod and bugfixes
 * [aligator](https://github.com/aligator): Improvement of doors
 * [ryvnf](https://github.com/ryvnf): Explosion mechanics
 * MysticTempest: Bugfixes
 * [bzoss](https://github.com/bzoss): Status effects, potions, brewing stand
-* kay27 <kay27@bk.ru>: Experience system, bugfixes, optimizations
+* kay27 <kay27@bk.ru>: Experience system, bugfixes, optimizations (Current maintainer)
-* [EliasFleckenstein03](https://github.com/EliasFleckenstein03): End crystals, enchanting, burning mobs / players, animated chests, bugfixes
+* [EliasFleckenstein03](https://github.com/EliasFleckenstein03): End crystals, enchanting, burning mobs / players, animated chests, bugfixes (Current maintainer)
 * epCode: Better player animations, new logo
 * 2mac: Fix bug with powered rail
 * Lots of other people: TO BE WRITTEN (see mod directories for details)
@@ -255,7 +255,7 @@ Various sources. See the respective mod directories for details.
 * davedevils for starting MineClone, the original version of this game
 * Wuzzy for starting and maintaining MineClone2 for several years
 * celeron55 for creating Minetest
-* Minetest's modding community for providing a huge selection of mods, some of which ended up in Mineclonia
+* Minetest's modding community for providing a huge selection of mods, some of which ended up in MineClone 2
 * Jordach for the jukebox music compilation from Big Freaking Dig
 * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
 * Notch and Jeb for being the major forces behind Minecraft
@@ -273,9 +273,10 @@ Copying is an act of love. Please copy and share! <3
 Here's the detailed legalese for those who need it:
 
 ### License of source code
-Mineclonia is an imitation of Minecraft.
+MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
+is an imitation of Minecraft.
 
-Mineclonia is free software: you can redistribute it and/or modify
+MineClone 2 is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
@@ -289,15 +290,15 @@ details.
 In the mods you might find in the read-me or license
 text files a different license. This counts as dual-licensing.
 You can choose which license applies to you: Either the
-license of Mineclonia (GNU GPLv3) or the mod's license.
+license of MineClone 2 (GNU GPLv3) or the mod's license.
 
-Mineclonia is a continuation of the discontinued MineClone project by davedevils
+MineClone 2 is a direct continuation of the discontinued MineClone
-and the MineClone2 project by Wuzzy.
+project by davedevils.
 
 Mod credits:
 See `README.txt` or `README.md` in each mod directory for information about other authors.
 For mods that do not have such a file, the license is the source code license
-of Mineclonia and the author is Wuzzy.
+of MineClone 2 and the author is Wuzzy.
 
 ### License of media (textures and sounds)
 No non-free licenses are used anywhere.

game.conf

@@ -1,2 +1,2 @@
-name = Mineclonia
+name = MineClone 2
 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.

mods/CORE/_mcl_autogroup/README.txt

@@ -4,11 +4,6 @@ Specifically, this mod has 2 purposes:
 1) Automatically adding the group “solid” for blocks considered “solid” in Minecraft.
 2) Generating digging time group for all nodes based on node metadata (it's complicated)
 
-This mod also requires another mod called “mcl_autogroup” to function properly.
-“mcl_autogroup” exposes the API used to register digging groups, while this mod
-uses those digging groups to set the digging time groups for all the nodes and
-tools.
-
 See init.lua for more infos.
 
 The leading underscore in the name “_mcl_autogroup” was added to force Minetest to load this mod as late as possible.

mods/CORE/_mcl_autogroup/init.lua

@@ -1,361 +1,169 @@
---[[
+--[[ Mining times. Yeah, mining times … Alright, this is going to be FUN!
-This mod implements a HACK to make 100% sure the digging times of all tools
-match Minecraft's perfectly.  The digging times system of Minetest is very
-different, so this weird group trickery has to be used.  In Minecraft, each
-block has a hardness and the actual Minecraft digging time is determined by
-this:
 
+This mod does include a HACK to make 100% sure the digging times of all tools match Minecraft's perfectly.
+The digging times system of Minetest is very different, so this weird group trickery has to be used.
+In Minecraft, each block has a hardness and the actual Minecraft digging time is determined by this:
 1) The block's hardness
-2) The tool being used (the tool speed and its efficiency level)
+2) The tool being used
-3) Whether the tool is considered as "eligible" for the block
+3) Whether the tool is considered as “eligible” for the block
    (e.g. only diamond pick eligible for obsidian)
+See Minecraft Wiki <http://minecraft.gamepedia.com/Minecraft_Wiki> for more information.
 
-See Minecraft Wiki <http://minecraft.gamepedia.com/Minecraft_Wiki> for more
+In MineClone 2, all diggable node have the hardness set in the custom field “_mcl_hardness” (0 by default).
-information.
+The nodes are also required to specify the “eligible” tools in groups like “pickaxey”, “shovely”, etc.
+This mod then calculates the real digging time based on the node meta data. The real digging times
+are then added into mcl_autogroup.digtimes where the table indices are group rating and the values are the
+digging times in seconds. These digging times can be then added verbatim into the tool definitions.
 
-How the mod is used
+Example:
-===================
+mcl_autogroup.digtimes.pickaxey_dig_diamond[1] = 0.2
 
-In MineClone 2, all diggable nodes have the hardness set in the custom field
+→ This means that when a node has been assigned the group “pickaxey_dig_diamond=1”, it can be dug by the
-"_mcl_hardness" (0 by default).  These values are used together with digging
+diamond pickaxe in 0.2 seconds.
-groups by this mod to create the correct digging times for nodes.  Digging
-groups are registered using the following code:
 
-    mcl_autogroup.register_diggroup("shovely")
-    mcl_autogroup.register_diggroup("pickaxey", {
-        levels = { "wood", "gold", "stone", "iron", "diamond" }
-    })
 
-The first line registers a simple digging group.  The second line registers a
-digging group with 5 different levels (in this case one for each material of a
-pickaxes).
 
-Nodes indicate that they belong to a particular digging group by being member of
+This strange setup with mcl_autogroup has been done to minimize the amount of required digging times
-the digging group in their node definition.  "mcl_core:dirt" for example has
+a single tool needs to use. If this is not being done, the loading time will increase considerably
-shovely=1 in its groups.  If the digging group has multiple levels the value of
+(>10s).
-the group indicates which digging level the node requires.
-"mcl_core:stone_with_gold" for example has pickaxey=4 because it requires a
-pickaxe of level 4 be mined.
 
-For tools to be able to dig nodes of digging groups they need to use the have
+]]
-the custom field "_mcl_diggroups" function to get the groupcaps.  The value of
-this field is a table which defines which groups the tool can dig and how
-efficiently.
 
-    _mcl_diggroups = {
+local materials = { "wood", "gold", "stone", "iron", "diamond" }
-        handy = { speed = 1, level = 1, uses = 0 },
+local basegroups = { "pickaxey", "axey", "shovely" }
-        pickaxey = { speed = 1, level = 0, uses = 0 },
+local minigroups = { "handy", "shearsy", "swordy", "shearsy_wool", "swordy_cobweb" }
-    }
+local divisors = {
+	["wood"] = 2,
+	["gold"] = 12,
+	["stone"] = 4,
+	["iron"] = 6,
+	["diamond"] = 8,
+	["handy"] = 1,
+	["shearsy"] = 15,
+	["swordy"] = 1.5,
+	["shearsy_wool"] = 5,
+	["swordy_cobweb"] = 15,
+}
+local max_efficiency_level = 5
 
-The "uses" field indicate how many uses (0 for infinite) a tool has when used on
+mcl_autogroup = {}
-the specified digging group.  The "speed" field is a multiplier to the dig speed
+mcl_autogroup.digtimes = {}
-on that digging group.
+mcl_autogroup.creativetimes = {}	-- Copy of digtimes, except that all values are 0. Used for creative mode
 
-The "level" field indicates which levels of the group the tool can harvest.  A
+for m=1, #materials do
-level of 0 means that the tool cannot harvest blocks of that node.  A level of 1
+	for g=1, #basegroups do
-or above means that the tool can harvest nodes with that level or below.  See
+		mcl_autogroup.digtimes[basegroups[g].."_dig_"..materials[m]] = {}
-"mcl_tools/init.lua" for examples on how "_mcl_diggroups" is used in practice.
+		mcl_autogroup.creativetimes[basegroups[g].."_dig_"..materials[m]] = {}
-
+		for e=1, max_efficiency_level do
-Information about the mod
+			mcl_autogroup.digtimes[basegroups[g].."_dig_"..materials[m].."_efficiency_"..e] = {}
-=========================
-
-The mod is split up into two parts, mcl_autogroup and _mcl_autogroup.
-mcl_autogroup contains the API functions used to register custom digging groups.
-_mcl_autogroup contains most of the code.  The leading underscore in the name
-"_mcl_autogroup" is used to force Minetest to load that part of the mod as late
-as possible.  Minetest loads mods in reverse alphabetical order.
-
-This also means that it is very important that no mod adds _mcl_autogroup as a
-dependency.
---]]
-
-assert(minetest.get_modpath("mcl_autogroup"), "This mod requires the mod mcl_autogroup to function")
-
--- Returns a table containing the unique "_mcl_hardness" for nodes belonging to
--- each diggroup.
-local function get_hardness_values_for_groups()
-	local maps = {}
-	local values = {}
-	for g, _ in pairs(mcl_autogroup.registered_diggroups) do
-		maps[g] = {}
-		values[g] = {}
-	end
-
-	for _, ndef in pairs(minetest.registered_nodes) do
-		for g, _ in pairs(mcl_autogroup.registered_diggroups) do
-			if ndef.groups[g] ~= nil then
-				maps[g][ndef._mcl_hardness or 0] = true
-			end
-		end
-	end
-
-	for g, map in pairs(maps) do
-		for k, _ in pairs(map) do
-			table.insert(values[g], k)
-		end
-	end
-
-	for g, _ in pairs(mcl_autogroup.registered_diggroups) do
-		table.sort(values[g])
-	end
-	return values
-end
-
--- Returns a table containing a table indexed by "_mcl_hardness_value" to get
--- its index in the list of unique hardnesses for each diggroup.
-local function get_hardness_lookup_for_groups(hardness_values)
-	local map = {}
-	for g, values in pairs(hardness_values) do
-		map[g] = {}
-		for k, v in pairs(values) do
-			map[g][v] = k
-		end
-	end
-	return map
-end
-
--- Array of unique hardness values for each group which affects dig time.
-local hardness_values = get_hardness_values_for_groups()
-
--- Map indexed by hardness values which return the index of that value in
--- hardness_value.  Used for quick lookup.
-local hardness_lookup = get_hardness_lookup_for_groups(hardness_values)
-
-local function compute_creativetimes(group)
-	local creativetimes = {}
-
-	for index, hardness in pairs(hardness_values[group]) do
-		table.insert(creativetimes, 0)
-	end
-
-	return creativetimes
-end
-
--- Get the list of digging times for using a specific tool on a specific
--- diggroup.
---
--- Parameters:
--- group - the group which it is digging
--- can_harvest - if the tool can harvest the block
--- speed - dig speed multiplier for tool (default 1)
--- efficiency - efficiency level for the tool if applicable
-local function get_digtimes(group, can_harvest, speed, efficiency)
-	local speed = speed or 1
-	if efficiency then
-		speed = speed + efficiency * efficiency + 1
-	end
-
-	local digtimes = {}
-
-	for index, hardness in pairs(hardness_values[group]) do
-		local digtime = (hardness or 0) / speed
-		if can_harvest then
-			digtime = digtime * 1.5
-		else
-			digtime = digtime * 5
-		end
-
-		if digtime <= 0.05 then
-			digtime = 0
-		else
-			digtime = math.ceil(digtime * 20) / 20
-		end
-		table.insert(digtimes, digtime)
-	end
-
-	return digtimes
-end
-
--- Get one groupcap field for using a specific tool on a specific group.
-local function get_groupcap(group, can_harvest, multiplier, efficiency, uses)
-	return {
-		times = get_digtimes(group, can_harvest, multiplier, efficiency),
-		uses = uses,
-		maxlevel = 0,
-	}
-end
-
--- Add the groupcaps from a field in "_mcl_diggroups" to the groupcaps of a
--- tool.
-local function add_groupcaps(toolname, groupcaps, groupcaps_def, efficiency)
-	if not groupcaps_def then
-		return
-	end
-
-	for g, capsdef in pairs(groupcaps_def) do
-		local mult = capsdef.speed or 1
-		local uses = capsdef.uses
-		local def = mcl_autogroup.registered_diggroups[g]
-		local max_level = def.levels and #def.levels or 1
-
-		assert(capsdef.level, toolname .. ' is missing level for ' .. g)
-		local level = math.min(capsdef.level, max_level)
-
-		if def.levels then
-			groupcaps[g .. "_dig_default"] = get_groupcap(g, false, mult, efficiency, uses)
-			if level > 0 then
-				groupcaps[g .. "_dig_" .. def.levels[level]] = get_groupcap(g, true, mult, efficiency, uses)
-			end
-		else
-			groupcaps[g .. "_dig"] = get_groupcap(g, level > 0, mult, efficiency, uses)
 		end
 	end
 end
-
+for g=1, #minigroups do
--- Checks if the given node would drop its useful drop if dug by a given tool.
+	mcl_autogroup.digtimes[minigroups[g].."_dig"] = {}
--- Returns true if it will yield its useful drop, false otherwise.
+	mcl_autogroup.creativetimes[minigroups[g].."_dig"] = {}
-function mcl_autogroup.can_harvest(nodename, toolname)
+	for e=1, max_efficiency_level do
-	local ndef = minetest.registered_nodes[nodename]
+		mcl_autogroup.digtimes[minigroups[g].."_dig_efficiency_"..e] = {}
-
+		mcl_autogroup.creativetimes[minigroups[g].."_dig_efficiency_"..e] = {}
-	if minetest.get_item_group(nodename, "dig_immediate") >= 2 then
-		return true
 	end
-
-	-- Check if it can be dug by tool
-	local tdef = minetest.registered_tools[toolname]
-	if tdef and tdef._mcl_diggroups then
-		for g, gdef in pairs(tdef._mcl_diggroups) do
-			if ndef.groups[g] then
-				if ndef.groups[g] <= gdef.level then
-					return true
-				end
-			end
-		end
-	end
-
-	-- Check if it can be dug by hand
-	local tdef = minetest.registered_tools[""]
-	if tdef then
-		for g, gdef in pairs(tdef._mcl_diggroups) do
-			if ndef.groups[g] then
-				if ndef.groups[g] <= gdef.level then
-					return true
-				end
-			end
-		end
-	end
-
-	return false
-end
-
--- Get one groupcap field for using a specific tool on a specific group.
-local function get_groupcap(group, can_harvest, multiplier, efficiency, uses)
-	return {
-		times = get_digtimes(group, can_harvest, multiplier, efficiency),
-		uses = uses,
-		maxlevel = 0,
-	}
-end
-
--- Returns the tool_capabilities from a tool definition or a default set of
--- tool_capabilities
-local function get_tool_capabilities(tdef)
-	if tdef.tool_capabilities then
-		return tdef.tool_capabilities
-	end
-
-	-- If the damage group and punch interval from hand is not included,
-	-- then the user will not be able to attack with the tool.
-	local hand_toolcaps = minetest.registered_tools[""].tool_capabilities
-	return {
-		full_punch_interval = hand_toolcaps.full_punch_interval,
-		damage_groups = hand_toolcaps.damage_groups
-	}
-end
-
--- Get the groupcaps for a tool.  This function returns "groupcaps" table of
--- digging which should be put in the "tool_capabilities" of the tool definition
--- or in the metadata of an enchanted tool.
---
--- Parameters:
--- toolname - Name of the tool being enchanted (like "mcl_tools:diamond_pickaxe")
--- efficiency - The efficiency level the tool is enchanted with (default 0)
---
--- NOTE: 
--- This function can only be called after mod initialization.  Otherwise a mod
--- would have to add _mcl_autogroup as a dependency which would break the mod
--- loading order.
-function mcl_autogroup.get_groupcaps(toolname, efficiency)
-	local tdef = minetest.registered_tools[toolname]
-	local groupcaps = table.copy(get_tool_capabilities(tdef).groupcaps or {})
-	add_groupcaps(toolname, groupcaps, tdef._mcl_diggroups, efficiency)
-	return groupcaps
-end
-
--- Get the wear from using a tool on a digging group.
---
--- Parameters
--- toolname - Name of the tool used
--- diggroup - The name of the diggroup the tool is used on
---
--- NOTE: 
--- This function can only be called after mod initialization.  Otherwise a mod
--- would have to add _mcl_autogroup as a dependency which would break the mod
--- loading order.
-function mcl_autogroup.get_wear(toolname, diggroup)
-	local tdef = minetest.registered_tools[toolname]
-	local uses = tdef._mcl_diggroups[diggroup].uses
-	return math.ceil(65535 / uses)
 end
 
 local overwrite = function()
 	for nname, ndef in pairs(minetest.registered_nodes) do
+		local groups_changed = false
 		local newgroups = table.copy(ndef.groups)
 		if (nname ~= "ignore" and ndef.diggable) then
-			-- Automatically assign the "solid" group for solid nodes
+			-- Automatically assign the “solid” group for solid nodes
 			if (ndef.walkable == nil or ndef.walkable == true)
 					and (ndef.collision_box == nil or ndef.collision_box.type == "regular")
 					and (ndef.node_box == nil or ndef.node_box.type == "regular")
 					and (ndef.groups.not_solid == 0 or ndef.groups.not_solid == nil) then
 				newgroups.solid = 1
+				groups_changed = true
 			end
-			-- Automatically assign the "opaque" group for opaque nodes
+			-- Automatically assign the “opaque” group for opaque nodes
 			if (not (ndef.paramtype == "light" or ndef.sunlight_propagates)) and
 					(ndef.groups.not_opaque == 0 or ndef.groups.not_opaque == nil) then
 				newgroups.opaque = 1
+				groups_changed = true
 			end
 
-			local creative_breakable = false
+			local function calculate_group(hardness, material, diggroup, newgroups, actual_rating, expected_rating, efficiency)
+				local time, validity_factor
+				if actual_rating >= expected_rating then
+					-- Valid tool
+					validity_factor = 1.5
+				else
+					-- Wrong tool (higher digging time)
+					validity_factor = 5
+				end
+				local speed_multiplier = divisors[material]
+				if efficiency then
+					speed_multiplier = speed_multiplier + efficiency * efficiency + 1
+				end
+				time = (hardness * validity_factor) / speed_multiplier
+				if time <= 0.05 then
+					time = 0
+				else
+					time = math.ceil(time * 20) / 20
+				end
+				table.insert(mcl_autogroup.digtimes[diggroup], time)
+				if not efficiency then
+					table.insert(mcl_autogroup.creativetimes[diggroup], 0)
+				end
+				newgroups[diggroup] = #mcl_autogroup.digtimes[diggroup]
+				return newgroups
+			end
 
-			-- Assign groups used for digging this node depending on
+			-- Hack in digging times
-			-- the registered digging groups
+			local hardness = ndef._mcl_hardness
-			for g, gdef in pairs(mcl_autogroup.registered_diggroups) do
+			if not hardness then
-				creative_breakable = true
+				hardness = 0
-				local index = hardness_lookup[g][ndef._mcl_hardness or 0]
+			end
-				if ndef.groups[g] then
-					if gdef.levels then
-						newgroups[g .. "_dig_default"] = index
 
-						for i = ndef.groups[g], #gdef.levels do
+			-- Handle pickaxey, axey and shovely
-							newgroups[g .. "_dig_" .. gdef.levels[i]] = index
+			for _, basegroup in pairs(basegroups) do
+				if (hardness ~= -1 and ndef.groups[basegroup]) then
+					for g=1,#materials do
+						local diggroup = basegroup.."_dig_"..materials[g]
+						newgroups = calculate_group(hardness, materials[g], diggroup, newgroups, g, ndef.groups[basegroup])
+						for e=1,max_efficiency_level do
+							newgroups = calculate_group(hardness, materials[g], diggroup .. "_efficiency_" .. e, newgroups, g, ndef.groups[basegroup], e)
 						end
-					else
+						groups_changed = true
-						newgroups[g .. "_dig"] = index
+					end
+				end
+			end
+			for m=1, #minigroups do
+				local minigroup = minigroups[m]
+				if hardness ~= -1 then
+					local diggroup = minigroup.."_dig"
+					-- actual rating
+					local ar = ndef.groups[minigroup]
+					if ar == nil then
+						ar = 0
+					end
+					if (minigroup == "handy")
+							or
+							(ndef.groups.shearsy_wool and minigroup == "shearsy_wool" and ndef.groups.wool)
+							or
+							(ndef.groups.swordy_cobweb and minigroup == "swordy_cobweb" and nname == "mcl_core:cobweb")
+							or
+							(ndef.groups[minigroup] and minigroup ~= "swordy_cobweb" and minigroup ~= "shearsy_wool") then
+						newgroups = calculate_group(hardness, minigroup, diggroup, newgroups, ar, 1)
+						for e=1,max_efficiency_level do
+							newgroups = calculate_group(hardness, minigroup, diggroup .. "_efficiency_" .. e, newgroups, ar, 1, e)
+						end
+						groups_changed = true
 					end
 				end
 			end
 
-			-- Automatically assign the node to the
+			if groups_changed then
-			-- creative_breakable group if it belongs to any digging
+				minetest.override_item(nname, {
-			-- group.
+					groups = newgroups
-			newgroups["creative_breakable"] = 1
+				})
-
+			end
-			minetest.override_item(nname, {
-				groups = newgroups
-			})
-		end
-	end
-
-	for tname, tdef in pairs(minetest.registered_tools) do
-		-- Assign groupcaps for digging the registered digging groups
-		-- depending on the _mcl_diggroups in the tool definition
-		if tdef._mcl_diggroups then
-			local toolcaps = table.copy(get_tool_capabilities(tdef))
-			toolcaps.groupcaps = mcl_autogroup.get_groupcaps(tname)
-
-			minetest.override_item(tname, {
-				tool_capabilities = toolcaps
-			})
 		end
 	end
 end

mods/CORE/_mcl_autogroup/mod.conf

@@ -1,3 +1,2 @@
 name = _mcl_autogroup
-author = ryvnf
 description = MineClone 2 core mod which automatically adds groups to all items. Very important for digging times.

mods/CORE/mcl_autogroup/init.lua

@@ -1,28 +0,0 @@
---[[
-This is one part of a mod to replicate the digging times from Minecraft.  This
-part only exposes a function to register digging groups.  The rest of the mod is
-implemented and documented in the _mcl_autogroup.
-
-The mod is split up into two parts, mcl_autogroup and _mcl_autogroup.
-mcl_autogroup contains the API functions used to register custom digging groups.
-_mcl_autogroup contains most of the code.  The leading underscore in the name
-"_mcl_autogroup" is used to force Minetest to load that part of the mod as late
-as possible.  Minetest loads mods in reverse alphabetical order.
---]]
-mcl_autogroup = {}
-mcl_autogroup.registered_diggroups = {}
-
-assert(minetest.get_modpath("_mcl_autogroup"), "This mod requires the mod _mcl_autogroup to function")
-
--- Register a group as a digging group.
---
--- Parameters:
--- group - Name of the group to register as a digging group
--- def - Table with information about the diggroup (defaults to {} if unspecified)
---
--- Values in def:
--- level - If specified it is an array containing the names of the different
---         digging levels the digging group supports.
-function mcl_autogroup.register_diggroup(group, def)
-	mcl_autogroup.registered_diggroups[group] = def or {}
-end

mods/CORE/mcl_autogroup/mod.conf

@@ -1,3 +0,0 @@
-name = mcl_autogroup
-author = ryvnf
-description = MineClone 2 core mod which automatically adds groups to all items. Very important for digging times.

mods/CORE/mcl_explosions/init.lua

@@ -57,44 +57,46 @@ local function compute_sphere_rays(radius)
 	local rays = {}
 	local sphere = {}
 
-	local function add_ray(pos)
+	for i=1, 2 do
-		sphere[minetest.hash_node_position(pos)] = pos
-	end
-
-	for y = -radius, radius do
-		for z = -radius, radius do
-			for x = -radius, 0 do
-				local d = x * x + y * y + z * z
-				if d <= radius * radius then
-					add_ray(vector.new(x, y, z))
-					add_ray(vector.new(-x, y, z))
-					break
-				end
-			end
-		end
-	end
-
-	for x = -radius, radius do
-		for z = -radius, radius do
-			for y = -radius, 0 do
-				local d = x * x + y * y + z * z
-				if d <= radius * radius then
-					add_ray(vector.new(x, y, z))
-					add_ray(vector.new(x, -y, z))
-					break
-				end
-			end
-		end
-	end
-
-	for x = -radius, radius do
 		for y = -radius, radius do
-			for z = -radius, 0 do
+			for z = -radius, radius do
-				local d = x * x + y * y + z * z
+				for x = -radius, 0, 1 do
-				if d <= radius * radius then
+					local d = x * x + y * y + z * z
-					add_ray(vector.new(x, y, z))
+					if d <= radius * radius then
-					add_ray(vector.new(x, y, -z))
+						local pos = { x = x, y = y, z = z }
-					break
+						sphere[minetest.hash_node_position(pos)] = pos
+						break
+					end
+				end
+			end
+		end
+	end
+
+	for i=1,2 do
+		for x = -radius, radius do
+			for z = -radius, radius do
+				for y = -radius, 0, 1 do
+					local d = x * x + y * y + z * z
+					if d <= radius * radius then
+						local pos = { x = x, y = y, z = z }
+						sphere[minetest.hash_node_position(pos)] = pos
+						break
+					end
+				end
+			end
+		end
+	end
+
+	for i=1,2 do
+		for x = -radius, radius do
+			for y = -radius, radius do
+				for z = -radius, 0, 1 do
+					local d = x * x + y * y + z * z
+					if d <= radius * radius then
+						local pos = { x = x, y = y, z = z }
+						sphere[minetest.hash_node_position(pos)] = pos
+						break
+					end
 				end
 			end
 		end
@@ -200,10 +202,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, puncher)
 						npos_x - emin_x + 1
 
 				local cid = data[idx]
-
+				local br = node_blastres[cid]
-				-- Set blast resistance to 0 for unknown nodes
-				local br = node_blastres[cid] or 0
-
 				if br < INDESTRUCT_BLASTRES and br > max_blast_resistance then
 					br = max_blast_resistance
 				end
@@ -251,12 +250,12 @@ local function trace_explode(pos, strength, raydirs, radius, info, puncher)
 
 			if collisionbox then
 				-- Create rays from random points in the collision box
-				local x1 = collisionbox[1]
+				local x1 = collisionbox[1] * 2
-				local y1 = collisionbox[2]
+				local y1 = collisionbox[2] * 2
-				local z1 = collisionbox[3]
+				local z1 = collisionbox[3] * 2
-				local x2 = collisionbox[4]
+				local x2 = collisionbox[4] * 2
-				local y2 = collisionbox[5]
+				local y2 = collisionbox[5] * 2
-				local z2 = collisionbox[6]
+				local z2 = collisionbox[6] * 2
 				local x_len = math.abs(x2 - x1)
 				local y_len = math.abs(y2 - y1)
 				local z_len = math.abs(z2 - z1)

mods/CORE/mcl_util/depends.txt

@@ -1 +0,0 @@
-mcl_init

mods/CORE/mcl_util/description.txt

@@ -1 +0,0 @@
-Helper functions for MineClone 2.

mods/CORE/mcl_util/mod.conf

@@ -1 +1,3 @@
 name = mcl_util
+description = Helper functions for MineClone 2.
+depends = mcl_init

mods/CORE/mcl_worlds/depends.txt

@@ -1 +0,0 @@
-mcl_init

mods/CORE/mcl_worlds/description.txt

@@ -1 +0,0 @@
-Utility functions for worlds and the “dimensions”.

mods/CORE/mcl_worlds/mod.conf

@@ -0,0 +1,3 @@
+name = mcl_worlds
+description = Utility functions for worlds and the “dimensions”.
+depends = mcl_init

mods/ENTITIES/drippingwater/depends.txt

@@ -1 +0,0 @@
-mcl_core

mods/ENTITIES/drippingwater/mod.conf

@@ -0,0 +1,2 @@
+name = drippingwater
+depends = mcl_core

mods/ENTITIES/mcl_boats/depends.txt

@@ -1,3 +0,0 @@
-mcl_player
-mcl_core?
-doc_identifier?

mods/ENTITIES/mcl_boats/description.txt

@@ -1 +0,0 @@
-Adds drivable boats.

mods/ENTITIES/mcl_boats/mod.conf

@@ -1 +1,4 @@
 name = mcl_boats
+description = Adds drivable boats.
+depends = mcl_player
+optional_depends = mcl_core, doc_identifier

mods/ENTITIES/mcl_item_entity/depends.txt

@@ -1,2 +0,0 @@
-flowlib
-mcl_enchanting

mods/ENTITIES/mcl_item_entity/description.txt

@@ -1 +0,0 @@
-Dropped items will be attracted to the player like a magnet.

mods/ENTITIES/mcl_item_entity/init.lua

@@ -165,6 +165,66 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
+local minigroups = { "shearsy", "swordy", "shearsy_wool", "swordy_cobweb" }
+local basegroups = { "pickaxey", "axey", "shovely" }
+local materials = { "wood", "gold", "stone", "iron", "diamond" }
+
+-- Checks if the given node would drop its useful drop if dug by a tool
+-- with the given tool capabilities. Returns true if it will yield its useful
+-- drop, false otherwise.
+local check_can_drop = function(node_name, tool_capabilities)
+	local handy = minetest.get_item_group(node_name, "handy")
+	local dig_immediate = minetest.get_item_group(node_name, "dig_immediate")
+	if handy == 1 or dig_immediate == 2 or dig_immediate == 3 then
+		return true
+	else
+		local toolgroupcaps
+		if tool_capabilities then
+			toolgroupcaps = tool_capabilities.groupcaps
+		else
+			return false
+		end
+
+		-- Compare node groups with tool capabilities
+		for m=1, #minigroups do
+			local minigroup = minigroups[m]
+			local g = minetest.get_item_group(node_name, minigroup)
+			if g ~= 0 then
+				local plus = minigroup .. "_dig"
+				if toolgroupcaps[plus] then
+					return true
+				end
+				for e=1,5 do
+					local effplus = plus .. "_efficiency_" .. e
+					if toolgroupcaps[effplus] then
+						return true
+					end
+				end
+			end
+		end
+		for b=1, #basegroups do
+			local basegroup = basegroups[b]
+			local g = minetest.get_item_group(node_name, basegroup)
+			if g ~= 0 then
+				for m=g, #materials do
+					local plus = basegroup .. "_dig_"..materials[m]
+					if toolgroupcaps[plus] then
+						return true
+					end
+					for e=1,5 do
+						local effplus = plus .. "_efficiency_" .. e
+						if toolgroupcaps[effplus] then
+							return true
+						end
+					end
+				end
+			end
+		end
+
+		return false
+	end
+end
+
 -- Stupid workaround to get drops from a drop table:
 -- Create a temporary table in minetest.registered_nodes that contains the proper drops,
 -- because unfortunately minetest.get_node_drops needs the drop table to be inside a registered node definition
@@ -221,20 +281,17 @@ function minetest.handle_node_drops(pos, drops, digger)
 
 	-- Check if node will yield its useful drop by the digger's tool
 	local dug_node = minetest.get_node(pos)
-	local tooldef
+	local toolcaps
 	local tool
 	if digger ~= nil then
 		tool = digger:get_wielded_item()
-		tooldef = minetest.registered_tools[tool:get_name()]
+		toolcaps = tool:get_tool_capabilities()
 
-		if not mcl_autogroup.can_harvest(dug_node.name, tool:get_name()) then
+		if not check_can_drop(dug_node.name, toolcaps) then
 			return
 		end
 	end
 
-	local diggroups = tooldef and tooldef._mcl_diggroups
-	local shearsy_level = diggroups and diggroups.shearsy and diggroups.shearsy.level
-
 	--[[ Special node drops when dug by shears by reading _mcl_shears_drop or with a silk touch tool reading _mcl_silk_touch_drop
 	from the node definition.
 	Definition of _mcl_shears_drop / _mcl_silk_touch_drop:
@@ -246,7 +303,7 @@ function minetest.handle_node_drops(pos, drops, digger)
 
 	local silk_touch_drop = false
 	local nodedef = minetest.registered_nodes[dug_node.name]
-	if shearsy_level and shearsy_level > 0 and nodedef._mcl_shears_drop then
+	if toolcaps ~= nil and toolcaps.groupcaps and toolcaps.groupcaps.shearsy_dig and nodedef._mcl_shears_drop then
 		if nodedef._mcl_shears_drop == true then
 			drops = { dug_node.name }
 		else

mods/ENTITIES/mcl_item_entity/mod.conf

@@ -1 +1,3 @@
 name = mcl_item_entity
+description = Dropped items will be attracted to the player like a magnet.
+depends = flowlib, mcl_enchanting

mods/ENTITIES/mcl_minecarts/depends.txt

@@ -1,12 +0,0 @@
-mcl_explosions
-mcl_core
-mcl_sounds
-mcl_player
-mcl_achievements
-mcl_chests
-mcl_furnaces
-mesecons_commandblock
-mcl_hoppers
-mcl_tnt
-mesecons
-doc_identifier?

mods/ENTITIES/mcl_minecarts/description.txt

@@ -1 +0,0 @@
-Minecarts are vehicles to move players quickly on rails.

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/mcl_minecarts/mod.conf

@@ -1 +1,4 @@
 name = mcl_minecarts
+description = Minecarts are vehicles to move players quickly on rails.
+depends = mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
+optional_depends = doc_identifier

mods/ENTITIES/mobs_mc/depends.txt

@@ -1,12 +0,0 @@
-mcl_init
-mcl_particles
-default?
-mcl_mobs
-mcl_tnt?
-mcl_bows?
-mcl_throwing?
-mcl_fishing?
-bones?
-mesecons_materials?
-mobs_mc_gameconfig?
-doc_items?

mods/ENTITIES/mobs_mc/description.txt

@@ -1 +0,0 @@
-Adds Minecraft-like monsters and animals.

mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr

@@ -28,7 +28,6 @@ Pig=Schwein
 Polar Bear=Eisbär
 Rabbit=Kaninchen
 Killer Bunny=Killerkaninchen
-The Killer Bunny=Das Killerkaninchen
 Sheep=Schaf
 Shulker=Shulker
 Silverfish=Silberfischchen

mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr

@@ -28,7 +28,6 @@ Pig=Cerdo
 Polar Bear=Oso polar
 Rabbit=Conejo
 Killer Bunny=Conejo asesino
-The Killer Bunny=El Conejo asesino
 Sheep=Oveja
 Shulker=Shulker
 Silverfish=Lepisma

mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr

@@ -28,7 +28,6 @@ Pig=Cochon
 Polar Bear=Ours blanc
 Rabbit=Lapin
 Killer Bunny=Lapin tueur
-The Killer Bunny=Le Lapin tueur
 Sheep=Mouton
 Shulker=Shulker
 Silverfish=Poisson d'argent

mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr

@@ -28,7 +28,6 @@ Pig=Свинья
 Polar Bear=Полярный медведь
 Rabbit=Кролик
 Killer Bunny=Кролик-убийца
-The Killer Bunny=Кролик-убийца
 Sheep=Овца
 Shulker=Шалкер
 Silverfish=Чешуйница

mods/ENTITIES/mobs_mc/mod.conf

@@ -1 +1,4 @@
 name = mobs_mc
+description = Adds Minecraft-like monsters and animals.
+depends = mcl_init, mcl_particles, mcl_mobs
+optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, mobs_mc_gameconfig, doc_items

mods/ENTITIES/mobs_mc/rabbit.lua

@@ -99,7 +99,7 @@ killer_bunny.on_rightclick = nil
 killer_bunny.run_velocity = 6
 killer_bunny.do_custom = function(self)
 	if not self._killer_bunny_nametag_set then
-		self.nametag = S("The Killer Bunny")
+		self.nametag = "The Killer Bunny"
 		self._killer_bunny_nametag_set = true
 	end
 end

mods/ENTITIES/mobs_mc_gameconfig/depends.txt

@@ -1,2 +0,0 @@
-mcl_init
-mcl_core

mods/ENTITIES/mobs_mc_gameconfig/mod.conf

@@ -0,0 +1,2 @@
+name = mobs_mc_gameconfig
+depends = mcl_init, mcl_core

mods/ENVIRONMENT/lightning/depends.txt

@@ -1,2 +0,0 @@
-mcl_fire
-mcl_death_messages?

mods/ENVIRONMENT/lightning/description.txt

@@ -1 +0,0 @@
-A mod that adds thunder and lightning effects.

mods/ENVIRONMENT/lightning/mod.conf

@@ -1 +1,4 @@
 name = lightning
+description = A mod that adds thunder and lightning effects.
+depends = mcl_fire
+optional_depends = mcl_death_messages

mods/ENVIRONMENT/mcl_void_damage/depends.txt

@@ -1,2 +0,0 @@
-mcl_worlds
-mcl_death_messages

mods/ENVIRONMENT/mcl_void_damage/description.txt

@@ -1 +0,0 @@
-Deal damage to entities stuck in the deep void

mods/ENVIRONMENT/mcl_void_damage/mod.conf

@@ -1 +1,3 @@
 name = mcl_void_damage
+description = Deal damage to entities stuck in the deep void
+depends = mcl_worlds, mcl_death_messages

mods/ENVIRONMENT/mcl_weather/depends.txt

@@ -1,3 +0,0 @@
-mcl_init
-mcl_worlds
-lightning?

mods/ENVIRONMENT/mcl_weather/description.txt

@@ -1 +0,0 @@
-Weather and sky handling: Rain, snow, thunderstorm, End and Nether ambience

mods/ENVIRONMENT/mcl_weather/mod.conf

@@ -1 +1,4 @@
 name = mcl_weather
+description = Weather and sky handling: Rain, snow, thunderstorm, End and Nether ambience
+depends = mcl_init, mcl_worlds
+optional_depends = lightning

mods/HELP/mcl_craftguide/depends.txt

@@ -1,6 +0,0 @@
-mcl_core
-mcl_compass
-mcl_clock
-doc
-sfinv?
-sfinv_buttons?

mods/HELP/mcl_craftguide/description.txt

@@ -1,2 +0,0 @@
-The most comprehensive Crafting Guide
-on Minetest.

mods/HELP/mcl_craftguide/mod.conf

@@ -1 +1,5 @@
 name = mcl_craftguide
+description = The most comprehensive Crafting Guide
+on Minetest.
+depends = mcl_core, mcl_compass, mcl_clock, doc
+optional_depends = sfinv, sfinv_buttons

mods/HELP/mcl_doc/depends.txt

@@ -1,2 +0,0 @@
-doc
-doc_items

mods/HELP/mcl_doc/description.txt

@@ -1 +0,0 @@
-This MineClone 2 mod sets up and configures the Help modpack mods to tailor the help towards MineClone 2.

mods/HELP/mcl_doc/mod.conf

@@ -1 +1,3 @@
 name = mcl_doc
+description = This MineClone 2 mod sets up and configures the Help modpack mods to tailor the help towards MineClone 2.
+depends = doc, doc_items

mods/HELP/mcl_tt/depends.txt

@@ -1,2 +0,0 @@
-tt
-mcl_enchanting

mods/HELP/mcl_tt/mod.conf

@@ -0,0 +1,2 @@
+name = mcl_tt
+depends = tt, mcl_enchanting

mods/HUD/awards/depends.txt

@@ -1,2 +0,0 @@
-sfinv?
-unified_inventory?

mods/HUD/awards/description.txt

@@ -1 +0,0 @@
-Adds achievements to Minetest, and an API to register new ones.

mods/HUD/awards/mod.conf

@@ -5,3 +5,4 @@ description = Adds achievements to Minetest, and an API to register new ones.
 license = LGPL 2.1 or later
 forum = https://forum.minetest.net/viewtopic.php?t=4870
 version = 2.3.0
+optional_depends = sfinv, unified_inventory

mods/HUD/mcl_achievements/depends.txt

@@ -1 +0,0 @@
-awards

mods/HUD/mcl_achievements/mod.conf

@@ -1 +1,2 @@
 name = mcl_achievements
+depends = awards

mods/HUD/mcl_death_messages/init.lua

@@ -41,9 +41,6 @@ local msgs = {
 	["murder"] = {
 		N("@1 was slain by @2 using [@3]"),
 	},
-	["murder_by_named_mob"] = {
-		N("@1 was slain by @2."),
-	},
 	["murder_any"] = {
 		N("@1 was killed."),
 	},
@@ -215,7 +212,7 @@ minetest.register_on_dieplayer(function(player, reason)
 				end
 				hittersubtype = hitter:get_luaentity().name
 				if hittername then
-					msg = dmsg("murder_by_named_mob", name, hittername)
+					msg = dmsg("murder", name, hittername)
 				elseif hittersubtype ~= nil and hittersubtype ~= "" then
 					msg = mmsg(hittersubtype, name)
 				else

mods/HUD/mcl_formspec_prepend/depends.txt

@@ -1 +0,0 @@
-mcl_init

mods/HUD/mcl_formspec_prepend/mod.conf

@@ -1 +1,2 @@
 name = mcl_formspec_prepend
+depends = mcl_init

mods/HUD/mcl_inventory/depends.txt

@@ -1,8 +0,0 @@
-mcl_init
-mcl_formspec
-mcl_player?
-_mcl_autogroup?
-mcl_armor?
-mcl_brewing?
-mcl_potions?
-mcl_enchanting

mods/HUD/mcl_inventory/description.txt

@@ -1 +0,0 @@
-Adds the player inventory and creative inventory.

mods/HUD/mcl_inventory/mod.conf

@@ -1 +1,4 @@
 name = mcl_inventory
+description = Adds the player inventory and creative inventory.
+depends = mcl_init, mcl_formspec, mcl_enchanting
+optional_depends = mcl_player, _mcl_autogroup, mcl_armor, mcl_brewing, mcl_potions

mods/HUD/show_wielded_item/depends.txt

@@ -1 +0,0 @@
-hudbars?

mods/HUD/show_wielded_item/description.txt

@@ -1 +0,0 @@
-Displays the name of the wielded item.

mods/HUD/show_wielded_item/mod.conf

@@ -1 +1,3 @@
 name = show_wielded_item
+description = Displays the name of the wielded item.
+optional_depends = hudbars

mods/ITEMS/REDSTONE/mcl_comparators/depends.txt

@@ -1,4 +0,0 @@
-mesecons
-mcl_sounds
-doc?
-screwdriver?

mods/ITEMS/REDSTONE/mcl_comparators/mod.conf

@@ -1 +1,3 @@
 name = mcl_comparators
+depends = mesecons, mcl_sounds
+optional_depends = doc, screwdriver

mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt

@@ -1,12 +0,0 @@
-mcl_init
-mcl_formspec
-mesecons
-mcl_sounds
-mcl_tnt
-mcl_worlds
-mcl_core
-mcl_nether
-mcl_armor_stand
-mcl_armor
-doc?
-screwdriver?

mods/ITEMS/REDSTONE/mcl_dispensers/mod.conf

@@ -0,0 +1,3 @@
+name = mcl_dispensers
+depends = mcl_init, mcl_formspec, mesecons, mcl_sounds, mcl_tnt, mcl_worlds, mcl_core, mcl_nether, mcl_armor_stand, mcl_armor
+optional_depends = doc, screwdriver

mods/ITEMS/REDSTONE/mcl_droppers/depends.txt

@@ -1,6 +0,0 @@
-mcl_init
-mcl_formspec
-mesecons
-mcl_util
-doc?
-screwdriver?

mods/ITEMS/REDSTONE/mcl_droppers/mod.conf

@@ -0,0 +1,3 @@
+name = mcl_droppers
+depends = mcl_init, mcl_formspec, mesecons, mcl_util
+optional_depends = doc, screwdriver

mods/ITEMS/REDSTONE/mcl_observers/depends.txt

@@ -1,2 +0,0 @@
-mesecons
-mcl_util

mods/ITEMS/REDSTONE/mcl_observers/mod.conf

@@ -0,0 +1,2 @@
+name = mcl_observers
+depends = mesecons, mcl_util

mods/ITEMS/REDSTONE/mesecons/depends.txt

@@ -1,3 +0,0 @@
-mcl_sounds
-mcl_core
-doc?

mods/ITEMS/REDSTONE/mesecons/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons
+depends = mcl_sounds, mcl_core
+optional_depends = doc

mods/ITEMS/REDSTONE/mesecons_alias/depends.txt

@@ -1 +0,0 @@
-mesecons

mods/ITEMS/REDSTONE/mesecons_alias/mod.conf

@@ -0,0 +1,2 @@
+name = mesecons_alias
+depends = mesecons

mods/ITEMS/REDSTONE/mesecons_button/depends.txt

@@ -1,2 +0,0 @@
-mesecons
-doc?

mods/ITEMS/REDSTONE/mesecons_button/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_button
+depends = mesecons
+optional_depends = doc

mods/ITEMS/REDSTONE/mesecons_commandblock/depends.txt

@@ -1,3 +0,0 @@
-mesecons
-doc?
-doc_items?

mods/ITEMS/REDSTONE/mesecons_commandblock/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_commandblock
+depends = mesecons
+optional_depends = doc, doc_items

mods/ITEMS/REDSTONE/mesecons_delayer/depends.txt

@@ -1,3 +0,0 @@
-mesecons
-doc?
-screwdriver?

mods/ITEMS/REDSTONE/mesecons_delayer/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_delayer
+depends = mesecons
+optional_depends = doc, screwdriver

mods/ITEMS/REDSTONE/mesecons_lightstone/depends.txt

@@ -1,2 +0,0 @@
-mesecons
-doc?

mods/ITEMS/REDSTONE/mesecons_lightstone/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_lightstone
+depends = mesecons
+optional_depends = doc

mods/ITEMS/REDSTONE/mesecons_mvps/depends.txt

@@ -1 +0,0 @@
-mesecons

mods/ITEMS/REDSTONE/mesecons_mvps/mod.conf

@@ -0,0 +1,2 @@
+name = mesecons_mvps
+depends = mesecons

mods/ITEMS/REDSTONE/mesecons_noteblock/depends.txt

@@ -1,2 +0,0 @@
-mesecons
-mcl_particles

mods/ITEMS/REDSTONE/mesecons_noteblock/mod.conf

@@ -0,0 +1,2 @@
+name = mesecons_noteblock
+depends = mesecons, mcl_particles

mods/ITEMS/REDSTONE/mesecons_pistons/depends.txt

@@ -1,5 +0,0 @@
-mesecons
-mesecons_mvps
-mcl_mobitems
-doc?
-screwdriver?

mods/ITEMS/REDSTONE/mesecons_pistons/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_pistons
+depends = mesecons, mesecons_mvps, mcl_mobitems
+optional_depends = doc, screwdriver

mods/ITEMS/REDSTONE/mesecons_pressureplates/depends.txt

@@ -1,2 +0,0 @@
-mesecons
-doc?

mods/ITEMS/REDSTONE/mesecons_pressureplates/mod.conf

@@ -0,0 +1,3 @@
+name = mesecons_pressureplates
+depends = mesecons
+optional_depends = doc