diff --git a/mods/HUD/mcl_credits/CONTRUBUTOR_LIST.txt b/mods/HUD/mcl_credits/CONTRUBUTOR_LIST.txt new file mode 100644 index 000000000..561952adc --- /dev/null +++ b/mods/HUD/mcl_credits/CONTRUBUTOR_LIST.txt @@ -0,0 +1,86 @@ +1798643961 +3raven +AFCMS +aldum +Alexander Minges +aligator +ArTee3 +Artem Arbatsky +basxto +Benjamin Schötz +Blue Blancmange +Booglejr +Brandon +Bu-Gee +bzoss +chmodsayshello +Code-Sploit +cora +Daniel Cassidy +davedevils +Dave Devil's +David McMackins II +dBeans +debiankaios +Dieter44 +Doloment +Elias Åström +Elias Fleckenstein +Emily +Emojigit +epCode +erlehmann +FinishedFragment +Glaucos Ginez +Gustavo Ramos Rehermann +Guy Liner +GuyLiner +HimbeerserverDE +iliekprogrammar +j1233 +Jared Moody +jordan4ibanez +kabou +kay27 +Laurent Rocher +Li0n +marcin-serwin +Marcin Serwin +Mental-Inferno +Midgard +MysticTempest +Nicholas Niro +nickolas360 +Nicu +nikolaus-albinger +Nils Dagsson Moskopp +NO11 +NO411 +Oil_boi +pitchum +PrairieAstronomer +PrairieWind +Rocher Laurent +rootyjr +Rootyjr +rudzik8 +Sab Pyrope +Saku Laesvuori +sfan5 +SmallJoker +superfloh247 +Sven792 +Sydney Gems +talamh +TechDudie +Thinking +Tianyang Zhang +U.N.Owen +Wouters Dorian +wuniversales +Wuzzy +Yukitty +yutyo +ZedekThePD +ZeDique la Ruleta +ztianyang diff --git a/mods/HUD/mcl_credits/README.md b/mods/HUD/mcl_credits/README.md new file mode 100644 index 000000000..3d76497d0 --- /dev/null +++ b/mods/HUD/mcl_credits/README.md @@ -0,0 +1,9 @@ +Please run the following command to update contributor list: + +```bash +# git log --pretty="%an" | sort | uniq >CONTRUBUTOR_LIST.txt +``` + +Please check that there is no error on execution, and `CONTRUBUTOR_LIST.txt` is updated. + +There should be contributor names, line by line. diff --git a/mods/HUD/mcl_credits/init.lua b/mods/HUD/mcl_credits/init.lua index db3ac8436..357a7fdde 100644 --- a/mods/HUD/mcl_credits/init.lua +++ b/mods/HUD/mcl_credits/init.lua @@ -1,10 +1,40 @@ local modname = minetest.get_current_modname() local S = minetest.get_translator(modname) +local contributors_file_name = minetest.get_modpath(modname) .. "/CONTRUBUTOR_LIST.txt" + +local file = io.open(contributors_file_name) +local contributors = {} +if not file then + minetest.log("error", "[" .. modname .. "] Can't read contributors from " .. contributors_file_name) +else + local contributor_list = file:read("*a") + file:close() + for contributor in contributor_list:gmatch("[^\r\n]+") do + table.insert(contributors, contributor) + end +end + mcl_credits = { players = {}, description = S("A faithful Open Source clone of Minecraft"), - people = dofile(minetest.get_modpath(modname) .. "/people.lua"), + people = { + {S("Creator of MineClone"), 0x0A9400, { + "davedevils", + }}, + {S("Creator of MineClone 2"), 0xFBF837, { + "Wuzzy", + }}, + {S("Creators of MineClone 5"), 0x52FF00, + contributors + }, + {S("Special thanks"), 0x00E9FF, { + "celeron55 for creating Minetest", + "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", + }} + } } local function add_hud_element(def, huds, y) diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua deleted file mode 100644 index babd64bcc..000000000 --- a/mods/HUD/mcl_credits/people.lua +++ /dev/null @@ -1,145 +0,0 @@ -local modname = minetest.get_current_modname() -local S = minetest.get_translator(modname) - -return { - {S("Creator of MineClone"), 0x0A9400, { - "davedevils", - }}, - {S("Creator of MineClone2"), 0xFBF837, { - "Wuzzy", - }}, - {S("Creator of MineClone5"), 0xFF51D5, { - S("The Community"), - }}, - {S("Developers"), 0xF84355, { - "Fleckenstein", - "kay27", - "oilboi", - "bzoss", - "AFCMS", - "epCode", - "ryvnf", - "iliekprogrammar", - "MysticTempest", - "Rootyjr", - "Nicu", - "aligator", - "Code-Sploit", - "NO11", - "cora", - }}, - {S("Contributors"), 0x52FF00, { - "Laurent Rocher", - "HimbeerserverDE", - "TechDudie", - "Alexander Minges", - "ArTee3", - "ZeDique la Ruleta", - "pitchum", - "wuniversales", - "Bu-Gee", - "David McMackins II", - "Nicholas Niro", - "Wouters Dorian", - "Blue Blancmange", - "Jared Moody", - "Li0n", - "Midgard", - "Saku Laesvuori", - "Yukitty", - "ZedekThePD", - "aldum", - "dBeans", - "nickolas360", - "yutyo", - "ztianyang", - "j45", - "Marcin Serwin", - "erlehmann", - "E", - "Benjamin Schötz", - "Doloment", - "Sydney Gems", - "talamh", - "Emily2255", - "Emojigit", - "FinishedFragment", - "sfan5", - "Blue Blancmange", - "Jared Moody", - "SmallJoker", - "Sven792", - "aldum", - }}, - {S("MineClone5"), 0xA60014, { - "kay27", - "Debiankaios", - "epCode", - "NO11", - "j45", - }}, - {S("Original Mod Authors"), 0x343434, { - "Wuzzy", - "Fleckenstein", - "BlockMen", - "TenPlus1", - "PilzAdam", - "ryvnf", - "stujones11", - "Arcelmi", - "celeron55", - "maikerumine", - "GunshipPenguin", - "Qwertymine3", - "Rochambeau", - "rubenwardy", - "stu", - "4aiman", - "Kahrl", - "Krock", - "UgnilJoZ", - "lordfingle", - "22i", - "bzoss", - "kilbith", - "xeranas", - "kddekadenz", - "sofar", - "4Evergreen4", - "jordan4ibanez", - "paramat", - }}, - {S("3D Models"), 0x0019FF, { - "22i", - "tobyplowy", - "epCode", - }}, - {S("Textures"), 0xFF9705, { - "XSSheep", - "Wuzzy", - "kingoscargames", - "leorockway", - "xMrVizzy", - "yutyo", - "NO11", - "kay27", - }}, - {S("Translations"), 0x00FF60, { - "Wuzzy", - "Rocher Laurent", - "wuniversales", - "kay27", - "pitchum", - "todoporlalibertad", - "Marcin Serwin", - }}, - {S("Funders"), 0xF7FF00, { - "40W", - }}, - {S("Special thanks"), 0x00E9FF, { - "celeron55 for creating Minetest", - "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", - }}, -} diff --git a/mods/HUD/mcl_credits/textures/mineclone2_logo.png b/mods/HUD/mcl_credits/textures/mineclone2_logo.png index 11435df51..f95e425b9 100644 Binary files a/mods/HUD/mcl_credits/textures/mineclone2_logo.png and b/mods/HUD/mcl_credits/textures/mineclone2_logo.png differ diff --git a/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua b/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua index db8eb75a2..c7c3151f7 100644 --- a/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua @@ -4,7 +4,6 @@ local table = table mesecon.mvps_stoppers = {} mesecon.mvps_unsticky = {} -mesecon.mvps_droppers = {} mesecon.on_mvps_move = {} mesecon.mvps_unmov = {} @@ -17,24 +16,6 @@ function mesecon.is_mvps_unmov(objectname) return mesecon.mvps_unmov[objectname] end -function mesecon.is_mvps_dropper(node, pushdir, stack, stackid) - local get_dropper = mesecon.mvps_droppers[node.name] - if type (get_dropper) == "function" then - get_dropper = get_dropper(node, pushdir, stack, stackid) - end - if not get_dropper then - get_dropper = minetest.get_item_group(node.name, "dig_by_piston") == 1 - end - return get_dropper -end - -function mesecon.register_mvps_dropper(nodename, get_dropper) - if get_dropper == nil then - get_dropper = true - end - mesecon.mvps_droppers[nodename] = get_dropper -end - -- Nodes that cannot be pushed / pulled by movestones, pistons function mesecon.is_mvps_stopper(node) -- unknown nodes are always stoppers @@ -220,19 +201,13 @@ end function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, player_name, piston_pos) local nodes, has_loop = mesecon.mvps_get_stack(pos, movedir, maximum, piston_pos) - if has_loop then - return false - end - - if not nodes then return end + if has_loop or not nodes then return end local newpos={} -- check node availability to push/pull into, and fill newpos[i] for i in ipairs(nodes) do newpos[i] = vector.add(nodes[i].pos, movedir) - if (newpos[i].x == piston_pos.x) and (newpos[i].y == piston_pos.y) and (newpos[i].z == piston_pos.z) then - return - end + if (newpos[i].x == piston_pos.x) and (newpos[i].y == piston_pos.y) and (newpos[i].z == piston_pos.z) then return end if not is_available(newpos[i]) then local available = false for j in ipairs(nodes) do @@ -243,23 +218,18 @@ function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, player_name, end end end - if not available then - return - end + if not available then return end end end - if are_protected(nodes, player_name) then - return - end + if are_protected(nodes, player_name) then return end local first_dropper = nil -- remove all nodes for id, n in ipairs(nodes) do n.meta = minetest.get_meta(n.pos):to_table() - local is_dropper = mesecon.is_mvps_dropper(n.node, movedir, nodes, id) + local is_dropper = minetest.get_item_group(n.node.name, "dig_by_piston") == 1 if is_dropper then - --local drops = minetest.get_node_drops(n.node.name, "") minetest.dig_node(n.pos) else minetest.remove_node(n.pos)