From fff3eb1ee797b0f7c71b3de95f81290f8324c135 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 8 May 2018 16:32:07 +0200 Subject: [PATCH] Rename mcl_autogroup to _mcl_autogroup This should fix some autogroup-related issues due to loading order. --- mods/CORE/_mcl_autogroup/README.txt | 10 ++++++++++ .../CORE/{mcl_autogroup => _mcl_autogroup}/depends.txt | 0 mods/CORE/_mcl_autogroup/description.txt | 1 + mods/CORE/{mcl_autogroup => _mcl_autogroup}/init.lua | 8 -------- mods/CORE/_mcl_autogroup/mod.conf | 1 + mods/CORE/mcl_autogroup/mod.conf | 1 - mods/HUD/mcl_inventory/creative.lua | 2 +- mods/HUD/mcl_inventory/depends.txt | 2 +- mods/ITEMS/mcl_tools/depends.txt | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 mods/CORE/_mcl_autogroup/README.txt rename mods/CORE/{mcl_autogroup => _mcl_autogroup}/depends.txt (100%) create mode 100644 mods/CORE/_mcl_autogroup/description.txt rename mods/CORE/{mcl_autogroup => _mcl_autogroup}/init.lua (94%) create mode 100644 mods/CORE/_mcl_autogroup/mod.conf delete mode 100644 mods/CORE/mcl_autogroup/mod.conf diff --git a/mods/CORE/_mcl_autogroup/README.txt b/mods/CORE/_mcl_autogroup/README.txt new file mode 100644 index 000000000..b7068a0b3 --- /dev/null +++ b/mods/CORE/_mcl_autogroup/README.txt @@ -0,0 +1,10 @@ +This mod automatically adds groups to items based on item metadata. + +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) + +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. +As of 0.4.16, Minetest loads mods in reverse alphabetical order. diff --git a/mods/CORE/mcl_autogroup/depends.txt b/mods/CORE/_mcl_autogroup/depends.txt similarity index 100% rename from mods/CORE/mcl_autogroup/depends.txt rename to mods/CORE/_mcl_autogroup/depends.txt diff --git a/mods/CORE/_mcl_autogroup/description.txt b/mods/CORE/_mcl_autogroup/description.txt new file mode 100644 index 000000000..dbc4f3186 --- /dev/null +++ b/mods/CORE/_mcl_autogroup/description.txt @@ -0,0 +1 @@ +MineClone 2 core mod which automatically adds groups to all items. Very important for digging times. diff --git a/mods/CORE/mcl_autogroup/init.lua b/mods/CORE/_mcl_autogroup/init.lua similarity index 94% rename from mods/CORE/mcl_autogroup/init.lua rename to mods/CORE/_mcl_autogroup/init.lua index 78067c803..16fa14c5f 100644 --- a/mods/CORE/mcl_autogroup/init.lua +++ b/mods/CORE/_mcl_autogroup/init.lua @@ -1,11 +1,3 @@ ---[[ This mod automatically adds groups to items based on item metadata. - -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) - -]] - --[[ Mining times. Yeah, mining times … Alright, this is going to be FUN! This mod does include a HACK to make 100% sure the digging times of all tools match Minecraft's perfectly. diff --git a/mods/CORE/_mcl_autogroup/mod.conf b/mods/CORE/_mcl_autogroup/mod.conf new file mode 100644 index 000000000..fb171b765 --- /dev/null +++ b/mods/CORE/_mcl_autogroup/mod.conf @@ -0,0 +1 @@ +name = _mcl_autogroup diff --git a/mods/CORE/mcl_autogroup/mod.conf b/mods/CORE/mcl_autogroup/mod.conf deleted file mode 100644 index ec7796657..000000000 --- a/mods/CORE/mcl_autogroup/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = mcl_autogroup diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index d76a5c982..aa38dbd6a 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -11,7 +11,7 @@ for _, f in pairs(builtin_filter_ids) do end --[[ Populate all the item tables. We only do this once. Note this mod must be -loaded after mcl_autogroup for this to work, because it required certain +loaded after _mcl_autogroup for this to work, because it required certain groups to be set. ]] do for name,def in pairs(minetest.registered_items) do diff --git a/mods/HUD/mcl_inventory/depends.txt b/mods/HUD/mcl_inventory/depends.txt index 9b675be0e..a174c0eee 100644 --- a/mods/HUD/mcl_inventory/depends.txt +++ b/mods/HUD/mcl_inventory/depends.txt @@ -1,3 +1,3 @@ mcl_init -mcl_autogroup? +_mcl_autogroup? 3d_armor? diff --git a/mods/ITEMS/mcl_tools/depends.txt b/mods/ITEMS/mcl_tools/depends.txt index a28b023b1..5ce101eda 100644 --- a/mods/ITEMS/mcl_tools/depends.txt +++ b/mods/ITEMS/mcl_tools/depends.txt @@ -1,2 +1,2 @@ mcl_sounds -mcl_autogroup +_mcl_autogroup