Prevent switching pages when using sfinv

Previously, 3d_armor would issue an inventory update even if the 3d_armor page wasn't shown..
Fix crash when right-clicking to equip a seventh armor element with a full armor inventory (#163 )
2025-06-24 21:14:27 +02:00 · 2025-06-07 00:46:28 +02:00 · 2025-05-28 17:59:13 +02:00 · 2025-05-27 07:03:33 +02:00 · 2025-05-07 20:00:30 +02:00 · 2025-03-04 15:59:08 +01:00
60 changed files with 276 additions and 110 deletions
--- a/3d_armor/api.lua
+++ b/3d_armor/api.lua
@ -352,7 +352,7 @@ armor.update_player_visuals = function(self, player)
 	end
 	local name = player:get_player_name()
 	if self.textures[name] then
-		default.player_set_textures(player, {
+		player_api.set_textures(player, {
 			self.textures[name].skin,
 			self.textures[name].armor,
 			self.textures[name].wielditem,
@ -373,7 +373,7 @@ armor.set_player_armor = function(self, player)
 	local state = 0
 	local count = 0
 	local preview = armor:get_preview(name)
-	local texture = "3d_armor_trans.png"
+	local texture = "blank.png"
 	local physics = {}
 	local attributes = {}
 	local levels = {}
@ -415,7 +415,7 @@ armor.set_player_armor = function(self, player)
 				end
 				-- DEPRECATED, use armor_groups instead
 				if def.groups["armor_radiation"] and levels["radiation"] then
-					levels["radiation"] = def.groups["armor_radiation"]
+					levels["radiation"] = levels["radiation"] + def.groups["armor_radiation"]
 				end
 			end
 			local item = stack:get_name()
@ -694,6 +694,9 @@ armor.equip = function(self, player, itemstack)
 				index = i
 			end
 		end
+		if not index then -- armor inventory is full with other armor elements
+			return itemstack
+		end
 		local stack = itemstack:take_item()
 		armor_inv:set_stack("armor", index, stack)
 		self:run_callbacks("on_equip", player, index, stack)
@ -719,11 +722,14 @@ armor.unequip = function(self, player, armor_element)
 		if self:get_element(stack:get_name()) == armor_element then
 			armor_inv:set_stack("armor", i, "")
 			minetest.after(0, function()
-				local inv = player:get_inventory()
-				if inv:room_for_item("main", stack) then
-					inv:add_item("main", stack)
-				else
-					minetest.add_item(player:get_pos(), stack)
+				local pplayer = minetest.get_player_by_name(name)
+				if pplayer then -- player is still online
+					local inv = pplayer:get_inventory()
+					if inv:room_for_item("main", stack) then
+						inv:add_item("main", stack)
+					else
+						minetest.add_item(pplayer:get_pos(), stack)
+					end
 				end
 			end)
 			self:run_callbacks("on_unequip", player, i, stack)
--- a/3d_armor/init.lua
+++ b/3d_armor/init.lua
@ -268,8 +268,8 @@ local function init_player_armor(initplayer)
 	local skin = armor:get_player_skin(name)
 	armor.textures[name] = {
 		skin = skin,
-		armor = "3d_armor_trans.png",
-		wielditem = "3d_armor_trans.png",
+		armor = "blank.png",
+		wielditem = "blank.png",
 		preview = armor.default_skin.."_preview.png",
 	}
 	local texture_path = minetest.get_modpath("player_textures")
@ -291,21 +291,26 @@ player_api.register_model("3d_armor_character.b3d", {
 	animation_speed = 30,
 	textures = {
 		armor.default_skin..".png",
-		"3d_armor_trans.png",
-		"3d_armor_trans.png",
+		"blank.png",
+		"blank.png",
 	},
 	animations = {
 		stand = {x=0, y=79},
-		lay = {x=162, y=166},
+		lay = {x=162, y=166, eye_height = 0.3, override_local = true,
+			collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}},
 		walk = {x=168, y=187},
 		mine = {x=189, y=198},
 		walk_mine = {x=200, y=219},
-		sit = {x=81, y=160},
+		sit = {x=81, y=160, eye_height = 0.8, override_local = true,
+			collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}},
 		-- compatibility w/ the emote mod
 		wave = {x = 192, y = 196, override_local = true},
 		point = {x = 196, y = 196, override_local = true},
 		freeze = {x = 205, y = 205, override_local = true},
 	},
+	collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
+	-- stepheight: use default
+	eye_height = 1.47,
 })

 minetest.register_on_player_receive_fields(function(player, formname, fields)
@ -322,7 +327,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 end)

 minetest.register_on_joinplayer(function(player)
-	default.player_set_model(player, "3d_armor_character.b3d")
+	player_api.set_model(player, "3d_armor_character.b3d")
 	init_player_armor(player)
 end)

@ -395,10 +400,14 @@ if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
 		local name = player:get_player_name()
-		local hit_ip = hitter:is_player()
-		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
-			return
-		elseif name then
+		if hitter then
+			local hit_ip = hitter:is_player()
+			if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+				return
+			end
+		end
+
+		if name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end
@ -440,7 +449,7 @@ minetest.register_globalstep(function(dtime)
 			local name = player:get_player_name()
 			if armor.def[name].feather > 0 then
 				local vel_y = player:get_velocity().y
-				if vel_y < 0 and vel_y < 3 then
+				if vel_y < -0.5 then
 					vel_y = -(vel_y * 0.05)
 					player:add_velocity({x = 0, y = vel_y, z = 0})
 				end
--- a/3d_armor/locale/3d_armor.eo.tr
+++ b/3d_armor/locale/3d_armor.eo.tr
@ -1,7 +1,7 @@
 # textdomain: 3d_armor
 Radiation=Radiado
 Level=Nivelo
-Heal=Sanigi
+Heal=Blokŝanco
 Fire=Fajro
 Your @1 is almost broken!=Via @1 estas preskaŭ rompita!
 Your @1 got destroyed!=Via @1 detruiĝis!
--- a/3d_armor/locale/3d_armor.pl.tr
+++ b/3d_armor/locale/3d_armor.pl.tr
@ -0,0 +1,7 @@
+# textdomain: 3d_armor
+Radiation=Promieniowanie
+Level=Poziom
+Heal=Uzdrawianie
+Fire=Ogień
+Your @1 is almost broken!=Twój @1 jest prawie zepsuty!
+Your @1 got destroyed!=Twój @1 został zniszczony!
--- a/3d_armor/locale/3d_armor.ru.tr
+++ b/3d_armor/locale/3d_armor.ru.tr
@ -1,7 +1,7 @@
 # textdomain: 3d_armor
-Radiation=излучение
-Level=уровень
-Heal=исцеление
-Fire=огонь
-Your @1 is almost broken!=
-Your @1 got destroyed!=твой(и) @1 был(и) разрушен(ы)!
+Radiation=Излучение
+Level=Уровень
+Heal=Исцеление
+Fire=Пламя
+Your @1 is almost broken!=Ваш предмет «@1» почти сломан!
+Your @1 got destroyed!=Ваш предмет «@1» был уничтожен!
--- a/3d_armor/locale/3d_armor.uk.tr
+++ b/3d_armor/locale/3d_armor.uk.tr
@ -0,0 +1,7 @@
+# textdomain: 3d_armor
+Radiation=Радіація
+Level=Рівень
+Heal=Зцілення
+Fire=Вогонь
+Your @1 is almost broken!=Ваш @1 майже зламаний!
+Your @1 got destroyed!=Ваш(і) @1 був(ли) зламаний(і)!
--- a/3d_armor/textures/3d_armor_trans.png
+++ b/3d_armor/textures/3d_armor_trans.png
--- a/3d_armor_ip/locale/3d_armor_ip.eo.tr
+++ b/3d_armor_ip/locale/3d_armor_ip.eo.tr
@ -1,3 +1,3 @@
 # textdomain: 3d_armor_ip
 Back=Dorso
-Armor=Kiraso
+Armor=Armaĵo
--- a/3d_armor_ip/locale/3d_armor_ip.ru.tr
+++ b/3d_armor_ip/locale/3d_armor_ip.ru.tr
@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Назад
+Armor=Броня
--- a/3d_armor_ip/locale/3d_armor_ip.uk.tr
+++ b/3d_armor_ip/locale/3d_armor_ip.uk.tr
@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Назад
+Armor=Броня
--- a/3d_armor_sfinv/init.lua
+++ b/3d_armor_sfinv/init.lua
@ -15,7 +15,7 @@ sfinv.register_page("3d_armor:armor", {
 	end
 })
 armor:register_on_update(function(player)
-	if sfinv.enabled then
+	if sfinv.enabled and sfinv.get_page(player) == "3d_armor:armor" then
 		sfinv.set_player_inventory_formspec(player)
 	end
 end)
--- a/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr
+++ b/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr
@ -1,2 +1,2 @@
 # textdomain: 3d_armor_sfinv
-Armor=Kiraso
+Armor=Armaĵoj
--- a/3d_armor_sfinv/locale/3d_armor_sfinv.ru.tr
+++ b/3d_armor_sfinv/locale/3d_armor_sfinv.ru.tr
@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Броня
--- a/3d_armor_sfinv/locale/3d_armor_sfinv.uk.tr
+++ b/3d_armor_sfinv/locale/3d_armor_sfinv.uk.tr
@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Броня
--- a/3d_armor_stand/init.lua
+++ b/3d_armor_stand/init.lua
@ -62,7 +62,7 @@ local function update_entity(pos)
 		object = minetest.add_entity(pos, "3d_armor_stand:armor_entity")
 	end
 	if object then
-		local texture = "3d_armor_trans.png"
+		local texture = "blank.png"
 		local textures = {}
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@ -144,8 +144,9 @@ minetest.register_node("3d_armor_stand:top", {
 	buildable_to = false,
 	drop = "",
 	groups = {not_in_creative_inventory = 1},
+	is_ground_content = false,
 	on_blast = function() end,
-	tiles = {"3d_armor_trans.png"},
+	tiles = {"blank.png"},
 })

 minetest.register_node("3d_armor_stand:armor_stand", {
@ -165,6 +166,7 @@ minetest.register_node("3d_armor_stand:armor_stand", {
 		},
 	},
 	groups = {choppy=2, oddly_breakable_by_hand=2},
+	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@ -234,6 +236,7 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 		},
 	},
 	groups = {choppy=2, oddly_breakable_by_hand=2},
+	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@ -316,6 +319,7 @@ minetest.register_node("3d_armor_stand:shared_armor_stand", {
 		},
 	},
 	groups = {choppy=2, oddly_breakable_by_hand=2},
+	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@ -384,7 +388,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 		mesh = "3d_armor_entity.obj",
 		visual_size = {x=1, y=1},
 		collisionbox = {0,0,0,0,0,0},
-		textures = {"3d_armor_trans.png"},
+		textures = {"blank.png"},
 	},
 	_pos = nil,
 	on_activate = function(self)
--- a/3d_armor_stand/locale/3d_armor_stand.eo.tr
+++ b/3d_armor_stand/locale/3d_armor_stand.eo.tr
@ -1,5 +1,5 @@
 # textdomain: 3d_armor_stand
-Armor Stand Top=Kirasstando Supro
-Armor Stand=Kirasstando
-Locked Armor Stand=Ŝlosita Kirasstando
-Armor Stand (owned by @1)=Kirasstando (posedata de @1)
+Armor Stand Top=Armaĵtenila Supro
+Armor Stand=Armaĵtenilo
+Locked Armor Stand=Ŝlosita Armaĵtenilo
+Armor Stand (owned by @1)=Ŝlosita Armaĵtenilo (posedata de @1)
--- a/3d_armor_stand/locale/3d_armor_stand.es.tr
+++ b/3d_armor_stand/locale/3d_armor_stand.es.tr
@ -0,0 +1,6 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=
+Armor Stand=Soporte de armadura
+Locked Armor Stand=Soporte de armadura privado
+Shared Armor Stand=Soporte de armadura compartido
+Armor Stand (owned by @1)=Soporte de armadura (de @1)
--- a/3d_armor_stand/locale/3d_armor_stand.ru.tr
+++ b/3d_armor_stand/locale/3d_armor_stand.ru.tr
@ -0,0 +1,6 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Верх Стойки для Брони
+Armor Stand=Стойка для Брони
+Locked Armor Stand=Заблокированная Стойка для Брони
+Shared Armor Stand=Публичная Стойка для Брони
+Armor Stand (owned by @1)=Стойка для Брони (владалец: @1)
--- a/3d_armor_stand/locale/3d_armor_stand.uk.tr
+++ b/3d_armor_stand/locale/3d_armor_stand.uk.tr
@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Верх Стійки для Броні
+Armor Stand=Стійка для Броні
+Locked Armor Stand=Закрита Стійка для Броні
+Armor Stand (owned by @1)=Стійка для Броні (власник @1)
--- a/3d_armor_stand/locale/template.txt
+++ b/3d_armor_stand/locale/template.txt
@ -2,4 +2,5 @@
 Armor Stand Top=
 Armor Stand=
 Locked Armor Stand=
+Shared Armor Stand=
 Armor Stand (owned by @1)=
--- a/3d_armor_ui/locale/3d_armor_ui.eo.tr
+++ b/3d_armor_ui/locale/3d_armor_ui.eo.tr
@ -1,7 +1,7 @@
 # textdomain: 3d_armor_ui
-3D Armor=3D Kiraso
-Armor not initialized!=Kiraso ne pravigita!
-Armor=Kiraso
+3D Armor=3D Armaĵoj
+Armor not initialized!=Armaĵoj ne pretigitaj!
+Armor=Armaĵo
 Level=Nivelo
 Heal=Sanigi
 Fire=Fajro
--- a/3d_armor_ui/locale/3d_armor_ui.ru.tr
+++ b/3d_armor_ui/locale/3d_armor_ui.ru.tr
@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=3D Броня
+Armor not initialized!=Броня не инициализирована!
+Armor=Броня
+Level=Уровень
+Heal=Исцеление
+Fire=Пламя
+Radiation=Излучение
--- a/3d_armor_ui/locale/3d_armor_ui.uk.tr
+++ b/3d_armor_ui/locale/3d_armor_ui.uk.tr
@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=3D Броня
+Armor not initialized!=Броня не ініціалізована!
+Armor=Броня
+Level=Рівень
+Heal=Зцілення
+Fire=Вогонь
+Radiation=Радіація
--- a/armor_admin/init.lua
+++ b/armor_admin/init.lua
@ -41,7 +41,7 @@ armor:register_armor(":3d_armor:chestplate_admin", {
 	description = S("Admin Chestplate"),
 	inventory_image = "3d_armor_inv_chestplate_admin.png",
 	armor_groups = {fleshy=100},
-	groups = {armor_torso=1, armor_heal=100, armor_use=0,
+	groups = {armor_torso=1, armor_heal=100, armor_use=0, armor_water=1,
 			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
@ -61,7 +61,7 @@ armor:register_armor(":3d_armor:leggings_admin", {
 	description = S("Admin Leggings"),
 	inventory_image = "3d_armor_inv_leggings_admin.png",
 	armor_groups = {fleshy=100},
-	groups = {armor_legs=1, armor_heal=100, armor_use=0,
+	groups = {armor_legs=1, armor_heal=100, armor_use=0, armor_water=1,
 			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
@ -82,7 +82,7 @@ armor:register_armor(":3d_armor:boots_admin", {
 	inventory_image = "3d_armor_inv_boots_admin.png",
 	armor_groups = {fleshy=100},
 	groups = {armor_feet=1, armor_heal=100, armor_use=0, physics_speed=1,
-			not_in_creative_inventory=1},
+			armor_water=1, not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
 	end,
--- a/armor_admin/locale/armor_admin.eo.tr
+++ b/armor_admin/locale/armor_admin.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_admin
 Admin Helmet=Administra Kasko
-Admin Chestplate=Administra Brustkiraso
+Admin Chestplate=Administra Kiraso
 Admin Leggings=Administra Pantalono
-Admin Boots=Administra Botoj
+Admin Boots=Administraj Botoj
--- a/armor_admin/locale/armor_admin.ru.tr
+++ b/armor_admin/locale/armor_admin.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_admin
-Admin Helmet=шлем админа
-Admin Chestplate=бронежилет админа
-Admin Leggings=гамаши админа
-Admin Boots=ботинки админа
+Admin Helmet=Шлем Админа
+Admin Chestplate=Нагрудник Админа
+Admin Leggings=Поножи Админа
+Admin Boots=Ботинки Админа
--- a/armor_admin/locale/armor_admin.uk.tr
+++ b/armor_admin/locale/armor_admin.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Шолом адміна
+Admin Chestplate=Броня адміна
+Admin Leggings=Штани адміна
+Admin Boots=Взуття адміна
--- a/armor_bronze/locale/armor_bronze.eo.tr
+++ b/armor_bronze/locale/armor_bronze.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_bronze
 Bronze Helmet=Bronza Kasko
-Bronze Chestplate=Bronza Brustkiraso
+Bronze Chestplate=Bronza Kiraso
 Bronze Leggings=Bronza Pantalono
-Bronze Boots=Bronza Botoj
+Bronze Boots=Bronzaj Botoj
--- a/armor_bronze/locale/armor_bronze.ru.tr
+++ b/armor_bronze/locale/armor_bronze.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_bronze
-Bronze Helmet=бронзовый шлем
-Bronze Chestplate=бронзовый бронежилет
-Bronze Leggings=бронзовые гамаши
-Bronze Boots=бронзовые ботинки
+Bronze Helmet=Бронзовый Шлем
+Bronze Chestplate=Бронзовый Нагрудник
+Bronze Leggings=Бронзовые Поножи
+Bronze Boots=Бронзовые Ботинки
--- a/armor_bronze/locale/armor_bronze.uk.tr
+++ b/armor_bronze/locale/armor_bronze.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_bronze
+Bronze Helmet=Бронзовий шолом
+Bronze Chestplate=Бронзова броня
+Bronze Leggings=Бронзові штани
+Bronze Boots=Бронзове взуття
--- a/armor_cactus/locale/armor_cactus.eo.tr
+++ b/armor_cactus/locale/armor_cactus.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_cactus
 Cactus Helmet=Kakta Kasko
-Cactus Chestplate=Kakta Brustkiraso
+Cactus Chestplate=Kakta Kiraso
 Cactus Leggings=Kakta Pantalono
-Cactus Boots=Kakta Botoj
+Cactus Boots=Kaktaj Botoj
--- a/armor_cactus/locale/armor_cactus.ru.tr
+++ b/armor_cactus/locale/armor_cactus.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_cactus
-Cactus Helmet=кактусовый шлем
-Cactus Chestplate=кактусовый бронежилет
-Cactus Leggings=кактусовые гамаши
-Cactus Boots=кактусовые ботинки
+Cactus Helmet=Кактусовый Шлем
+Cactus Chestplate=Кактусовый Нагрудник
+Cactus Leggings=Кактусовые Поножи
+Cactus Boots=Кактусовые Ботинки
--- a/armor_cactus/locale/armor_cactus.uk.tr
+++ b/armor_cactus/locale/armor_cactus.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_cactus
+Cactus Helmet=Кактусовий шолом
+Cactus Chestplate=Кактусова броня
+Cactus Leggings=Кактусові штани
+Cactus Boots=Кактусове взуття
--- a/armor_crystal/locale/armor_crystal.eo.tr
+++ b/armor_crystal/locale/armor_crystal.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_crystal
 Crystal Helmet=Kristala Kasko
-Crystal Chestplate=Kristala Brustkiraso
+Crystal Chestplate=Kristala Kiraso
 Crystal Leggings=Kristala Pantalono
-Crystal Boots=Kristala Botoj
+Crystal Boots=Kristalaj Botoj
--- a/armor_crystal/locale/armor_crystal.ru.tr
+++ b/armor_crystal/locale/armor_crystal.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_crystal
-Crystal Helmet=кристалловый шлем
-Crystal Chestplate=кристалловый бронежилет
-Crystal Leggings=кристалловые гамаши
-Crystal Boots=кристалловые ботинки
+Crystal Helmet=Кристальный Шлем
+Crystal Chestplate=Кристальный Нагрудник
+Crystal Leggings=Кристальные Поножи
+Crystal Boots=Кристальные Ботинки
--- a/armor_crystal/locale/armor_crystal.uk.tr
+++ b/armor_crystal/locale/armor_crystal.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_crystal
+Crystal Helmet=Кришталевий шолом
+Crystal Chestplate=Кришталева броня
+Crystal Leggings=Кришталеві штани
+Crystal Boots=Кришталеве взуття
--- a/armor_diamond/locale/armor_diamond.eo.tr
+++ b/armor_diamond/locale/armor_diamond.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_diamond
 Diamond Helmet=Diamanta Kasko
-Diamond Chestplate=Diamanta Brustkiraso
+Diamond Chestplate=Diamanta Kiraso
 Diamond Leggings=Diamanta Pantalono
-Diamond Boots=Diamanta Botoj
+Diamond Boots=Diamantaj Botoj
--- a/armor_diamond/locale/armor_diamond.ru.tr
+++ b/armor_diamond/locale/armor_diamond.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_diamond
-Diamond Helmet=алмазный шлем
-Diamond Chestplate=алмазный бронежилет
-Diamond Leggings=алмазные гамаши
-Diamond Boots=алмазные ботинки
+Diamond Helmet=Алмазный Шлем
+Diamond Chestplate=Алмазный Нагрудник
+Diamond Leggings=Алмазные Поножи
+Diamond Boots=Алмазные Ботинки
--- a/armor_diamond/locale/armor_diamond.uk.tr
+++ b/armor_diamond/locale/armor_diamond.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_diamond
+Diamond Helmet=Діамантовий шолом
+Diamond Chestplate=Діамантова броня
+Diamond Leggings=Діамантові штани
+Diamond Boots=Діамантове взуття
--- a/armor_gold/locale/armor_gold.eo.tr
+++ b/armor_gold/locale/armor_gold.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_gold
 Gold Helmet=Ora Kasko
-Gold Chestplate=Ora Brustkiraso
+Gold Chestplate=Ora Kiraso
 Gold Leggings=Ora Pantalono
-Gold Boots=Ora Botoj
+Gold Boots=Oraj Botoj
--- a/armor_gold/locale/armor_gold.ru.tr
+++ b/armor_gold/locale/armor_gold.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_gold
-Gold Helmet=золотой шлем
-Gold Chestplate=золотой бронежилет
-Gold Leggings=золотые гамаши
-Gold Boots=золотые ботинки
+Gold Helmet=Золотой Шлем
+Gold Chestplate=Золотой Нагрудник
+Gold Leggings=Золотые Поножи
+Gold Boots=Золотые Ботинки
--- a/armor_gold/locale/armor_gold.uk.tr
+++ b/armor_gold/locale/armor_gold.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_gold
+Gold Helmet=Золотий шолом
+Gold Chestplate=Золота броня
+Gold Leggings=Золоті штани
+Gold Boots=Золоте взуття
--- a/armor_mithril/locale/armor_mithril.eo.tr
+++ b/armor_mithril/locale/armor_mithril.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_mithril
 Mithril Helmet=Mitrila Kasko
-Mithril Chestplate=Mitrila Brustkiraso
+Mithril Chestplate=Mitrila Kiraso
 Mithril Leggings=Mitrila Pantalono
-Mithril Boots=Mitrila Botoj
+Mithril Boots=Mitrilaj Botoj
--- a/armor_mithril/locale/armor_mithril.ru.tr
+++ b/armor_mithril/locale/armor_mithril.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_mithril
-Mithril Helmet=мифриловый шлем
-Mithril Chestplate=мифриловый бронежилет
-Mithril Leggings=мифриловые гамаши
-Mithril Boots=мифриловые ботинки
+Mithril Helmet=Мифриловый Шлем
+Mithril Chestplate=Мифриловый Нагрудник
+Mithril Leggings=Мифриловые Поножи
+Mithril Boots=Мифриловые Ботинки
--- a/armor_mithril/locale/armor_mithril.uk.tr
+++ b/armor_mithril/locale/armor_mithril.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_mithril
+Mithril Helmet=Міфріловий шолом
+Mithril Chestplate=Міфрілова броня
+Mithril Leggings=Міфрілові штани
+Mithril Boots=Міфрілове взуття
--- a/armor_nether/locale/armor_nether.eo.tr
+++ b/armor_nether/locale/armor_nether.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_nether
 Nether Helmet=Inferna Kasko
-Nether Chestplate=Inferna Brustkiraso
+Nether Chestplate=Inferna Kiraso
 Nether Leggings=Inferna Pantalono
-Nether Boots=Inferna Botoj
+Nether Boots=Infernaj Botoj
--- a/armor_nether/locale/armor_nether.ru.tr
+++ b/armor_nether/locale/armor_nether.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_nether
-Nether Helmet=адский шлем
-Nether Chestplate=адский бронежилет
-Nether Leggings=адские гамаши
-Nether Boots=адские ботинки
+Nether Helmet=Незерский Шлем
+Nether Chestplate=Незерский Нагрудник
+Nether Leggings=Незерские Поножи
+Nether Boots=Незерские Ботинки
--- a/armor_nether/locale/armor_nether.uk.tr
+++ b/armor_nether/locale/armor_nether.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_nether
+Nether Helmet=Пекельний шолом
+Nether Chestplate=Пекельна броня
+Nether Leggings=Пекельні штани
+Nether Boots=Пекельне взуття
--- a/armor_nether/mod.conf
+++ b/armor_nether/mod.conf
@ -1,4 +1,4 @@
 name = armor_nether
 depends = 3d_armor
 optional_depends = nether
-description = Adds craftable wood armor.
+description = Adds craftable nether armor.
--- a/armor_steel/locale/armor_steel.eo.tr
+++ b/armor_steel/locale/armor_steel.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_steel
 Steel Helmet=Ŝtala Kasko
-Steel Chestplate=Ŝtala Brustkiraso
+Steel Chestplate=Ŝtala Kiraso
 Steel Leggings=Ŝtala Pantalono
-Steel Boots=Ŝtala Botoj
+Steel Boots=Ŝtalaj Botoj
--- a/armor_steel/locale/armor_steel.ru.tr
+++ b/armor_steel/locale/armor_steel.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_steel
-Steel Helmet=стальной шлем
-Steel Chestplate=стальной бронежилет
-Steel Leggings=стальные гамаши
-Steel Boots=стальные ботинки
+Steel Helmet=Стальной Шлем
+Steel Chestplate=Стальной Нагрудник
+Steel Leggings=Стальные Поножи
+Steel Boots=Стальные Ботинки
--- a/armor_steel/locale/armor_steel.uk.tr
+++ b/armor_steel/locale/armor_steel.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_steel
+Steel Helmet=Сталевий шолом
+Steel Chestplate=Сталева броня
+Steel Leggings=Сталеві штани
+Steel Boots=Сталеве взуття
--- a/armor_wood/locale/armor_wood.eo.tr
+++ b/armor_wood/locale/armor_wood.eo.tr
@ -1,5 +1,5 @@
 # textdomain: armor_wood
 Wood Helmet=Ligna Kasko
-Wood Chestplate=Ligna Brustkiraso
+Wood Chestplate=Ligna Kiraso
 Wood Leggings=Ligna Pantalono
-Wood Boots=Ligna Botoj
+Wood Boots=Lignaj Botoj
--- a/armor_wood/locale/armor_wood.ru.tr
+++ b/armor_wood/locale/armor_wood.ru.tr
@ -1,5 +1,5 @@
 # textdomain: armor_wood
-Wood Helmet=деревянный шлем
-Wood Chestplate=деревянный бронежилет
-Wood Leggings=деревянные гамаши
-Wood Boots=деревянные ботинки
+Wood Helmet=Деревянный Шлем
+Wood Chestplate=Деревянный Нагрудник
+Wood Leggings=Деревянные Поножи
+Wood Boots=Деревянные Ботинки
--- a/armor_wood/locale/armor_wood.uk.tr
+++ b/armor_wood/locale/armor_wood.uk.tr
@ -0,0 +1,5 @@
+# textdomain: armor_wood
+Wood Helmet=Дерев'яний шолом
+Wood Chestplate=Дерев'яна броня
+Wood Leggings=Дерев'яні штани
+Wood Boots=Дерев'яне взуття
--- a/shields/locale/shields.es.tr
+++ b/shields/locale/shields.es.tr
@ -0,0 +1,13 @@
+# textdomain: shields
+Admin Shield=Escudo de admin
+Wooden Shield=Escudo de madera
+Enhanced Wood Shield=Escudo de madera mejorado
+Cactus Shield=Escudo de cactus
+Enhanced Cactus Shield=Escudo de cactus mejorado
+Steel Shield=Escudo de acero
+Bronze Shield=Escudo de bronce
+Diamond Shield=Escudo de diamante
+Gold Shield=Escudo de oro
+Mithril Shield=Escudo de mitrilo
+Crystal Shield=Escudo de cristal
+Nether Shield=Escudo de nether
--- a/shields/locale/shields.ru.tr
+++ b/shields/locale/shields.ru.tr
@ -0,0 +1,13 @@
+# textdomain: shields
+Admin Shield=Щит Админа
+Wooden Shield=Деревянный Щит
+Enhanced Wood Shield=Улучшенный Деревянный Щит
+Cactus Shield=Кактусовый Щит
+Enhanced Cactus Shield=Улучшенный Кактусовый Щит
+Steel Shield=Стальной Щит
+Bronze Shield=Бронзовый Щит
+Diamond Shield=Алмазный Щит
+Gold Shield=Золотой Щит
+Mithril Shield=Мифриловый Щит
+Crystal Shield=Кристальный Щит
+Nether Shield=Незерский Щит
--- a/shields/locale/shields.uk.tr
+++ b/shields/locale/shields.uk.tr
@ -0,0 +1,13 @@
+# textdomain: shields
+Admin Shield=Щит адміна
+Wooden Shield=Дерев'яний щит
+Enhanced Wood Shield=Зміцнений дерев'яний щит
+Cactus Shield=Кактусовий щит
+Enhanced Cactus Shield=Зміцнений кактусовий щит
+Steel Shield=Сталевий щит
+Bronze Shield=Бронзовий щит
+Diamond Shield=Діамантовий щит
+Gold Shield=Золотий щит
+Mithril Shield=Міфріловий щит
+Crystal Shield=Кристальний щит
+Nether Shield=Пекельний щит
--- a/wieldview/get_texture.lua
+++ b/wieldview/get_texture.lua
@ -92,7 +92,7 @@ local get_image_from_tile = memoize(function(tile)
 		end
 	end

-	return "3d_armor_trans.png"
+	return "blank.png"
 end)

 local function get_image_cube(tiles)
@ -139,7 +139,7 @@ local function get_image_cube(tiles)
 		)
 	end

-	return "3d_armor_trans.png"
+	return "blank.png"
 end

 local function is_normal_node(drawtype)
@ -158,7 +158,7 @@ armor.get_wield_image = memoize(function(item)
 	item = ItemStack(item)

 	if item:is_empty() then
-		return "3d_armor_trans.png"
+		return "blank.png"
 	end

 	local def = item:get_definition()
@ -169,7 +169,7 @@ armor.get_wield_image = memoize(function(item)
 	local meta = item:get_meta()
 	local color = meta:get("color") or def.color

-	local image = "3d_armor_trans.png"
+	local image = "blank.png"

 	if def.wield_image and def.wield_image ~= "" then
 		local parts = {def.wield_image}
@ -193,7 +193,7 @@ armor.get_wield_image = memoize(function(item)

 	elseif def.type == "node" then
 		if def.drawtype == "nodebox" or def.drawtype == "mesh" then
-			image = "3d_armor_trans.png"
+			image = "blank.png"

 		else
 			local tiles = def.tiles
--- a/wieldview/init.lua
+++ b/wieldview/init.lua
@ -14,7 +14,7 @@ dofile(minetest.get_modpath(minetest.get_current_modname()).."/get_texture.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua")

 wieldview.get_item_texture = function(self, item)
-	local texture = "3d_armor_trans.png"
+	local texture = "blank.png"
 	if item ~= "" then
 		texture = armor.get_wield_image(item)
Author	SHA1	Message	Date
SmallJoker	dbe0a9276a	Prevent switching pages when using sfinv Previously, 3d_armor would issue an inventory update even if the 3d_armor page wasn't shown..	2025-06-24 21:14:27 +02:00
EmptyStar	dbc891a711	Fix crash when right-clicking to equip a seventh armor element with a full armor inventory (#163 )	2025-06-07 00:46:28 +02:00
BlackImpostor	a79d1383aa	Russian Capitalization (#162 ) * Update 3d_armor.ru.tr * Create 3d_armor_ip.ru.tr * Create 3d_armor_sfinv.ru.tr * Create 3d_armor_ui.ru.tr * Update 'Fire' * Capitalization in armor_admin.ru.tr * Capitalization in armor_bronze.ru.tr * Capitalization in armor_cactus.ru.tr * Capitalization in armor_crystal.ru.tr * Capitalization in armor_diamond.ru.tr * Capitalization in armor_gold.ru.tr * Capitalization in armor_mithril.ru.tr * Capitalization in armor_nether.ru.tr * Capitalization in armor_steel.ru.tr * Capitalization in armor_wood.ru.tr * Capitalization in shields.ru.tr	2025-05-28 17:59:13 +02:00
BlackImpostor	220cbc8d92	Update 3d_armor_stand.ru.tr (#161 )	2025-05-27 07:03:33 +02:00
TarasArt	8fe014e6d3	Add Ukrainian localization (#160 )	2025-05-07 20:00:30 +02:00
mal	a586aeee0c	Update mod.conf (#157 ) * Update mod.conf description changed from wood to nether * Update mod.conf Fixed typo from my previous PR.	2025-03-04 15:59:08 +01:00
SmallJoker	082e866274	Update player_api model registration Ensures correct eye position and collision box. Values taken from the player_api 'character.b3d' model.	2024-12-27 21:43:08 +01:00
Wiktor Perskawiec	c224a73df7	Add Polish translation (#151 )	2024-12-14 18:22:09 +01:00
tenplus1	280165fada	tweak feather falling (#150 ) changed y_velocity check for player so thart feather falling only works when actually falling and not standing around.	2024-12-12 14:00:26 +01:00
Maurus	ab1bec3be8	Added spanish translations to shields and stands, added "Shared Armor Stand" to template. (#147 ) * Create shields.es.tr Spanish translation for shields. * Create 3d_armor_stand.es.tr Spanish translation to armor stands. * Update template.txt Added "Shared Armor Stand" to template.	2024-06-25 06:37:04 +02:00
Niklp	22955b413a	Fix "player still online" check of `armor.unequip` (#146 )	2024-05-01 07:24:49 +02:00
Niklp	1fcbf64d53	Replace `3d_armor_trans.png` w/ engine provided `blank.png` (#143 )	2024-04-04 07:25:05 +02:00
randomei	fb86c02e43	russian translation fixes (#142 )	2024-03-25 20:01:28 +01:00
Niklp	20917da061	Fix armor radiation values were not not summed up (#139 )	2024-03-22 22:35:43 +01:00
Niklp	7bd77a7b80	Call custom `on_punched` functions w/ `hitter = nil` too (#141 )	2024-03-19 12:54:42 +01:00
Niklp	25369e5165	Don't assume `hitter ~= nil` in on_punchplayer callback (#138 ) * Don't assume `hitter ~= nil` in on_punchplayer callback * Use early return	2024-03-17 09:11:03 +01:00
Luke aka SwissalpS	7fc313f911	armorstand nodes are not ground content (#134 )	2024-02-29 07:39:44 +01:00
SmallJoker	4bac73fc9e	Make all admin armor to protect from drowning (#131 )	2024-01-17 10:33:37 +01:00
BuckarooBanzay	f430395b64	resolve player object in async function again (different globalstep) fixes #132	2024-01-15 10:15:49 +01:00
David Leal	467709c935	Use `player_api` functions instead of `default` (#129 )	2023-12-26 18:34:43 +01:00
Jaidyn Ann	e0b6112320	Tweak Esperanto translation (#128 )	2023-12-19 07:13:04 +01:00