From 72ddaf33f6ee69f3b201a89971aec111ba4ed225 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Mon, 8 Mar 2021 23:35:34 +0100 Subject: [PATCH] move mcl_commands to core and add mcl_basic_commands --- mods/{MISC => CORE}/mcl_commands/LICENSE | 0 mods/{MISC => CORE}/mcl_commands/init.lua | 13 +---------- .../mcl_commands/locale/mcl_commands.de.tr | 0 .../mcl_commands/locale/mcl_commands.es.tr | 0 .../mcl_commands/locale/mcl_commands.fr.tr | 0 .../mcl_commands/locale/mcl_commands.ru.tr | 0 .../mcl_commands/locale/template.txt | 0 mods/CORE/mcl_commands/mod.conf | 6 +++++ .../alias.lua | 0 mods/MISC/mcl_basic_commands/init.lua | 14 +++++++++++ .../kill.lua | 0 .../list.lua | 0 .../locale/mcl_basic_commands.de.tr | 23 +++++++++++++++++++ .../locale/mcl_basic_commands.es.tr | 23 +++++++++++++++++++ .../locale/mcl_basic_commands.fr.tr | 23 +++++++++++++++++++ .../locale/mcl_basic_commands.ru.tr | 23 +++++++++++++++++++ .../mcl_basic_commands/locale/template.txt | 23 +++++++++++++++++++ mods/MISC/mcl_basic_commands/mod.conf | 3 +++ .../say.lua | 0 .../seed.lua | 0 .../setblock.lua | 0 .../sound.lua | 0 .../summon.lua | 0 .../title.lua | 0 mods/MISC/mcl_commands/mod.conf | 6 ----- 25 files changed, 139 insertions(+), 18 deletions(-) rename mods/{MISC => CORE}/mcl_commands/LICENSE (100%) rename mods/{MISC => CORE}/mcl_commands/init.lua (95%) rename mods/{MISC => CORE}/mcl_commands/locale/mcl_commands.de.tr (100%) rename mods/{MISC => CORE}/mcl_commands/locale/mcl_commands.es.tr (100%) rename mods/{MISC => CORE}/mcl_commands/locale/mcl_commands.fr.tr (100%) rename mods/{MISC => CORE}/mcl_commands/locale/mcl_commands.ru.tr (100%) rename mods/{MISC => CORE}/mcl_commands/locale/template.txt (100%) create mode 100644 mods/CORE/mcl_commands/mod.conf rename mods/MISC/{mcl_commands => mcl_basic_commands}/alias.lua (100%) create mode 100644 mods/MISC/mcl_basic_commands/init.lua rename mods/MISC/{mcl_commands => mcl_basic_commands}/kill.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/list.lua (100%) create mode 100644 mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.de.tr create mode 100644 mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.es.tr create mode 100644 mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.fr.tr create mode 100644 mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.ru.tr create mode 100644 mods/MISC/mcl_basic_commands/locale/template.txt create mode 100644 mods/MISC/mcl_basic_commands/mod.conf rename mods/MISC/{mcl_commands => mcl_basic_commands}/say.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/seed.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/setblock.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/sound.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/summon.lua (100%) rename mods/MISC/{mcl_commands => mcl_basic_commands}/title.lua (100%) delete mode 100644 mods/MISC/mcl_commands/mod.conf diff --git a/mods/MISC/mcl_commands/LICENSE b/mods/CORE/mcl_commands/LICENSE similarity index 100% rename from mods/MISC/mcl_commands/LICENSE rename to mods/CORE/mcl_commands/LICENSE diff --git a/mods/MISC/mcl_commands/init.lua b/mods/CORE/mcl_commands/init.lua similarity index 95% rename from mods/MISC/mcl_commands/init.lua rename to mods/CORE/mcl_commands/init.lua index 0a737fff7..6c146d526 100644 --- a/mods/MISC/mcl_commands/init.lua +++ b/mods/CORE/mcl_commands/init.lua @@ -238,15 +238,4 @@ function mcl_commands.build(name, chat_def) cmd.privs = chat_def.privs cmd.description = chat_def.description return cmd -end - -dofile(modpath.."/kill.lua") -dofile(modpath.."/setblock.lua") -dofile(modpath.."/seed.lua") -dofile(modpath.."/summon.lua") -dofile(modpath.."/say.lua") -dofile(modpath.."/list.lua") -dofile(modpath.."/sound.lua") -dofile(modpath.."/title.lua") - -dofile(modpath.."/alias.lua") \ No newline at end of file +end \ No newline at end of file diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.de.tr b/mods/CORE/mcl_commands/locale/mcl_commands.de.tr similarity index 100% rename from mods/MISC/mcl_commands/locale/mcl_commands.de.tr rename to mods/CORE/mcl_commands/locale/mcl_commands.de.tr diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.es.tr b/mods/CORE/mcl_commands/locale/mcl_commands.es.tr similarity index 100% rename from mods/MISC/mcl_commands/locale/mcl_commands.es.tr rename to mods/CORE/mcl_commands/locale/mcl_commands.es.tr diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.fr.tr b/mods/CORE/mcl_commands/locale/mcl_commands.fr.tr similarity index 100% rename from mods/MISC/mcl_commands/locale/mcl_commands.fr.tr rename to mods/CORE/mcl_commands/locale/mcl_commands.fr.tr diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.ru.tr b/mods/CORE/mcl_commands/locale/mcl_commands.ru.tr similarity index 100% rename from mods/MISC/mcl_commands/locale/mcl_commands.ru.tr rename to mods/CORE/mcl_commands/locale/mcl_commands.ru.tr diff --git a/mods/MISC/mcl_commands/locale/template.txt b/mods/CORE/mcl_commands/locale/template.txt similarity index 100% rename from mods/MISC/mcl_commands/locale/template.txt rename to mods/CORE/mcl_commands/locale/template.txt diff --git a/mods/CORE/mcl_commands/mod.conf b/mods/CORE/mcl_commands/mod.conf new file mode 100644 index 000000000..247ea2164 --- /dev/null +++ b/mods/CORE/mcl_commands/mod.conf @@ -0,0 +1,6 @@ +name = mcl_commands +author = AFCMS +description = MCL2 commands API +depends = mcl_colors +optional_depends = + diff --git a/mods/MISC/mcl_commands/alias.lua b/mods/MISC/mcl_basic_commands/alias.lua similarity index 100% rename from mods/MISC/mcl_commands/alias.lua rename to mods/MISC/mcl_basic_commands/alias.lua diff --git a/mods/MISC/mcl_basic_commands/init.lua b/mods/MISC/mcl_basic_commands/init.lua new file mode 100644 index 000000000..580a36567 --- /dev/null +++ b/mods/MISC/mcl_basic_commands/init.lua @@ -0,0 +1,14 @@ +--Basic commands for mcl2 + +local modpath = minetest.get_modpath(minetest.get_current_modname()) + +dofile(modpath.."/kill.lua") +dofile(modpath.."/setblock.lua") +dofile(modpath.."/seed.lua") +dofile(modpath.."/summon.lua") +dofile(modpath.."/say.lua") +dofile(modpath.."/list.lua") +dofile(modpath.."/sound.lua") +dofile(modpath.."/title.lua") + +dofile(modpath.."/alias.lua") \ No newline at end of file diff --git a/mods/MISC/mcl_commands/kill.lua b/mods/MISC/mcl_basic_commands/kill.lua similarity index 100% rename from mods/MISC/mcl_commands/kill.lua rename to mods/MISC/mcl_basic_commands/kill.lua diff --git a/mods/MISC/mcl_commands/list.lua b/mods/MISC/mcl_basic_commands/list.lua similarity index 100% rename from mods/MISC/mcl_commands/list.lua rename to mods/MISC/mcl_basic_commands/list.lua diff --git a/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.de.tr b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.de.tr new file mode 100644 index 000000000..68d267517 --- /dev/null +++ b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.de.tr @@ -0,0 +1,23 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.=Spieler können jetzt nicht getötet werden, der Schaden wurde deaktiviert. +Player @1 does not exist.=Spieler @1 existiert nicht. +You are already dead=Sie sind schon tot +@1 is already dead=@1 ist schon tot +@1 committed suicide.=@1 beging Selbstmord. +@1 was killed by @2.=@1 wurde von @2 getötet. +[]=[] +Kill player or yourself=Spieler oder sich selbst töten +Can use /say=Kann „/say“ benutzen += +Send a message to every player=Nachricht an alle Spieler senden +Invalid usage, see /help say.=Falsche Benutzung, siehe „/help say“. +,, =,, +Set node at given position=Node (Block) an der gegebenen Position platzieren +Invalid node=Unültiger Node +@1 spawned.=@1 gespawnt. +Invalid parameters (see /help setblock)=Ungültige Parameter (siehe „/help setblock”) +List bans=Bannliste anzeigen +Ban list: @1=Bannliste: @1 +Show who is logged on=Anzeigen, wer eingeloggt ist +Displays the world seed=Den Seed der Welt anzeigen +Only peaceful mobs allowed!=Nur friedliche Mobs erlaubt! diff --git a/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.es.tr b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.es.tr new file mode 100644 index 000000000..91b21eb91 --- /dev/null +++ b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.es.tr @@ -0,0 +1,23 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.=Los jugadores no pueden ser asesinados en este momento, el daño ha sido desactivado. +Player @1 does not exist.=El jugador @1 no existe. +You are already dead=Ya estas muerto +@1 is already dead=@1 ya esta muerto +@1 committed suicide.=@1 se suicidó. +@1 was killed by @2.=@1 fue asesinado por @2. +[]=[] +Kill player or yourself=Mata al jugador o a ti mismo +Can use /say=Puedes usar /say += +Send a message to every player=Envía un mensaje a todos los jugadores +Invalid usage, see /help=Uso no válido, (Revisa el comando "/help say") +,, =,, +Set node at given position=Establecer nodo en la posición dada +Invalid node=Nodo no válido +@1 spawned.=@1 generado. +Invalid parameters (see /help setblock)=Parámetros no válidos (Revisa el comando "/help setblock") +List bans=Lista de prohibiciones +Ban list: @1=Lista de baneados: @1 +Show who is logged on=Mostrar quién ha iniciado sesión +Displays the world seed=Muestra la semilla del mundo +Only peaceful mobs allowed!=¡Solo se permiten animales pacíficos! diff --git a/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.fr.tr b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.fr.tr new file mode 100644 index 000000000..a655368bf --- /dev/null +++ b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.fr.tr @@ -0,0 +1,23 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.=Les joueurs ne peuvent pas être tués pour le moment, les dégâts ont été désactivés. +Player @1 does not exist.=Le joueur @1 n'existe pas. +You are already dead=Tu es déjà mort +@1 is already dead=@1 est déjà mort +@1 committed suicide.=@1 s'est suicidé. +@1 was killed by @2.=@1 a été tué par @2. +[]=[] +Kill player or yourself=Tuez un joueur ou vous-même +Can use /say=Peut utiliser /say += +Send a message to every player=Envoyez un message à chaque joueur +Invalid usage, see /help say.=Utilisation non valide, voir /help say. +,, =,, +Set node at given position=Placer le noeud à une position donnée +Invalid node=Noeud non valide +@1 spawned.=@1 est apparu. +Invalid parameters (see /help setblock)=Paramètres invalides (voir /help setblock) +List bans=Liste des interdictions +Ban list: @1=Liste d'interdiction: @1 +Show who is logged on=Afficher qui est connecté +Displays the world seed=Affiche la graine du monde +Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisées! diff --git a/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.ru.tr b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.ru.tr new file mode 100644 index 000000000..686c8067c --- /dev/null +++ b/mods/MISC/mcl_basic_commands/locale/mcl_basic_commands.ru.tr @@ -0,0 +1,23 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.=Игроки не могут быть убиты прямо сейчас, урон отключён. +Player @1 does not exist.=Игрок @1 не существует. +You are already dead=Вы уже мертвы +@1 is already dead=@1 уже мертв(а) +@1 committed suicide.=@1 совершил(а) роскомнадзор. +@1 was killed by @2.=@1 был(а) убит(а) @2. +[]=[<имя>] +Kill player or yourself=Убить игрока или себя +Can use /say=Можно использовать /say +=<сообщение> +Send a message to every player=Отправляет сообщение всем игрокам +Invalid usage, see /help say.=Недопустимое использование, см. /help say. +,, =,, <СтрокаУзла> +Set node at given position=Устанавливает узел в заданной позиции +Invalid node=Неправильный узел +@1 spawned.=@1 возродился(ась). +Invalid parameters (see /help setblock)=Недопустимые параметры (см. /help setblock) +List bans=Список банов +Ban list: @1=Бан-лист: @1 +Show who is logged on=Показывает, кто подключён +Displays the world seed=Показывает значение зерна мира (seed) +Only peaceful mobs allowed!=Включены только мирные мобы! diff --git a/mods/MISC/mcl_basic_commands/locale/template.txt b/mods/MISC/mcl_basic_commands/locale/template.txt new file mode 100644 index 000000000..5b4370b8f --- /dev/null +++ b/mods/MISC/mcl_basic_commands/locale/template.txt @@ -0,0 +1,23 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.= +Player @1 does not exist.= +You are already dead= +@1 is already dead= +@1 committed suicide.= +@1 was killed by @2.= +[]= +Kill player or yourself= +Can use /say= += +Send a message to every player= +Invalid usage, see /help say.= +,, = +Set node at given position= +Invalid node= +@1 spawned.= +Invalid parameters (see /help setblock)= +List bans= +Ban list: @1= +Show who is logged on= +Displays the world seed= +Only peaceful mobs allowed!= diff --git a/mods/MISC/mcl_basic_commands/mod.conf b/mods/MISC/mcl_basic_commands/mod.conf new file mode 100644 index 000000000..8b400203d --- /dev/null +++ b/mods/MISC/mcl_basic_commands/mod.conf @@ -0,0 +1,3 @@ +name=mcl_basic_commands +depends=mcl_commands +optional_depends=mcl_death_message \ No newline at end of file diff --git a/mods/MISC/mcl_commands/say.lua b/mods/MISC/mcl_basic_commands/say.lua similarity index 100% rename from mods/MISC/mcl_commands/say.lua rename to mods/MISC/mcl_basic_commands/say.lua diff --git a/mods/MISC/mcl_commands/seed.lua b/mods/MISC/mcl_basic_commands/seed.lua similarity index 100% rename from mods/MISC/mcl_commands/seed.lua rename to mods/MISC/mcl_basic_commands/seed.lua diff --git a/mods/MISC/mcl_commands/setblock.lua b/mods/MISC/mcl_basic_commands/setblock.lua similarity index 100% rename from mods/MISC/mcl_commands/setblock.lua rename to mods/MISC/mcl_basic_commands/setblock.lua diff --git a/mods/MISC/mcl_commands/sound.lua b/mods/MISC/mcl_basic_commands/sound.lua similarity index 100% rename from mods/MISC/mcl_commands/sound.lua rename to mods/MISC/mcl_basic_commands/sound.lua diff --git a/mods/MISC/mcl_commands/summon.lua b/mods/MISC/mcl_basic_commands/summon.lua similarity index 100% rename from mods/MISC/mcl_commands/summon.lua rename to mods/MISC/mcl_basic_commands/summon.lua diff --git a/mods/MISC/mcl_commands/title.lua b/mods/MISC/mcl_basic_commands/title.lua similarity index 100% rename from mods/MISC/mcl_commands/title.lua rename to mods/MISC/mcl_basic_commands/title.lua diff --git a/mods/MISC/mcl_commands/mod.conf b/mods/MISC/mcl_commands/mod.conf deleted file mode 100644 index 0fed926a5..000000000 --- a/mods/MISC/mcl_commands/mod.conf +++ /dev/null @@ -1,6 +0,0 @@ -name = mcl_commands -author = Wuzzy -description = MCL2 commands -depends = mcl_colors -optional_depends = mcl_death_messages -