From fa0ed391c6ca2a30a14e58e729f22d2b2463a165 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 30 Mar 2019 13:57:45 +0100 Subject: [PATCH 1/6] Move metadata to mod.conf --- depends.txt | 3 --- description.txt | 1 - mod.conf | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 depends.txt delete mode 100644 description.txt diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 32c2224..0000000 --- a/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -hudbars -3d_armor -intllib? diff --git a/description.txt b/description.txt deleted file mode 100644 index 02a8a34..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds a HUD bar displaying the current damage of the player's armor. diff --git a/mod.conf b/mod.conf index 47352c1..daa20c6 100644 --- a/mod.conf +++ b/mod.conf @@ -1 +1,4 @@ name = hbarmor +description = Adds a HUD bar displaying the current damage of the player's armor. +depends = hudbars, 3d_armor +optional_depends = intllib From 79e93433314dfbc9af46bb2a6ab37b38122f3998 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 30 Mar 2019 14:00:31 +0100 Subject: [PATCH 2/6] Update to 5.0.0 translation system --- init.lua | 9 ++------- locale/de.txt | 2 -- locale/hbarmor.de.tr | 3 +++ locale/hbarmor.it.tr | 3 +++ locale/it.txt | 4 ---- locale/template.txt | 5 +++-- mod.conf | 1 - 7 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 locale/de.txt create mode 100644 locale/hbarmor.de.tr create mode 100644 locale/hbarmor.it.tr delete mode 100644 locale/it.txt diff --git a/init.lua b/init.lua index 21193f9..dd3699e 100644 --- a/init.lua +++ b/init.lua @@ -1,9 +1,4 @@ -local S -if (minetest.get_modpath("intllib")) then - S = intllib.Getter() -else - S = function ( s ) return s end -end +local S = minetest.get_translator("hbarmor") if (not armor) or (not armor.def) then minetest.log("error", "[hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") @@ -65,7 +60,7 @@ local function custom_hud(player) end --register and define armor HUD bar -hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, S("%s: %d%%")) +hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, S("@1: @2%")) function hbarmor.get_armor(player) if not player or not armor.def then diff --git a/locale/de.txt b/locale/de.txt deleted file mode 100644 index 5a6bacd..0000000 --- a/locale/de.txt +++ /dev/null @@ -1,2 +0,0 @@ -Armor = Panzerung -%s: %d%% = %s: %d%% diff --git a/locale/hbarmor.de.tr b/locale/hbarmor.de.tr new file mode 100644 index 0000000..1649802 --- /dev/null +++ b/locale/hbarmor.de.tr @@ -0,0 +1,3 @@ +# textdomain:hbarmor +Armor=Panzerung +@1: @2%=@1: @2% diff --git a/locale/hbarmor.it.tr b/locale/hbarmor.it.tr new file mode 100644 index 0000000..54601d5 --- /dev/null +++ b/locale/hbarmor.it.tr @@ -0,0 +1,3 @@ +# textdomain:hbarmor +Armor=Armatura +@1: @2%=@1:@2% diff --git a/locale/it.txt b/locale/it.txt deleted file mode 100644 index a2f704b..0000000 --- a/locale/it.txt +++ /dev/null @@ -1,4 +0,0 @@ -Armor = Armatura - -# Format string for displaying the armor. E.g. "Armor: 100%" -%s: %d%% = diff --git a/locale/template.txt b/locale/template.txt index d898abe..0f22286 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,4 +1,5 @@ -Armor = +# textdomain:hbarmor +Armor= # Format string for displaying the armor. E.g. "Armor: 100%" -%s: %d%% = +@1: @2%= diff --git a/mod.conf b/mod.conf index daa20c6..820500e 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,3 @@ name = hbarmor description = Adds a HUD bar displaying the current damage of the player's armor. depends = hudbars, 3d_armor -optional_depends = intllib From 5634463f013048cedcf92fac7c25ae267fa737d3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 1 Apr 2019 11:49:59 +0200 Subject: [PATCH 3/6] Fix translation of armor format string --- init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index dd3699e..723dded 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,5 @@ local S = minetest.get_translator("hbarmor") +local N = function(s) return s end if (not armor) or (not armor.def) then minetest.log("error", "[hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") @@ -60,7 +61,7 @@ local function custom_hud(player) end --register and define armor HUD bar -hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, S("@1: @2%")) +hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, N("@1: @2%"), { "label", "value" }, "hbarmor" ) function hbarmor.get_armor(player) if not player or not armor.def then From c12611423759dd3885435b36b5d6808facf6a9f6 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 1 Apr 2019 12:12:59 +0200 Subject: [PATCH 4/6] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c410a9b..5ba8a8f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ By default, the armor bar is hidden if the player wears no armor. ## Dependencies * HUD bars [`hudbars`], major version 1 -* 3D Armor [`3d_armor`] (tested with Minetest 0.4.14) +* 3D Armor [`3d_armor`] (tested with Minetest 5.0.0) ## Licensing This mod is entirly free softare. From e9568ccdae738c3c6884a8727cbcc316b2b87fab Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 1 Apr 2019 12:42:17 +0200 Subject: [PATCH 5/6] Update function call again --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 723dded..c9d4299 100644 --- a/init.lua +++ b/init.lua @@ -61,7 +61,7 @@ local function custom_hud(player) end --register and define armor HUD bar -hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, N("@1: @2%"), { "label", "value" }, "hbarmor" ) +hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, N("@1: @2%"), { order = { "label", "value" }, textdomain = "hbarmor" } ) function hbarmor.get_armor(player) if not player or not armor.def then From 93d994cbad6a16f985919add5776b568d7a5d6d3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 1 Apr 2019 13:01:14 +0200 Subject: [PATCH 6/6] Version 1.0.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5ba8a8f..a6af08b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # HUD bar for `3d_armor` [`hbarmor`] -* Version: 0.4.0 +* Version: 1.0.0 ## Description This mod adds a simple HUD bar which displays the current damage @@ -16,7 +16,7 @@ only how worn out it already is. By default, the armor bar is hidden if the player wears no armor. ## Dependencies -* HUD bars [`hudbars`], major version 1 +* HUD bars [`hudbars`], major version 2 * 3D Armor [`3d_armor`] (tested with Minetest 5.0.0) ## Licensing