master #5

Merged
NO11 merged 42 commits from VoxeLibre/VoxeLibre:master into master 2021-08-11 17:38:46 +02:00
1 changed files with 27 additions and 6 deletions
Showing only changes of commit 75b425ffd7 - Show all commits

View File

@ -1,4 +1,5 @@
local game = "mineclone" local game = "mineclone"
local mcl_mods = {}
local same_id = { local same_id = {
heads = { "skeleton", "zombie", "creeper", "wither_skeleton" }, heads = { "skeleton", "zombie", "creeper", "wither_skeleton" },
@ -16,11 +17,28 @@ local same_id = {
}, },
} }
local worldmt = io.open(minetest.get_worldpath() .. "/world.mt", "r")
local gameid = worldmt:read("*a"):match("gameid%s*=%s*(%S+)\n")
worldmt:close()
for _, mod in pairs(minetest.get_modnames()) do
if minetest.get_modpath(mod):match("/games/" .. gameid .. "/") then
table.insert(mcl_mods, mod)
end
end
local function item_id(id)
if minetest.settings:get_bool("mcl_item_id_debug", false) then
return id, "#555555"
end
end
tt.register_snippet(function(itemstring) tt.register_snippet(function(itemstring)
local def = minetest.registered_items[itemstring] local def = minetest.registered_items[itemstring]
local desc = def.description local desc = def.description
local item_split = itemstring:find(":") local item_split = itemstring:find(":")
local new_id = game .. itemstring:sub(item_split) local new_id = game .. itemstring:sub(item_split)
local mcl_mod = itemstring:sub(1, item_split)
for mod, ids in pairs(same_id) do for mod, ids in pairs(same_id) do
for _, id in pairs(ids) do for _, id in pairs(ids) do
if itemstring == "mcl_" .. mod .. ":" .. id then if itemstring == "mcl_" .. mod .. ":" .. id then
@ -28,12 +46,15 @@ tt.register_snippet(function(itemstring)
end end
end end
end end
if new_id ~= game .. ":book_enchanted" then for _, modname in pairs(mcl_mods) do
if modname .. ":" == mcl_mod then
if new_id ~= game .. ":book_enchanted" and new_id ~= itemstring then
minetest.register_alias_force(new_id, itemstring) minetest.register_alias_force(new_id, itemstring)
end end
if minetest.settings:get_bool("mcl_item_id_debug", false) then return item_id(new_id)
return new_id, "#555555"
end end
end
return item_id(itemstring)
end) end)
minetest.register_alias_force(game .. ":book_enchanted", "mcl_enchanting:book_enchanted") minetest.register_alias_force(game .. ":book_enchanted", "mcl_enchanting:book_enchanted")