From 371285a903768d1bc1820d902f50d0f2a1f21760 Mon Sep 17 00:00:00 2001 From: BuckarooBanzay Date: Mon, 24 May 2021 09:59:54 +0200 Subject: [PATCH 1/3] adjust fire protection label position fixes #50 --- 3d_armor_ui/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3d_armor_ui/init.lua b/3d_armor_ui/init.lua index 397a631..28193e7 100644 --- a/3d_armor_ui/init.lua +++ b/3d_armor_ui/init.lua @@ -49,7 +49,7 @@ unified_inventory.register_page("armor", { "listring[current_player;main]".. "listring[detached:"..name.."_armor;armor]" if armor.config.fire_protect then - formspec = formspec.."label[5.0,"..(fy + 1.0)..";".. + formspec = formspec.."label[6.0,"..(fy + 1.0)..";".. F(S("Fire"))..": "..armor.def[name].fire.."]" end if has_technic then From a0cf12bbd0fd14809af39c130ec35765308ed8bc Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 27 May 2021 00:11:04 -0700 Subject: [PATCH 2/3] Add setting to disable armor visuals on player model (#48) * Add setting to disable armor visuals on player model --- 3d_armor/api.lua | 8 +++++++- settingtypes.txt | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index dbca4f9..8e07c64 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -200,6 +200,10 @@ armor.update_player_visuals = function(self, player) self:run_callbacks("on_update", player) end + +-- armor is not visible on player model if enabled +local transparent_armor = minetest.settings:get_bool("armor_transparent", false) + armor.set_player_armor = function(self, player) local name, armor_inv = self:get_valid_player(player, "[set_player_armor]") if not name then @@ -258,7 +262,9 @@ armor.set_player_armor = function(self, player) tex = tex:gsub(".png$", "") local prev = def.preview or tex.."_preview" prev = prev:gsub(".png$", "") - texture = texture.."^"..tex..".png" + if not transparent_armor then + texture = texture.."^"..tex..".png" + end preview = preview.."^"..prev..".png" state = state + stack:get_wear() count = count + 1 diff --git a/settingtypes.txt b/settingtypes.txt index fdc2857..4195ddd 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -58,6 +58,9 @@ armor_punch_damage (Enable damage effects) bool true # Enable migration of old armor inventories. armor_migrate_old_inventory (Migrate old armor inventories) bool true +# Don't show armor on character model. +armor_transparent (Transparent armor) bool false + [shields] From 0dffd62fb03e81db2a04b1c9641e1082c0a6799c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 14 Jun 2021 10:56:05 +0100 Subject: [PATCH 3/3] add nether lava to fire protection (#52) adds nether lava and lava crust to fire protection list. --- 3d_armor/api.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 8e07c64..7ed8aaf 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -55,12 +55,14 @@ armor = { crystal = "ethereal:crystal_ingot", }, fire_nodes = { + {"nether:lava_source", 5, 8}, {"default:lava_source", 5, 8}, {"default:lava_flowing", 5, 8}, {"fire:basic_flame", 3, 4}, {"fire:permanent_flame", 3, 4}, {"ethereal:crystal_spike", 2, 1}, {"ethereal:fire_flower", 2, 1}, + {"nether:lava_crust", 2, 1}, {"default:torch", 1, 1}, {"default:torch_ceiling", 1, 1}, {"default:torch_wall", 1, 1},