From bef99ac211cb74d8f22786a0f6e8bb1debb346a7 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 17 Feb 2020 20:24:26 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20mod:=20hbarmor=20=E2=86=92=20mcl=5Fhba?= =?UTF-8?q?rmor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/HUD/hbarmor/README.md | 42 ------------ mods/HUD/hbarmor/screenshot.png | Bin 10821 -> 0 bytes mods/HUD/hbarmor/settingtypes.txt | 7 -- mods/HUD/mcl_hbarmor/README.md | 26 ++++++++ .../{hbarmor => mcl_hbarmor}/description.txt | 0 mods/HUD/{hbarmor => mcl_hbarmor}/init.lua | 62 ++++++++---------- .../locale/hbarmor.de.tr | 0 .../locale/hbarmor.es.tr | 0 .../locale/hbarmor.it.tr | 0 .../locale/template.txt | 0 mods/HUD/{hbarmor => mcl_hbarmor}/mod.conf | 2 +- mods/HUD/mcl_hbarmor/settingtypes.txt | 3 + .../textures/hbarmor_bar.png | Bin .../textures/hbarmor_bgicon.png | Bin .../textures/hbarmor_icon.png | Bin tools/Conversion_Table.csv | 4 +- 16 files changed, 60 insertions(+), 86 deletions(-) delete mode 100644 mods/HUD/hbarmor/README.md delete mode 100644 mods/HUD/hbarmor/screenshot.png delete mode 100644 mods/HUD/hbarmor/settingtypes.txt create mode 100644 mods/HUD/mcl_hbarmor/README.md rename mods/HUD/{hbarmor => mcl_hbarmor}/description.txt (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/init.lua (64%) rename mods/HUD/{hbarmor => mcl_hbarmor}/locale/hbarmor.de.tr (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/locale/hbarmor.es.tr (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/locale/hbarmor.it.tr (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/locale/template.txt (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/mod.conf (59%) create mode 100644 mods/HUD/mcl_hbarmor/settingtypes.txt rename mods/HUD/{hbarmor => mcl_hbarmor}/textures/hbarmor_bar.png (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/textures/hbarmor_bgicon.png (100%) rename mods/HUD/{hbarmor => mcl_hbarmor}/textures/hbarmor_icon.png (100%) diff --git a/mods/HUD/hbarmor/README.md b/mods/HUD/hbarmor/README.md deleted file mode 100644 index c410a9b6a..000000000 --- a/mods/HUD/hbarmor/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# HUD bar for `3d_armor` [`hbarmor`] - -* Version: 0.4.0 - -## Description -This mod adds a simple HUD bar which displays the current damage -of the player's armor (from the 3D Armor [`3d_armor`] mod) as a percentage (rounded). - -100% armor means the armor is in perfect shape. 0% means the armor is almost destroyed -or non-existant. Note that to reach 100%, the player must wear at least 4 different -pieces of armor in perfect shape. - -The armor bar also does not tell anything about the armor's strength, -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 -* 3D Armor [`3d_armor`] (tested with Minetest 0.4.14) - -## Licensing -This mod is entirly free softare. - -### Source code - -* License: MIT License (see below) -* Authors: Wuzzy, forked from the mod “Better HUD (and hunger)” [`hud`] by BlockMen (2013-2014) - -### Textures - -* `hbarmor_icon.png`—Stu ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)), modified by BlockMen -* `hbarmor_bgicon.png`—Stu (CC BY-SA 3.0), modified by BlockMen -* `hbarmor_bar.png`—Wuzzy (MIT License) - -Everything else is under the MIT License: -© Copyright BlockMen (2013-2014) - -This program is free software. It comes without any warranty, to -the extent permitted by applicable law. You can redistribute it -and/or modify it under the terms of the MIT License. -See for more details. diff --git a/mods/HUD/hbarmor/screenshot.png b/mods/HUD/hbarmor/screenshot.png deleted file mode 100644 index 907cf900de5407f5fffc0b6e7cb4d6ac082972f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10821 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 P00000NkvXXu0mjftq_bx diff --git a/mods/HUD/hbarmor/settingtypes.txt b/mods/HUD/hbarmor/settingtypes.txt deleted file mode 100644 index 067d5045f..000000000 --- a/mods/HUD/hbarmor/settingtypes.txt +++ /dev/null @@ -1,7 +0,0 @@ -#If true, automatically hides the armor HUD bar when the player wears no -#armor. Otherwise, the armor bar shows “0%”. -hbarmor_autohide (Automatically hide armor HUD bar) bool true - -#Time difference in seconds between updates to the armor HUD bar. -#Increase this number for slow servers. -hbarmor_tick (Armor HUD bar update frequency) float 0.1 0.0 4.0 diff --git a/mods/HUD/mcl_hbarmor/README.md b/mods/HUD/mcl_hbarmor/README.md new file mode 100644 index 000000000..0f4816e4a --- /dev/null +++ b/mods/HUD/mcl_hbarmor/README.md @@ -0,0 +1,26 @@ +# MineClone 2 HUD bar for `3d_armor` [`mcl_hbarmor`] + +## Description +This mod adds a simple HUD bar which displays the player's armor points. +The players has 0-20 armor points. + +The armor bar is hidden if the player wears no armor. + +## Licensing +This mod is entirly free softare. + +### Source code +License: MIT License (see below) + +### Textures + +See MineClone 2 license. + +### MIT License +Everything else is under the MIT License: +© Copyright BlockMen (2013-2014) + +This program is free software. It comes without any warranty, to +the extent permitted by applicable law. You can redistribute it +and/or modify it under the terms of the MIT License. +See for more details. diff --git a/mods/HUD/hbarmor/description.txt b/mods/HUD/mcl_hbarmor/description.txt similarity index 100% rename from mods/HUD/hbarmor/description.txt rename to mods/HUD/mcl_hbarmor/description.txt diff --git a/mods/HUD/hbarmor/init.lua b/mods/HUD/mcl_hbarmor/init.lua similarity index 64% rename from mods/HUD/hbarmor/init.lua rename to mods/HUD/mcl_hbarmor/init.lua index c2530b61f..f05d50459 100644 --- a/mods/HUD/hbarmor/init.lua +++ b/mods/HUD/mcl_hbarmor/init.lua @@ -1,33 +1,27 @@ -local S = minetest.get_translator("hbarmor") +local S = minetest.get_translator("mcl_hbarmor") if (not armor) or (not armor.def) then - minetest.log("error", "[hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") + minetest.log("error", "[mcl_hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") end -local hbarmor = {} +local mcl_hbarmor = {} -- HUD statbar values -hbarmor.armor = {} +mcl_hbarmor.armor = {} -- Stores if player's HUD bar has been initialized so far. -hbarmor.player_active = {} +mcl_hbarmor.player_active = {} -- Time difference in seconds between updates to the HUD armor bar. -- Increase this number for slow servers. -hbarmor.tick = 0.1 +mcl_hbarmor.tick = 0.1 -- If true, the armor bar is hidden when the player does not wear any armor -hbarmor.autohide = true +mcl_hbarmor.autohide = true ---load custom settings -local set = minetest.settings:get_bool("hbarmor_autohide") -if set ~= nil then - hbarmor.autohide = set -end - -set = minetest.settings:get("hbarmor_tick") +set = minetest.settings:get("mcl_hbarmor_tick") if tonumber(set) ~= nil then - hbarmor.tick = tonumber(set) + mcl_hbarmor.tick = tonumber(set) end @@ -43,17 +37,17 @@ local function custom_hud(player) local name = player:get_player_name() if minetest.settings:get_bool("enable_damage") then - local ret = hbarmor.get_armor(player) + local ret = mcl_hbarmor.get_armor(player) if ret == false then - minetest.log("error", "[hbarmor] Call to hbarmor.get_armor in custom_hud returned with false!") + minetest.log("error", "[mcl_hbarmor] Call to mcl_hbarmor.get_armor in custom_hud returned with false!") return end - local arm = tonumber(hbarmor.armor[name]) + local arm = tonumber(mcl_hbarmor.armor[name]) if not arm then arm = 0 end local hide - if hbarmor.autohide then + if mcl_hbarmor.autohide then hide = must_hide(name, arm) else hide = false @@ -63,9 +57,9 @@ 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, 20, hbarmor.autohide) +hb.register_hudbar("armor", 0xFFFFFF, S("Armor"), { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 20, mcl_hbarmor.autohide) -function hbarmor.get_armor(player) +function mcl_hbarmor.get_armor(player) if not player or not armor.def then return false end @@ -74,25 +68,25 @@ function hbarmor.get_armor(player) if not pts then return false else - hbarmor.set_armor(name, pts) + mcl_hbarmor.set_armor(name, pts) end return true end -function hbarmor.set_armor(player_name, pts) - hbarmor.armor[player_name] = math.max(0, math.min(20, pts)) +function mcl_hbarmor.set_armor(player_name, pts) + mcl_hbarmor.armor[player_name] = math.max(0, math.min(20, pts)) end -- update hud elemtens if value has changed local function update_hud(player) local name = player:get_player_name() --armor - local arm = tonumber(hbarmor.armor[name]) + local arm = tonumber(mcl_hbarmor.armor[name]) if not arm then arm = 0 - hbarmor.armor[name] = 0 + mcl_hbarmor.armor[name] = 0 end - if hbarmor.autohide then + if mcl_hbarmor.autohide then -- hide armor bar completely when there is none if must_hide(name, arm) then hb.hide_hudbar(player, "armor") @@ -108,12 +102,12 @@ end minetest.register_on_joinplayer(function(player) local name = player:get_player_name() custom_hud(player) - hbarmor.player_active[name] = true + mcl_hbarmor.player_active[name] = true end) minetest.register_on_leaveplayer(function(player) local name = player:get_player_name() - hbarmor.player_active[name] = false + mcl_hbarmor.player_active[name] = false end) local main_timer = 0 @@ -121,15 +115,15 @@ local timer = 0 minetest.register_globalstep(function(dtime) main_timer = main_timer + dtime timer = timer + dtime - if main_timer > hbarmor.tick or timer > 4 then + if main_timer > mcl_hbarmor.tick or timer > 4 then if minetest.settings:get_bool("enable_damage") then - if main_timer > hbarmor.tick then main_timer = 0 end + if main_timer > mcl_hbarmor.tick then main_timer = 0 end for _,player in ipairs(minetest.get_connected_players()) do local name = player:get_player_name() - if hbarmor.player_active[name] == true then - local ret = hbarmor.get_armor(player) + if mcl_hbarmor.player_active[name] == true then + local ret = mcl_hbarmor.get_armor(player) if ret == false then - minetest.log("error", "[hbarmor] Call to hbarmor.get_armor in globalstep returned with false!") + minetest.log("error", "[mcl_hbarmor] Call to mcl_hbarmor.get_armor in globalstep returned with false!") end -- update all hud elements update_hud(player) diff --git a/mods/HUD/hbarmor/locale/hbarmor.de.tr b/mods/HUD/mcl_hbarmor/locale/hbarmor.de.tr similarity index 100% rename from mods/HUD/hbarmor/locale/hbarmor.de.tr rename to mods/HUD/mcl_hbarmor/locale/hbarmor.de.tr diff --git a/mods/HUD/hbarmor/locale/hbarmor.es.tr b/mods/HUD/mcl_hbarmor/locale/hbarmor.es.tr similarity index 100% rename from mods/HUD/hbarmor/locale/hbarmor.es.tr rename to mods/HUD/mcl_hbarmor/locale/hbarmor.es.tr diff --git a/mods/HUD/hbarmor/locale/hbarmor.it.tr b/mods/HUD/mcl_hbarmor/locale/hbarmor.it.tr similarity index 100% rename from mods/HUD/hbarmor/locale/hbarmor.it.tr rename to mods/HUD/mcl_hbarmor/locale/hbarmor.it.tr diff --git a/mods/HUD/hbarmor/locale/template.txt b/mods/HUD/mcl_hbarmor/locale/template.txt similarity index 100% rename from mods/HUD/hbarmor/locale/template.txt rename to mods/HUD/mcl_hbarmor/locale/template.txt diff --git a/mods/HUD/hbarmor/mod.conf b/mods/HUD/mcl_hbarmor/mod.conf similarity index 59% rename from mods/HUD/hbarmor/mod.conf rename to mods/HUD/mcl_hbarmor/mod.conf index 80d389104..4d595c8c9 100644 --- a/mods/HUD/hbarmor/mod.conf +++ b/mods/HUD/mcl_hbarmor/mod.conf @@ -1,2 +1,2 @@ -name = hbarmor +name = mcl_hbarmor depends = hudbars, 3d_armor diff --git a/mods/HUD/mcl_hbarmor/settingtypes.txt b/mods/HUD/mcl_hbarmor/settingtypes.txt new file mode 100644 index 000000000..cfd875dfe --- /dev/null +++ b/mods/HUD/mcl_hbarmor/settingtypes.txt @@ -0,0 +1,3 @@ +#Time difference in seconds between updates to the armor HUD bar. +#Increase this number for slow servers. +hbarmor_tick (Armor HUD bar update frequency) float 0.1 0.0 4.0 diff --git a/mods/HUD/hbarmor/textures/hbarmor_bar.png b/mods/HUD/mcl_hbarmor/textures/hbarmor_bar.png similarity index 100% rename from mods/HUD/hbarmor/textures/hbarmor_bar.png rename to mods/HUD/mcl_hbarmor/textures/hbarmor_bar.png diff --git a/mods/HUD/hbarmor/textures/hbarmor_bgicon.png b/mods/HUD/mcl_hbarmor/textures/hbarmor_bgicon.png similarity index 100% rename from mods/HUD/hbarmor/textures/hbarmor_bgicon.png rename to mods/HUD/mcl_hbarmor/textures/hbarmor_bgicon.png diff --git a/mods/HUD/hbarmor/textures/hbarmor_icon.png b/mods/HUD/mcl_hbarmor/textures/hbarmor_icon.png similarity index 100% rename from mods/HUD/hbarmor/textures/hbarmor_icon.png rename to mods/HUD/mcl_hbarmor/textures/hbarmor_icon.png diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 8444b0227..ab4a94519 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -1,7 +1,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/particle,particles.png,/mods/CORE/mcl_particles/textures,mcl_particles_bubble.png,0,16,8,8,0,0,y -/assets/minecraft/textures/gui,icons.png,/mods/HUD/hbarmor/textures,hbarmor_icon.png,34,9,9,9,0,0,y -/assets/minecraft/textures/gui,icons.png,/mods/HUD/hbarmor/textures,hbarmor_bgicon.png,16,9,9,9,0,0,y +/assets/minecraft/textures/gui,icons.png,/mods/HUD/mcl_hbarmor/textures,hbarmor_icon.png,34,9,9,9,0,0,y +/assets/minecraft/textures/gui,icons.png,/mods/HUD/mcl_hbarmor/textures,hbarmor_bgicon.png,16,9,9,9,0,0,y /assets/minecraft/textures/gui,icons.png,/mods/HUD/hudbars/textures,hudbars_icon_health.png,52,0,9,9,0,0,y /assets/minecraft/textures/gui,icons.png,/mods/HUD/hudbars/textures,hudbars_bgicon_health.png,16,0,9,9,0,0,y /assets/minecraft/textures/gui,icons.png,/mods/HUD/hudbars/textures,hudbars_icon_breath.png,16,18,9,9,0,0,y