From 125ed4fd75fa7a9fc37a25f7819514d57983dd40 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 8 Aug 2023 14:44:44 +0100 Subject: [PATCH] remove intllib, 5.x only --- depends.txt | 6 ------ description.txt | 1 - init.lua | 55 ++++++++++++------------------------------------- locale/fr.po | 51 --------------------------------------------- locale/it.po | 52 ---------------------------------------------- locale/ms.po | 51 --------------------------------------------- mod.conf | 2 +- 7 files changed, 14 insertions(+), 204 deletions(-) delete mode 100644 depends.txt delete mode 100644 description.txt delete mode 100644 locale/fr.po delete mode 100644 locale/it.po delete mode 100644 locale/ms.po diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 15238e9..0000000 --- a/depends.txt +++ /dev/null @@ -1,6 +0,0 @@ -default -player_api? -sfinv? -inventory_plus? -intllib? -unified_inventory? diff --git a/description.txt b/description.txt deleted file mode 100644 index 61c7bff..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Mod that allows players to set their individual skins. \ No newline at end of file diff --git a/init.lua b/init.lua index 0ca9fd8..0949249 100644 --- a/init.lua +++ b/init.lua @@ -9,22 +9,12 @@ local S if minetest.get_translator ~= nil then S = minetest.get_translator("simple_skins") -else - if minetest.get_modpath("intllib") then - dofile(minetest.get_modpath("intllib").."/init.lua") - if intllib.make_gettext_pair then - gettext, ngettext = intllib.make_gettext_pair() -- new gettext method - else - gettext = intllib.Getter() -- old text file method - end - S = gettext - else -- boilerplate function - S = function(str, ...) - local args = {...} - return str:gsub("@%d", function(match) - return args[tonumber(match:sub(2))] - end) - end +else -- boilerplate function + S = function(str, ...) + local args = {...} + return str:gsub("@%d", function(match) + return args[tonumber(match:sub(2))] + end) end end @@ -119,9 +109,8 @@ if data and data ~= "" then end --- check for minetest 5.x compatibility +-- check for minetest 5.4 compatibility local is_54 = minetest.has_feature("direct_velocity_on_players") -local is_50 = minetest.has_feature("object_use_texture_alpha") -- create formspec for skin selection page @@ -229,14 +218,9 @@ skins.event_CHG = function(event, player) skins.update_player_skin(player) - if is_50 then + local meta = player:get_meta() - local meta = player:get_meta() - - meta:set_string("simple_skins:skin", skins.skins[name]) - else - player:set_attribute("simple_skins:skin", skins.skins[name]) - end + meta:set_string("simple_skins:skin", skins.skins[name]) end @@ -244,16 +228,8 @@ end minetest.register_on_joinplayer(function(player) local name = player:get_player_name() ; if not name then return end - local skin - - if is_50 then - - local meta = player:get_meta() - - skin = meta:get_string("simple_skins:skin") - else - skin = player:get_attribute("simple_skins:skins") - end + local meta = player:get_meta() + local skin = meta:get_string("simple_skins:skin") -- do we already have a skin in player attributes? if skin and skin ~= "" then @@ -296,14 +272,9 @@ minetest.register_chatcommand("setskin", { skins.update_player_skin(player) - if is_50 then + local meta = player:get_meta() - local meta = player:get_meta() - - meta:set_string("simple_skins:skin", skins.skins[playername]) - else - player:set_attribute("simple_skins:skin", skins.skins[playername]) - end + meta:set_string("simple_skins:skin", skins.skins[playername]) minetest.chat_send_player(playername, S("Your skin has been set to") .. " character_" .. skin) diff --git a/locale/fr.po b/locale/fr.po deleted file mode 100644 index 30d8e36..0000000 --- a/locale/fr.po +++ /dev/null @@ -1,51 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-29 07:11+0200\n" -"PO-Revision-Date: 2017-07-29 07:17+0200\n" -"Last-Translator: fat115 \n" -"Language-Team: \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: init.lua -msgid "Select Player Skin:" -msgstr "Sélectionner l'apparence du joueur :" - -#: init.lua -msgid "Name: " -msgstr "Nom : " - -#: init.lua -msgid "Author: " -msgstr "Auteur : " - -#: init.lua -msgid "Admin command to set player skin" -msgstr "Commande admin pour définir l'apparence du joueur" - -#: init.lua -msgid "'s skin set to" -msgstr ", apparence définie pour" - -#: init.lua -msgid "Set player skin" -msgstr "Définir l'apparence du joueur" - -#: init.lua -msgid "Close" -msgstr "Fermer" - -#: init.lua -msgid "[MOD] Simple Skins loaded" -msgstr "[MOD] Simple Skins chargé" diff --git a/locale/it.po b/locale/it.po deleted file mode 100644 index d470131..0000000 --- a/locale/it.po +++ /dev/null @@ -1,52 +0,0 @@ -# simple_skin . -# Copyright (C) 2018 -# This file is distributed under the same license as the PACKAGE package. -# Stefano Peris , 2018. -# Github: -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 07:29+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Stefano Peris \n" -"Language-Team: \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: init.lua -msgid "Select Player Skin:" -msgstr "Seleziona la skin del giocatore" - -#: init.lua -msgid "Name: " -msgstr "Nome" - -#: init.lua -msgid "Author: " -msgstr "Autore" - -#: init.lua -msgid "Admin command to set player skin" -msgstr "Comando di admin per impostare la skin del giocatore" - -#: init.lua -msgid "'s skin set to" -msgstr ", la skin è impostata su" - -#: init.lua -msgid "Set player skin" -msgstr "Imposta la skin del giocatore" - -#: init.lua -msgid "Close" -msgstr "Chiudi" - -#: init.lua -msgid "[MOD] Simple Skins loaded" -msgstr "[MOD] Skins semplici caricate" diff --git a/locale/ms.po b/locale/ms.po deleted file mode 100644 index bba5982..0000000 --- a/locale/ms.po +++ /dev/null @@ -1,51 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-29 07:11+0200\n" -"PO-Revision-Date: 2018-02-14 01:23+0800\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Last-Translator: MuhdNurHidayat (MNH48) \n" -"Plural-Forms: nplurals=1; plural=0;\n" -"Language: ms\n" - -#: init.lua -msgid "Select Player Skin:" -msgstr "Pilih Kulit Pemain:" - -#: init.lua -msgid "Name: " -msgstr "Nama: " - -#: init.lua -msgid "Author: " -msgstr "Pencipta: " - -#: init.lua -msgid "Admin command to set player skin" -msgstr "Perintah pentadbir untuk menetapkan kulit pemain" - -#: init.lua -msgid "'s skin set to" -msgstr " telah ditukarkan kulitnya kepada" - -#: init.lua -msgid "Set player skin" -msgstr "Tetapkan kulit pemain" - -#: init.lua -msgid "Close" -msgstr "Tutup" - -#: init.lua -msgid "[MOD] Simple Skins loaded" -msgstr "[MODS] Simple Skins telah dimuatkan" diff --git a/mod.conf b/mod.conf index 747cfcf..c009429 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = simple_skins depends = default -optional_depends = player_api, sfinv, inventory_plus, intllib, unified_inventory +optional_depends = player_api, sfinv, inventory_plus, unified_inventory description = Mod that allows players to set their individual skins.