Prevent switching pages when using sfinv

Previously, 3d_armor would issue an inventory update
even if the 3d_armor page wasn't shown..

.github/workflows/reference.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Lua
-      uses: leafo/gh-actions-lua@v8
+      uses: leafo/gh-actions-lua@v10.0.0
       with:
         luaVersion: 5.4
     - name: Setup Lua Rocks
       uses: leafo/gh-actions-luarocks@v4
     - name: Setup LDoc dependencies
-      run: luarocks install --only-deps https://raw.githubusercontent.com/lunarmodules/LDoc/master/ldoc-scm-3.rockspec
+      run: luarocks install --only-deps https://raw.githubusercontent.com/lunarmodules/ldoc/master/rockspecs/ldoc-1.5.0-1.rockspec
     - name: Setup LDoc
       run: git clone --single-branch --branch=custom https://github.com/AntumDeluge/ldoc.git .ldoc/ldoc && chmod +x .ldoc/ldoc/ldoc.lua
     - name: Generate docs

.ldoc/crafting.luadoc

@@ -0,0 +1,39 @@
+
+--- 3D Armor Crafting
+--
+--  @topic crafting
+
+
+--- Craft recipes for helmets, chestplates, leggings, boots, & shields.
+--
+--  @craft armor
+--  @usage
+--  Key:
+--  - m: material
+--    - wood:    group:wood
+--    - cactus:  default:cactus
+--    - steel:   default:steel_ingot
+--    - bronze:  default:bronze_ingot
+--    - diamond: default:diamond
+--    - gold:    default:gold_ingot
+--    - mithril: moreores:mithril_ingot
+--    - crystal: ethereal:crystal_ingot
+--    - nether:  nether:nether_ingot
+--
+--  helmet:        chestplate:    leggings:
+--  ┌───┬───┬───┐  ┌───┬───┬───┐  ┌───┬───┬───┐
+--  │ m │ m │ m │  │ m │   │ m │  │ m │ m │ m │
+--  ├───┼───┼───┤  ├───┼───┼───┤  ├───┼───┼───┤
+--  │ m │   │ m │  │ m │ m │ m │  │ m │   │ m │
+--  ├───┼───┼───┤  ├───┼───┼───┤  ├───┼───┼───┤
+--  │   │   │   │  │ m │ m │ m │  │ m │   │ m │
+--  └───┴───┴───┘  └───┴───┴───┘  └───┴───┴───┘
+--
+--  boots:         shield:
+--  ┌───┬───┬───┐  ┌───┬───┬───┐
+--  │   │   │   │  │ m │ m │ m │
+--  ├───┼───┼───┤  ├───┼───┼───┤
+--  │ m │   │ m │  │ m │ m │ m │
+--  ├───┼───┼───┤  ├───┼───┼───┤
+--  │ m │   │ m │  │   │ m │   │
+--  └───┴───┴───┘  └───┴───┴───┘

.ldoc/gendoc.sh

@@ -31,7 +31,7 @@ rm -rf "${d_export}"
 
 # generate items, settings, & crafts topics temp files
 echo -e "\ngenerating temp files ..."
-for script in "src" "settings" "crafts"; do
+for script in src settings; do
 	script="${d_ldoc}/parse_${script}.py"
 	if test ! -f "${script}"; then
 		echo "ERROR: script doesn't exist: ${script}"
@@ -48,7 +48,7 @@ done
 echo
 
 # generate new doc files
-"${cmd_ldoc}" --UNSAFE_NO_SANDBOX -c "${f_config}" -d "${d_export}" "${d_root}"; retval=$?
+"${cmd_ldoc}" --unsafe_no_sandbox -c "${f_config}" -d "${d_export}" "${d_root}"; retval=$?
 
 # check exit status
 if test ${retval} -ne 0; then
@@ -57,7 +57,7 @@ if test ${retval} -ne 0; then
 fi
 
 echo -e "\ncleaning temp files ..."
-rm -vf "${d_ldoc}/"*.luadoc
+find "${d_ldoc}" -type f -name "*.luadoc" ! -name "crafting.luadoc" -exec rm -vf {} +
 
 # HACK: ldoc does not seem to like the "shields:" prefix
 echo -e "\ncompensating for LDoc's issue with \"shields:\" prefix ..."
@@ -72,7 +72,7 @@ sed -i \
 printf "\ncopying textures ..."
 mkdir -p "${d_data}"
 texture_count=0
-for d_mod in "3d_armor" "shields"; do
+for d_mod in armor_* shields; do
 	printf "\rcopying textures from ${d_mod} ...\n"
 	for png in $(find "${d_root}/${d_mod}/textures" -maxdepth 1 -type f -name "*.png"); do
 		if test -f "${d_data}/$(basename ${png})"; then

.ldoc/parse_crafts.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-
-# This script will parse source files for craft recipes.
-
-import sys, os, codecs, errno
-
-
-path = os.path.realpath(__file__)
-script = os.path.basename(path)
-d_root = os.path.dirname(os.path.dirname(path))
-d_ldoc = os.path.join(d_root, ".ldoc")
-
-craftfile = os.path.realpath(os.path.join(d_root, "3d_armor/armor.lua"))
-if not os.path.isfile(craftfile):
-	print("ERROR: craft file does not exist for parsing: {}".format(craftfile))
-	sys.exit(errnor.ENOENT)
-
-buffer = codecs.open(craftfile, "r", "utf-8")
-if not buffer:
-	print("ERROR: could not open file for reading: {}".format(craftfile))
-	sys.exit(errno.EIO)
-
-data_in = buffer.read()
-buffer.close()
-
-craft = ""
-
-data_in = data_in.replace("\r\n", "\n").replace("\r", "\n")
-for sect in data_in.split("\n---"):
-	if "@craft armor" in sect:
-		sect = "---{}".format(sect)
-		for li in sect.split("\n"):
-			if li.startswith("--"):
-				craft = "{}\n{}".format(craft, li)
-
-outfile = os.path.join(d_ldoc, "crafting.luadoc")
-
-buffer = codecs.open(outfile, "w", "utf-8")
-if not buffer:
-	print("ERROR: could not open file for writing: {}".format(outfile))
-	sys.exit(errno.EIO)
-
-buffer.write("\n--- 3D Armor Crafting\n--\n--  @topic crafting\n\n{}\n".format(craft))
-buffer.close()
-
-print("crafts exported to\t{}".format(outfile))

3d_armor/LICENSE.txt

@@ -1,26 +0,0 @@
-[mod] 3d Armor [3d_armor]
-=========================
-
-License Source Code
--------------------
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-License Textures
-----------------
-
-Copyright (C) 2017-2019 davidthecreator - CC-BY-SA 3.0

3d_armor/README.md

@@ -6,7 +6,7 @@
 |-[Armor Configuration](#armor-configuration)                               |||- - [3d_Armor Item Storage](#3d_armor-item-storage)
 |- - [disable_specific_materials](#to-disable-individual-armor-materials)   |||- - [Armor Registration](#armor-registration)
 |- - [armor_init_delay](#initialization-glitches-when-a-player-first-joins) |||- - [Registering Armor Groups](#registering-armor-groups)
-|- - [armor_init_times](#number-of-initialization-attempts)                 |||- - [Groups used by 3d_Armor](#groups-used-by-3d_armor)
+|- - [wieldview_update_time](#how-often-player-wield-items-are-updated)     |||- - [Groups used by 3d_Armor](#groups-used-by-3d_armor)
 |- - [armor_bones_delay](#armor-not-in-bones-due-to-server-lag)             |||- - - [Elements](#elements)
 |- - [armor_update_time](#how-often-player-armor-items-are-updated)         |||- - - [Attributes](#attributes)
 |- - [armor_drop](#drop-armor-when-a-player-dies)                           |||- - - [Physics](#physics)
@@ -19,7 +19,7 @@
 |- - [armor_fire_protect](#enable-fire-protection)                          |||- - - [armor:remove_all](#armor-remove_all)
 |- - [armor_punch_damage](#enable-punch-damage-effects)                     |||- - - [armor:equip](#armor-equip)
 |- - [armor_migrate_old_inventory](#migration-of-old-armor-inventories)     |||- - - [armor:unequip](#armor-unequip)
-|- - [wieldview_update_time](#how-often-player-wield-items-are-updated)     |||- - - [armor:update_skin](#armor-update_skin)
+|                                                                           |||- - - [armor:update_skin](#armor-update_skin)
 |-[Credits](#credits)                                                       |||- - [Callbacks](#Callbacks)
 |                                                                           |||- - - [Item callbacks](#item-callbacks)
 |                                                                           |||- - - [Global callbacks](#global-callbacks)
@@ -60,11 +60,6 @@ Change the following default settings by going to Main Menu>>Settings(Tab)>>All
  
     armor_init_delay = 2
 
-### Number of initialization attempts
- **Increase to prevent glitches - Use in conjunction with armor_init_delay if initialization problems persist.**
-
-    armor_init_times = 10
-
 ### Armor not in bones due to server lag
  **Increase to help resolve**
  
@@ -254,7 +249,7 @@ The above allows armor to block/prevent new damage types but you also need to as
 ## Groups used by 3d_Armor
 3d_armor has many default groups already registered, these are categorized under 4 main headings
  - **Elements:** armor_head, armor_torso, armor_legs, armor_feet
- - **Attributes:** armor_heal, armor_fire, armor_water
+ - **Attributes:** armor_heal, armor_fire, armor_water, armor_feather
  - **Physics:** physics_jump, physics_speed, physics_gravity
  - **Durability:** armor_use, flammable
  
@@ -334,6 +329,9 @@ The below Diamond chestplate has a 12% chance to completely block all damage (ar
 		damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
 	})
 
+#### Armor_feather
+***"Armor_feather"*** will slow a player when falling. This only has one level or state, which is armor_feather=1
+
 ### Physics
 The physics attributes supported by 3d_armor are ***physics_jump, physics_speed and physics_gravity***. Although 3d_armor supports the use of this with no other mods it is recommended that the mod [player_monoids](https://forum.minetest.net/viewtopic.php?t=14895) is used to help with intermod compatability. 
 

3d_armor/api.lua

@@ -112,7 +112,7 @@ armor = {
 	timer = 0,
 	elements = {"head", "torso", "legs", "feet"},
 	physics = {"jump", "speed", "gravity"},
-	attributes = {"heal", "fire", "water"},
+	attributes = {"heal", "fire", "water", "feather"},
 	formspec = "image[2.5,0;2,4;armor_preview]"..
 		default.gui_bg..
 		default.gui_bg_img..
@@ -162,7 +162,6 @@ armor = {
 
 armor.config = {
 	init_delay = 2,
-	init_times = 10,
 	bones_delay = 1,
 	update_time = 1,
 	drop = minetest.get_modpath("bones") ~= nil,
@@ -183,6 +182,7 @@ armor.config = {
 	water_protect = true,
 	fire_protect = minetest.get_modpath("ethereal") ~= nil,
 	fire_protect_torch = minetest.get_modpath("ethereal") ~= nil,
+	feather_fall = true,
 	punch_damage = true,
 }
 
@@ -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()
@@ -490,10 +490,13 @@ armor.set_player_armor = function(self, player)
 		armor_monoid.monoid:add_change(player, change, "3d_armor:armor")
 	else
 		-- Preserve immortal group (damage disabled for player)
-		local immortal = player:get_armor_groups().immortal
+		local player_groups = player:get_armor_groups()
+		local immortal = player_groups.immortal
 		if immortal and immortal ~= 0 then
 			groups.immortal = 1
 		end
+		-- Preserve fall_damage_add_percent group (fall damage modifier)
+		groups.fall_damage_add_percent = player_groups.fall_damage_add_percent
 		player:set_armor_groups(groups)
 	end
 	if use_player_monoids then
@@ -627,6 +630,9 @@ end
 armor.damage = function(self, player, index, stack, use)
 	local old_stack = ItemStack(stack)
 	local worn_armor = armor:get_weared_armor_elements(player)
+	if not worn_armor then
+		return
+	end
 	local armor_worn_cnt = 0
 	for k,v in pairs(worn_armor) do
 		armor_worn_cnt = armor_worn_cnt + 1
@@ -677,6 +683,10 @@ armor.equip = function(self, player, itemstack)
 		for i=1, armor_inv:get_size("armor") do
 			local stack = armor_inv:get_stack("armor", i)
 			if self:get_element(stack:get_name()) == armor_element then
+				--prevents equiping an armor that would unequip a cursed armor.
+				if minetest.get_item_group(stack:get_name(), "cursed") ~= 0 then
+					return itemstack
+				end
 				index = i
 				self:unequip(player, armor_element)
 				break
@@ -684,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)
@@ -709,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)
@@ -798,9 +814,6 @@ end
 --  @tparam[opt] bool listring Use `listring` formspec element (default: `false`).
 --  @treturn string Formspec formatted string.
 armor.get_armor_formspec = function(self, name, listring)
-	if armor.def[name].init_time == 0 then
-		return "label[0,0;Armor not initialized!]"
-	end
 	local formspec = armor.formspec..
 		"list[detached:"..name.."_armor;armor;0,0.5;2,3;]"
 	if listring == true then
@@ -929,6 +942,10 @@ armor.get_valid_player = function(self, player, msg)
 		minetest.log("warning", ("3d_armor%s: Player reference is nil"):format(msg))
 		return
 	end
+	if type(player) ~= "userdata" then
+		-- Fake player, fail silently
+		return
+	end
 	local name = player:get_player_name()
 	if not name then
 		minetest.log("warning", ("3d_armor%s: Player name is nil"):format(msg))

3d_armor/armor.conf.example

@@ -35,10 +35,6 @@ ARMOR_FIRE_NODES = {
 -- Increase this if you get initialization glitches when a player first joins.
 ARMOR_INIT_DELAY = 1
 
--- Number of initialization attempts.
--- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
-ARMOR_INIT_TIMES = 1
-
 -- Increase this if armor is not getting into bones due to server lag.
 ARMOR_BONES_DELAY = 1
 

3d_armor/depends.txt

@@ -1,9 +0,0 @@
-default
-player_monoids?
-armor_monoid?
-pova?
-fire?
-ethereal?
-bakedclay?
-moreores?
-nether?

3d_armor/description.txt

@@ -1 +0,0 @@
-Adds craftable armor that is visible to other players.

3d_armor/init.lua

@@ -2,7 +2,6 @@ local modname = minetest.get_current_modname()
 local modpath = minetest.get_modpath(modname)
 local worldpath = minetest.get_worldpath()
 local last_punch_time = {}
-local pending_players = {}
 local timer = 0
 
 dofile(modpath.."/api.lua")
@@ -99,17 +98,7 @@ for _, mod in pairs(skin_mods) do
 		armor.set_skin_mod(mod)
 	end
 end
-if not minetest.get_modpath("moreores") then
-	armor.materials.mithril = nil
-end
-if not minetest.get_modpath("ethereal") then
-	armor.materials.crystal = nil
-end
-if not minetest.get_modpath("nether") then
-	armor.materials.nether = nil
-end
 
-dofile(modpath.."/armor.lua")
 
 -- Armor Initialization
 
@@ -191,11 +180,7 @@ local function validate_armor_inventory(player)
 end
 
 local function init_player_armor(initplayer)
-	local name = initplayer:get_player_name()
-	local pos = initplayer:get_pos()
-	if not name or not pos then
-		return false
-	end
+	local name = assert(initplayer:get_player_name())
 	local armor_inv = minetest.create_detached_inventory(name.."_armor", {
 		on_put = function(inv, listname, index, stack, player)
 			validate_armor_inventory(player)
@@ -234,6 +219,11 @@ local function init_player_armor(initplayer)
 			if player:get_player_name() ~= name then
 				return 0
 			end
+			--cursed items cannot be unequiped by the player
+			local is_cursed = minetest.get_item_group(stack:get_name(), "cursed") ~= 0
+			if not minetest.is_creative_enabled(player) and is_cursed then
+				return 0
+			end
 			return stack:get_count()
 		end,
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
@@ -261,7 +251,6 @@ local function init_player_armor(initplayer)
 		end
 	end
 	armor.def[name] = {
-		init_time = minetest.get_gametime(),
 		level = 0,
 		state = 0,
 		count = 0,
@@ -279,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")
@@ -294,7 +283,6 @@ local function init_player_armor(initplayer)
 		end
 	end
 	armor:set_player_armor(initplayer)
-	return true
 end
 
 -- Armor Player Model
@@ -303,17 +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)
@@ -330,16 +327,8 @@ 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")
-	local player_name = player:get_player_name()
-
-	minetest.after(0, function()
-		-- TODO: Added in 7566ecc - What's the prupose?
-		local pplayer = minetest.get_player_by_name(player_name)
-		if pplayer and init_player_armor(pplayer) == false then
-			pending_players[pplayer] = 0
-		end
-	end)
+	player_api.set_model(player, "3d_armor_character.b3d")
+	init_player_armor(player)
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -348,7 +337,6 @@ minetest.register_on_leaveplayer(function(player)
 		armor.def[name] = nil
 		armor.textures[name] = nil
 	end
-	pending_players[player] = nil
 end)
 
 if armor.config.drop == true or armor.config.destroy == true then
@@ -361,9 +349,12 @@ if armor.config.drop == true or armor.config.destroy == true then
 		for i=1, armor_inv:get_size("armor") do
 			local stack = armor_inv:get_stack("armor", i)
 			if stack:get_count() > 0 then
-				table.insert(drop, stack)
-				armor:run_callbacks("on_unequip", player, i, stack)
-				armor_inv:set_stack("armor", i, nil)
+				--soulbound armors remain equipped after death
+				if minetest.get_item_group(stack:get_name(), "soulbound") == 0 then
+					table.insert(drop, stack)
+					armor:run_callbacks("on_unequip", player, i, stack)
+					armor_inv:set_stack("armor", i, nil)
+				end
 			end
 		end
 		armor:save_armor_inventory(player)
@@ -399,8 +390,8 @@ if armor.config.drop == true or armor.config.destroy == true then
 			end)
 		end
 	end)
-else -- reset un-dropped armor and it's effects
 	minetest.register_on_respawnplayer(function(player)
+		-- reset un-dropped armor and it's effects
 		armor:set_player_armor(player)
 	end)
 end
@@ -409,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
@@ -420,43 +415,53 @@ if armor.config.punch_damage == true then
 end
 
 minetest.register_on_player_hpchange(function(player, hp_change, reason)
-	if player and reason.type ~= "drown" and reason.hunger == nil
-			and hp_change < 0 then
-		local name = player:get_player_name()
-		if name then
-			local heal = armor.def[name].heal
-			if heal >= math.random(100) then
-				hp_change = 0
-			end
-			-- check if armor damage was handled by fire or on_punchplayer
-			local time = last_punch_time[name] or 0
-			if time == 0 or time + 1 < minetest.get_gametime() then
-				armor:punch(player)
-			end
+	if not minetest.is_player(player) then
+		return hp_change
+	end
+
+	if reason.type == "drown" or reason.hunger or hp_change >= 0 then
+		return hp_change
+	end
+
+	local name = player:get_player_name()
+	local properties = player:get_properties()
+	local hp = player:get_hp()
+	if hp + hp_change < properties.hp_max then
+		local heal = armor.def[name].heal
+		if heal >= math.random(100) then
+			hp_change = 0
+		end
+		-- check if armor damage was handled by fire or on_punchplayer
+		local time = last_punch_time[name] or 0
+		if time == 0 or time + 1 < minetest.get_gametime() then
+			armor:punch(player)
 		end
 	end
+
 	return hp_change
 end, true)
 
 minetest.register_globalstep(function(dtime)
 	timer = timer + dtime
+
+	if armor.config.feather_fall == true then
+		for _,player in pairs(minetest.get_connected_players()) do
+			local name = player:get_player_name()
+			if armor.def[name].feather > 0 then
+				local vel_y = player:get_velocity().y
+				if vel_y < -0.5 then
+					vel_y = -(vel_y * 0.05)
+					player:add_velocity({x = 0, y = vel_y, z = 0})
+				end
+			end
+		end
+	end
+
 	if timer <= armor.config.init_delay then
 		return
 	end
 	timer = 0
 
-	for player, count in pairs(pending_players) do
-		local remove = init_player_armor(player) == true
-		pending_players[player] = count + 1
-		if remove == false and count > armor.config.init_times then
-			minetest.log("warning", S("3d_armor: Failed to initialize player"))
-			remove = true
-		end
-		if remove == true then
-			pending_players[player] = nil
-		end
-	end
-
 	-- water breathing protection, added by TenPlus1
 	if armor.config.water_protect == true then
 		for _,player in pairs(minetest.get_connected_players()) do
@@ -469,22 +474,14 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
--- Fire Protection, added by TenPlus1.
 if armor.config.fire_protect == true then
-	-- override any hot nodes that do not already deal damage
-	for _, row in pairs(armor.fire_nodes) do
-		if minetest.registered_nodes[row[1]] then
-			local damage = minetest.registered_nodes[row[1]].damage_per_second
-			if not damage or damage == 0 then
-				minetest.override_item(row[1], {damage_per_second = row[3]})
-			end
-		end
-	end
-else
-	print ("[3d_armor] Fire Nodes disabled")
-end
 
-if armor.config.fire_protect == true then
+	-- make torches hurt
+	minetest.override_item("default:torch", {damage_per_second = 1})
+	minetest.override_item("default:torch_wall", {damage_per_second = 1})
+	minetest.override_item("default:torch_ceiling", {damage_per_second = 1})
+
+	-- check player damage for any hot nodes we may be protected against
 	minetest.register_on_player_hpchange(function(player, hp_change, reason)
 
 		if reason.type == "node_damage" and reason.node then
@@ -493,9 +490,7 @@ if armor.config.fire_protect == true then
 				local name = player:get_player_name()
 				for _,igniter in pairs(armor.fire_nodes) do
 					if reason.node == igniter[1] then
-						if armor.def[name].fire < igniter[2] then
-							armor:punch(player, "fire")
-						else
+						if armor.def[name].fire >= igniter[2] then
 							hp_change = 0
 						end
 					end

3d_armor/locale/3d_armor.de.tr

@@ -1,62 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor : Abgetrennter Rüstungsbestand ist nicht gesetzt: @1
-3d_armor: Player name is nil @1=3d_armor : Spielername ist nicht gesetzt: @1
-3d_armor: Player reference is nil @1=3d_armor : Spielerreferenz ist nicht gesetzt: @1
-
-### armor.lua ###
-
-Admin Boots=Adminstiefel
-Admin Chestplate=Adminbrustplatte
-Admin Helmet=Adminhelm
-Admin Leggings=Adminhose
-Bronze Boots=Bronzestiefel
-Bronze Chestplate=Bronzebrustplatte
-Bronze Helmet=Bronzehelm
-Bronze Leggings=Bronzehose
-Cactus Boots=Kaktusstiefel
-Cactus Chestplate=Kaktusbrustplatte
-Cactus Helmet=Kaktushelm
-Cactus Leggings=Kaktushose
-Crystal Boots=Kristallstiefel
-Crystal Chestplate=Kristallbrustplatte
-Crystal Helmet=Kristallhelm
-Crystal Leggings=Kristallhose
-Nether Boots=Netherstiefel
-Nether Chestplate=Netherbrustplatte
-Nether Helmet=Netherhelm
-Nether Leggings=Netherhose
-Diamond Boots=Diamantstiefel
-Diamond Chestplate=Diamantbrustplatte
-Diamond Helmet=Diamanthelm
-Diamond Leggings=Diamanthose
-Gold Boots=Goldstiefel
-Gold Chestplate=Goldbrustplatte
-Gold Helmet=Goldhelm
-Gold Leggings=Goldhose
-Mithril Boots=Mithrilstiefel
-Mithril Chestplate=Mithrilbrustplatte
-Mithril Helmet=Mithrilhelm
-Mithril Leggings=Mithrilhose
-Steel Boots=Stahlstiefel
-Steel Chestplate=Stahlbrustplatte
-Steel Helmet=Stahlhelm
-Steel Leggings=Stahlhose
-Wood Boots=Holzstiefel
-Wood Chestplate=Holzbrustplatte
-Wood Helmet=Holzhelm
-Wood Leggings=Holzhose
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor : Initialisierung des Spielers fehlgeschlagen
-Fire=Feuer
-Heal=Heilen
+Radiation=Strahlung
 Level=Stufe
-Radiation=Strahlen
-Your @1 got destroyed!=Deine @1 wurde zerstört!
-Your @1 is almost broken!=Deine @1 ist fast kaputt!
-[3d_armor] Fire Nodes disabled=[3d_armor] Feuer-Knoten deaktiviert
+Heal=Heilung
+Fire=Feuer
+Your @1 is almost broken!=@1 ist fast kaputt!
+Your @1 got destroyed!=@1 wurde zerstört!

3d_armor/locale/3d_armor.eo.tr

@@ -0,0 +1,7 @@
+# textdomain: 3d_armor
+Radiation=Radiado
+Level=Nivelo
+Heal=Blokŝanco
+Fire=Fajro
+Your @1 is almost broken!=Via @1 estas preskaŭ rompita!
+Your @1 got destroyed!=Via @1 detruiĝis!

3d_armor/locale/3d_armor.es.tr

@@ -1,62 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: La armadura desconectada es nula @1
-3d_armor: Player name is nil @1=3d_armor: El nombre del jugador es nulo @1
-3d_armor: Player reference is nil @1=3d_armor: La referencia del jugador es nula @1
-
-### armor.lua ###
-
-Admin Boots=Botas de admin
-Admin Chestplate=Peto de admin
-Admin Helmet=Casco de admin
-Admin Leggings=Grebas de admin
-Bronze Boots=Botas de bronce
-Bronze Chestplate=Peto de bronce
-Bronze Helmet=Casco de bronce
-Bronze Leggings=Grebas de bronce
-Cactus Boots=Botas de cactus
-Cactus Chestplate=Peto de cactus
-Cactus Helmet=Casco de cactus
-Cactus Leggings=Grebas de cactus
-Crystal Boots=Botas de cristal
-Crystal Chestplate=Peto de cristal
-Crystal Helmet=Casco de cristal
-Crystal Leggings=Grebas de cristal
-Nether Boots=Botas de nether
-Nether Chestplate=Peto de nether
-Nether Helmet=Casco de nether
-Nether Leggings=Grebas de nether
-Diamond Boots=Botas de diamante
-Diamond Chestplate=Peto de diamante
-Diamond Helmet=Casco de diamante
-Diamond Leggings=Grebas de diamante
-Gold Boots=Botas de oro
-Gold Chestplate=Peto de oro
-Gold Helmet=Casco de oro
-Gold Leggings=Grebas de oro
-Mithril Boots=Botas de mitrilo
-Mithril Chestplate=Peto de mitrilo
-Mithril Helmet=Casco de mitrilo
-Mithril Leggings=Grebas de mitrilo
-Steel Boots=Botas de acero
-Steel Chestplate=Peto de acero
-Steel Helmet=Casco de acero
-Steel Leggings=Grebas de acero
-Wood Boots=Botas de madera
-Wood Chestplate=Peto de madera
-Wood Helmet=Casco de madera
-Wood Leggings=Grebas de madera
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: Fallo en la inicialización del jugador
-Fire=Fuego
-Heal=Salud
-Level=Nivel
 Radiation=Radiación
-Your @1 got destroyed!=¡Tu @1 fue destruído!
+Level=Nivel
+Heal=Salud
+Fire=Fuego
 Your @1 is almost broken!=¡Tu @1 esta a punto de romperse!
-[3d_armor] Fire Nodes disabled=[3d_armor] Nodos de fuego desabilitados
+Your @1 got destroyed!=¡Tu @1 fue destruído!

3d_armor/locale/3d_armor.fr.tr

@@ -1,62 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor : Inventaire détaché pour l'armure non trouvé @1
-3d_armor: Player name is nil @1=3d_armor : Nom du joueur non trouvé @1
-3d_armor: Player reference is nil @1=3d_armor : Référence au joueur non trouvée @1
-
-### armor.lua ###
-
-Admin Boots=Bottes d'admin
-Admin Chestplate=Cuirasse d'admin
-Admin Helmet=Casque d'admin
-Admin Leggings=Jambières d'admin
-Bronze Boots=Bottes en bronze
-Bronze Chestplate=Cuirasse en bronze
-Bronze Helmet=Casque en bronze
-Bronze Leggings=Jambières en bronze
-Cactus Boots=Bottes en cactus
-Cactus Chestplate=Cuirasse en cactus
-Cactus Helmet=Casque en cactus
-Cactus Leggings=Jambières en cactus
-Crystal Boots=Bottes en cristal
-Crystal Chestplate=Cuirasse en cristal
-Crystal Helmet=Casque en cristal
-Crystal Leggings=Jambières en cristal
-Nether Boots=Bottes en nether
-Nether Chestplate=Cuirasse en nether
-Nether Helmet=Casque en nether
-Nether Leggings=Jambières en nether
-Diamond Boots=Bottes en diamant
-Diamond Chestplate=Cuirasse en diamant
-Diamond Helmet=Casque en diamant
-Diamond Leggings=Jambières en diamant
-Gold Boots=Bottes en or
-Gold Chestplate=Cuirasse en or
-Gold Helmet=Casque en or
-Gold Leggings=Jambières en or
-Mithril Boots=Bottes en mithril
-Mithril Chestplate=Cuirasse en mithril
-Mithril Helmet=Casque en mithril
-Mithril Leggings=Jambières en mithril
-Steel Boots=Bottes en acier
-Steel Chestplate=Cuirasse en acier
-Steel Helmet=Casque en acier
-Steel Leggings=Jambières en acier
-Wood Boots=Bottes en bois
-Wood Chestplate=Cuirasse en bois
-Wood Helmet=Casque en bois
-Wood Leggings=Jambières en bois
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor : Impossible d'initialiser le joueur
-Fire=Fire
-Heal=Soins
-Level=Niveau
 Radiation=Radiation
-Your @1 got destroyed!=Une partie de votre armure a été détruite : @1 !
+Level=Niveau
+Heal=Soins
+Fire=Fire
 Your @1 is almost broken!=Une partie de votre armure est presque détruite : @1 !
-[3d_armor] Fire Nodes disabled=[3d_armor] Nœuds de type feu désactivés
+Your @1 got destroyed!=Une partie de votre armure a été détruite : @1 !

3d_armor/locale/3d_armor.it.tr

@@ -1,90 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: L'inventario separato dell'armatura è nullo @1
-3d_armor: Player name is nil @1=3d_armor: Il nome dell'utente è nullo @1
-3d_armor: Player reference is nil @1=3d_armor: Il riferimento all'utente è nullo @1
-
-### armor.lua ###
-
-Admin Boots=Stivali dell'amministratrice/tore
-Admin Chestplate=Corazza dell'amministratrice/tore
-Admin Helmet=Elmo dell'amministratrice/tore
-Admin Leggings=Gambali dell'amministratrice/tore
-Bronze Boots=Stivali di bronzo
-Bronze Chestplate=Corazza di bronzo
-Bronze Helmet=Elmo di bronzo
-Bronze Leggings=Gambali di bronzo
-Cactus Boots=Stivali di cactus
-Cactus Chestplate=Corazza di cactus
-Cactus Helmet=Elmo di cactus
-Cactus Leggings=Gambali di cactus
-Crystal Boots=Stivali di cristallo
-Crystal Chestplate=Corazza di cristallo
-Crystal Helmet=Elmo di cristallo
-Crystal Leggings=Gambali di cristallo
-Nether Boots=Stivali di nether
-Nether Chestplate=Corazza di nether
-Nether Helmet=Elmo di nether
-Nether Leggings=Gambali di nether
-Diamond Boots=Stivali di diamante
-Diamond Chestplate=Corazza di diamante
-Diamond Helmet=Elmo di diamante
-Diamond Leggings=Gambali di diamante
-Gold Boots=Stivali d'oro
-Gold Chestplate=Corazza d'oro
-Gold Helmet=Elmo d'oro
-Gold Leggings=Gambali d'oro
-Mithril Boots=Stivali di mithril
-Mithril Chestplate=Corazza di mithril
-Mithril Helmet=Elmo di mithril
-Mithril Leggings=Gambali di mithril
-Steel Boots=Stivali d'acciaio
-Steel Chestplate=Corazza d'acciaio
-Steel Helmet=Elmo d'acciaio
-Steel Leggings=Gambali d'acciaio
-Wood Boots=Stivali di legno
-Wood Chestplate=Corazza di legno
-Wood Helmet=Elmo di legno
-Wood Leggings=Gambali di legno
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: Inizializzazione dell'utente fallita
-Fire=Fuoco
-Heal=Guarigione
-Level=Livello
 Radiation=Radiazione
-Your @1 got destroyed!=@1 in frantumi!
+Level=Livello
+Heal=Guarigione
+Fire=Fuoco
 Your @1 is almost broken!=@1 quasi in frantumi!
-[3d_armor] Fire Nodes disabled=[3d_armor] Nodi fuoco disabilitati
-
-
-##### not used anymore #####
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod caricata ma inutilizzata.
-Back=Indietro
-Armor=Armatura
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod caricata ma inutilizzata.
-Armor stand top=Parte superiore del supporto per armatura
-Armor stand=Supporto per armatura
-Armor Stand=Supporto per armatura
-Locked Armor stand=Supporto per armatura chiuso a chiave
-Armor Stand (owned by @1)=Supporto per armatura (di proprietà di @1)
-3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod caricata ma inutilizzata.
-3d Armor=Armatura 3D
-Armor not initialized!=Armatura non inizializzata!
-Admin Shield=Scudo dell'amministratrice/tore
-Wooden Shield=Scudo di legno
-Enhanced Wood Shield=Scudo di legno migliorato
-Cactus Shield=Scudo di cactus
-Enhanced Cactus Shield=Scudo di cactus migliorato
-Steel Shield=Scudo d'acciaio
-Bronze Shield=Scudo di bronzo
-Diamond Shield=Scudo di diamante
-Gold Shield=Scudo d'oro
-Mithril Shield=Scudo di mithril
-Crystal Shield=Scudo di cristallo
-Nether Shield=Scudo di nether
+Your @1 got destroyed!=@1 in frantumi!

3d_armor/locale/3d_armor.ms.tr

@@ -1,90 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: Inventori perisai terpisah tiada nilai @1
-3d_armor: Player name is nil @1=3d_armor: Nama pemain tiada nilai @1
-3d_armor: Player reference is nil @1=3d_armor: Rujukan pemain tiada nilai @1
-
-### armor.lua ###
-
-Admin Boots=But Pentadbir
-Admin Chestplate=Perisai Dada Pentadbir
-Admin Helmet=Helmet Pentadbir
-Admin Leggings=Perisai Kaki Pentadbir
-Bronze Boots=But Gangsa
-Bronze Chestplate=Perisai Dada Gangsa
-Bronze Helmet=Helmet Gangsa
-Bronze Leggings=Perisai Kaki Gangsa
-Cactus Boots=But Kaktus
-Cactus Chestplate=Perisai Dada Kaktus
-Cactus Helmet=Helmet Kaktus
-Cactus Leggings=Perisai Kaki Kaktus
-Crystal Boots=But Kristal
-Crystal Chestplate=Perisai Dada Kristal
-Crystal Helmet=Helmet Kristal
-Crystal Leggings=Perisai Kaki Kristal
-Nether Boots=But Nether
-Nether Chestplate=Perisai Dada Nether
-Nether Helmet=Helmet Nether
-Nether Leggings=Perisai Kaki Nether
-Diamond Boots=But Intan
-Diamond Chestplate=Perisai Dada Intan
-Diamond Helmet=Helmet Intan
-Diamond Leggings=Perisai Kaki Intan
-Gold Boots=But Emas
-Gold Chestplate=Perisai Dada Emas
-Gold Helmet=Helmet Emas
-Gold Leggings=Perisai Kaki Emas
-Mithril Boots=But Mithril
-Mithril Chestplate=Perisai Dada Mithril
-Mithril Helmet=Helmet Mithril
-Mithril Leggings=Perisai Kaki Mithril
-Steel Boots=But Keluli
-Steel Chestplate=Perisai Dada Keluli
-Steel Helmet=Helmet Keluli
-Steel Leggings=Perisai Kaki Keluli
-Wood Boots=But Kayu
-Wood Chestplate=Perisai Dada Kayu
-Wood Helmet=Helmet Kayu
-Wood Leggings=Perisai Kaki Kayu
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: Gagal mengasalkan pemain
-Fire=Api
-Heal=Pulih
-Level=Tahap
 Radiation=Radiasi
-Your @1 got destroyed!=@1 anda telah musnah!
+Level=Tahap
+Heal=Pulih
+Fire=Api
 Your @1 is almost broken!=
-[3d_armor] Fire Nodes disabled=[3d_armor] Nod-nod Api dilumpuhkan
-
-
-##### not used anymore #####
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mods dimuatkan tetapi tidak digunakan.
-Back=Kembali
-Armor=Perisai
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mods dimuatkan tetapi tidak digunakan.
-Armor stand top=Bhg atas dirian perisai
-Armor stand=Dirian perisai
-Armor Stand=Dirian Perisai
-Locked Armor stand=Dirian perisai Berkunci
-Armor Stand (owned by @1)=Dirian Perisai (milik @1)
-3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mods dimuatkan tetapi tidak digunakan.
-3d Armor=Perisai 3d
-Armor not initialized!=Perisai tidak diasalkan!
-Admin Shield=Perisai Pegang Pentadbir
-Wooden Shield=Perisai Pegang Kayu
-Enhanced Wood Shield=Perisai Pegang Kayu Kukuh
-Cactus Shield=Perisai Pegang Kaktus
-Enhanced Cactus Shield=Perisai Pegang Kaktus Kukuh
-Steel Shield=Perisai Pegang Keluli
-Bronze Shield=Perisai Pegang Gangsa
-Diamond Shield=Perisai Pegang Intan
-Gold Shield=Perisai Pegang Emas
-Mithril Shield=Perisai Pegang Mithril
-Crystal Shield=Perisai Pegang Kristal
-Nether Shield=Perisai Pegang Nether
+Your @1 got destroyed!=@1 anda telah musnah!

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!

3d_armor/locale/3d_armor.pt.tr

@@ -1,90 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1
-3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
-3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
-
-### armor.lua ###
-
-Admin Boots=Botas de Administrador
-Admin Chestplate=Peitoral de Administrador
-Admin Helmet=Capacete de Administrador
-Admin Leggings=Calças de Administrador
-Bronze Boots=Botas de Bronze
-Bronze Chestplate=Peitoral de Bronze
-Bronze Helmet=Capacete de Bronze
-Bronze Leggings=Calças de Bronze
-Cactus Boots=Botas de Madeira
-Cactus Chestplate=Peitoral de Cacto
-Cactus Helmet=Capacete de Cacto
-Cactus Leggings=Calças de Cacto
-Crystal Boots=Botas de Cristal
-Crystal Chestplate=Peitoral de Cristal
-Crystal Helmet=Capacete de Cristal
-Crystal Leggings=Calças de Cristal
-Nether Boots=Botas de Nether
-Nether Chestplate=Peitoral de Nether
-Nether Helmet=Capacete de Nether
-Nether Leggings=Calças de Nether
-Diamond Boots=Botas de Diamante
-Diamond Chestplate=Peitoral de Diamante
-Diamond Helmet=Capacete de Diamante
-Diamond Leggings=Calças de Diamante
-Gold Boots=Botas de Ouro
-Gold Chestplate=Peitoral de Ouro
-Gold Helmet=Capacete de Ouro
-Gold Leggings=Calças de Ouro
-Mithril Boots=Botas de Mithril
-Mithril Chestplate=Peitoral de Mithril
-Mithril Helmet=Capacete de Mithril
-Mithril Leggings=Calças de Mithril
-Steel Boots=Botas de Aço
-Steel Chestplate=Peitoral de Aço
-Steel Helmet=Capacete de Aço
-Steel Leggings=Calças de Aço
-Wood Boots=Botas de Madeira
-Wood Chestplate=Peitoral de Madeira
-Wood Helmet=Capacete de Madeira
-Wood Leggings=Calças de Madeira
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador
-Fire=Fogo
-Heal=Saúde
-Level=Nível
 Radiation=Radiação
-Your @1 got destroyed!=@1 foi destruído(a)!
+Level=Nível
+Heal=Saúde
+Fire=Fogo
 Your @1 is almost broken!=
-[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados
-
-
-##### not used anymore #####
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante.
-Back=Voltar
-Armor=Armadura
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante.
-Armor stand top=Topo de estande de armadura
-Armor stand=Estande de armadura
-Armor Stand=Estande de Armadura
-Locked Armor stand=Estande de Armadura Trancada
-Armor Stand (owned by @1)=Estande de Armadura (pertente a @1)
-3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante.
-3d Armor=3d Armor
-Armor not initialized!=Armadura não inicializada!
-Admin Shield=Escudo de Administrador
-Wooden Shield=Escudo de Madeira
-Enhanced Wood Shield=Escudo de Madeira Melhorado
-Cactus Shield=Escudo de Cacto
-Enhanced Cactus Shield=Escudo de Cacto Melhorado
-Steel Shield=Escudo de Aço
-Bronze Shield=Escudo de Bronze
-Diamond Shield=Escudo de Diamante
-Gold Shield=Escudo de Ouro
-Mithril Shield=Escudo de Mithril
-Crystal Shield=Escudo de Cristal
-Nether Shield=Escudo de Nether
+Your @1 got destroyed!=@1 foi destruído(a)!

3d_armor/locale/3d_armor.pt_BR.tr

@@ -1,90 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1
-3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1
-3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1
-
-### armor.lua ###
-
-Admin Boots=Botas de Administrador
-Admin Chestplate=Peitoral de Administrador
-Admin Helmet=Capacete de Administrador
-Admin Leggings=Calças de Administrador
-Bronze Boots=Botas de Bronze
-Bronze Chestplate=Peitoral de Bronze
-Bronze Helmet=Capacete de Bronze
-Bronze Leggings=Calças de Bronze
-Cactus Boots=Botas de Madeira
-Cactus Chestplate=Peitoral de Cacto
-Cactus Helmet=Capacete de Cacto
-Cactus Leggings=Calças de Cacto
-Crystal Boots=Botas de Cristal
-Crystal Chestplate=Peitoral de Cristal
-Crystal Helmet=Capacete de Cristal
-Crystal Leggings=Calças de Cristal
-Nether Boots=Botas de Nether
-Nether Chestplate=Peitoral de Nether
-Nether Helmet=Capacete de Nether
-Nether Leggings=Calças de Nether
-Diamond Boots=Botas de Diamante
-Diamond Chestplate=Peitoral de Diamante
-Diamond Helmet=Capacete de Diamante
-Diamond Leggings=Calças de Diamante
-Gold Boots=Botas de Ouro
-Gold Chestplate=Peitoral de Ouro
-Gold Helmet=Capacete de Ouro
-Gold Leggings=Calças de Ouro
-Mithril Boots=Botas de Mithril
-Mithril Chestplate=Peitoral de Mithril
-Mithril Helmet=Capacete de Mithril
-Mithril Leggings=Calças de Mithril
-Steel Boots=Botas de Aço
-Steel Chestplate=Peitoral de Aço
-Steel Helmet=Capacete de Aço
-Steel Leggings=Calças de Aço
-Wood Boots=Botas de Madeira
-Wood Chestplate=Peitoral de Madeira
-Wood Helmet=Capacete de Madeira
-Wood Leggings=Calças de Madeira
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador
-Fire=Fogo
-Heal=Saúde
-Level=Nível
 Radiation=Radiação
-Your @1 got destroyed!=@1 foi destruído(a)!
+Level=Nível
+Heal=Saúde
+Fire=Fogo
 Your @1 is almost broken!=
-[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados
-
-
-##### not used anymore #####
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante.
-Back=Voltar
-Armor=Armadura
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante.
-Armor stand top=Topo de estande de armadura
-Armor stand=Estande de armadura
-Armor Stand=Estande de Armadura
-Locked Armor stand=Estande de Armadura Trancada
-Armor Stand (owned by @1)=Estande de Armadura (pertente a @1)
-3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante.
-3d Armor=3d Armor
-Armor not initialized!=Armadura não inicializada!
-Admin Shield=Escudo de Administrador
-Wooden Shield=Escudo de Madeira
-Enhanced Wood Shield=Escudo de Madeira Melhorado
-Cactus Shield=Escudo de Cacto
-Enhanced Cactus Shield=Escudo de Cacto Melhorado
-Steel Shield=Escudo de Aço
-Bronze Shield=Escudo de Bronze
-Diamond Shield=Escudo de Diamante
-Gold Shield=Escudo de Ouro
-Mithril Shield=Escudo de Mithril
-Crystal Shield=Escudo de Cristal
-Nether Shield=Escudo de Nether
+Your @1 got destroyed!=@1 foi destruído(a)!

3d_armor/locale/3d_armor.ru.tr

@@ -1,85 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=3d_armor: Отдельный инвентарь брони является nil @1
-3d_armor: Player name is nil @1=3d_armor: Имя игрока является nil @1
-3d_armor: Player reference is nil @1=3d_armor: Ссылка игрока является nil @1
-
-### armor.lua ###
-
-Admin Boots=ботинки админа
-Admin Chestplate=бронежилет админа
-Admin Helmet=шлем админа
-Admin Leggings=гамаши админа
-Bronze Boots=бронзовые ботинки
-Bronze Chestplate=бронзовый бронежилет
-Bronze Helmet=бронзовый шлем
-Bronze Leggings=бронзовые гамаши
-Cactus Boots=кактусовые ботинки
-Cactus Chestplate=кактусовый бронежилет
-Cactus Helmet=кактусовый шлем
-Cactus Leggings=кактусовые гамаши
-Crystal Boots=кристалловые ботинки
-Crystal Chestplate=кристалловый бронежилет
-Crystal Helmet=кристалловый шлем
-Crystal Leggings=кристалловые гамаши
-Diamond Boots=алмазные ботинки
-Diamond Chestplate=алмазный бронежилет
-Diamond Helmet=алмазный шлем
-Diamond Leggings=алмазные гамаши
-Gold Boots=золотые ботинки
-Gold Chestplate=золотой бронежилет
-Gold Helmet=золотой шлем
-Gold Leggings=золотые гамаши
-Mithril Boots=мифриловые ботинки
-Mithril Chestplate=мифриловый бронежилет
-Mithril Helmet=мифриловый шлем
-Mithril Leggings=мифриловые гамаши
-Steel Boots=стальные ботинки
-Steel Chestplate=стальной бронежилет
-Steel Helmet=стальной шлем
-Steel Leggings=стальные гамаши
-Wood Boots=деревянные ботинки
-Wood Chestplate=деревянный бронежилет
-Wood Helmet=деревянный шлем
-Wood Leggings=деревянные гамаши
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=3d_armor: не смог подготовить игрока
-Fire=огонь
-Heal=исцеление
-Level=уровень
-Radiation=излучение
-Your @1 got destroyed!=твой(и) @1 был(и) разрушен(ы)!
-Your @1 is almost broken!=
-[3d_armor] Fire Nodes disabled=[3d_armor] блоки огня отключены
-
-
-##### not used anymore #####
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip: мод загружен но не используется.
-Back=назад
-Armor=бронь
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: мод загружен но не используется.
-Armor stand top=стойка для брони (верх)
-Armor stand=стойка для брони
-Armor Stand=стойка для брони
-Locked Armor stand=защищенная стойка для брони
-Armor Stand (owned by @1)=стойка для брони (принадлежит @1)
-3d_armor_ui: Mod loaded but unused.=3d_armor_ui: мод загружен но не используется.
-3d Armor=3D бронь
-Armor not initialized!=бронь не подготовлена!
-Admin Shield=щит админа
-Wooden Shield=деревянный щит
-Enhanced Wood Shield=улучшенный деревянный щит
-Cactus Shield=кактусный щит
-Enhanced Cactus Shield=улучшенный кактусный щит
-Steel Shield=стальной щит
-Bronze Shield=бронзовый щит
-Diamond Shield=алмазный щит
-Gold Shield=золотой щит
-Mithril Shield=мифриловый щит
-Crystal Shield=кристалловый щит
+Radiation=Излучение
+Level=Уровень
+Heal=Исцеление
+Fire=Пламя
+Your @1 is almost broken!=Ваш предмет «@1» почти сломан!
+Your @1 got destroyed!=Ваш предмет «@1» был уничтожен!

3d_armor/locale/3d_armor.sv.tr

@@ -0,0 +1,7 @@
+# textdomain: 3d_armor
+Radiation=Strålning
+Level=Nivå
+Heal=Läkning
+Fire=Eld
+Your @1 is almost broken!=Din @1 är nästan förstörd!
+Your @1 got destroyed!=Din @1 blev förstörd!

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 був(ли) зламаний(і)!

3d_armor/locale/template.txt

@@ -1,62 +1,7 @@
 # textdomain: 3d_armor
-
-
-### api.lua ###
-
-3d_armor: Detached armor inventory is nil @1=
-3d_armor: Player name is nil @1=
-3d_armor: Player reference is nil @1=
-
-### armor.lua ###
-
-Admin Boots=
-Admin Chestplate=
-Admin Helmet=
-Admin Leggings=
-Bronze Boots=
-Bronze Chestplate=
-Bronze Helmet=
-Bronze Leggings=
-Cactus Boots=
-Cactus Chestplate=
-Cactus Helmet=
-Cactus Leggings=
-Crystal Boots=
-Crystal Chestplate=
-Crystal Helmet=
-Crystal Leggings=
-Nether Boots=
-Nether Chestplate=
-Nether Helmet=
-Nether Leggings=
-Diamond Boots=
-Diamond Chestplate=
-Diamond Helmet=
-Diamond Leggings=
-Gold Boots=
-Gold Chestplate=
-Gold Helmet=
-Gold Leggings=
-Mithril Boots=
-Mithril Chestplate=
-Mithril Helmet=
-Mithril Leggings=
-Steel Boots=
-Steel Chestplate=
-Steel Helmet=
-Steel Leggings=
-Wood Boots=
-Wood Chestplate=
-Wood Helmet=
-Wood Leggings=
-
-### init.lua ###
-
-3d_armor: Failed to initialize player=
-Fire=
-Heal=
-Level=
 Radiation=
-Your @1 got destroyed!=
+Level=
+Heal=
+Fire=
 Your @1 is almost broken!=
-[3d_armor] Fire Nodes disabled=
+Your @1 got destroyed!=

3d_armor/mod.conf

@@ -1,4 +1,5 @@
 name = 3d_armor
 depends = default, player_api
-optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores, nether
+optional_depends = player_monoids, armor_monoid, pova, moreores
 description = Adds craftable armor that is visible to other players.
+min_minetest_version = 5.0

3d_armor/textures/preview_index.txt

@@ -1,49 +0,0 @@
-3d_armor/textures/3d_armor_helmet_wood.png:head
-3d_armor/textures/3d_armor_chestplate_wood.png:torso
-3d_armor/textures/3d_armor_leggings_wood.png:legs
-3d_armor/textures/3d_armor_boots_wood.png:feet
-
-3d_armor/textures/3d_armor_helmet_cactus.png:head
-3d_armor/textures/3d_armor_chestplate_cactus.png:torso
-3d_armor/textures/3d_armor_leggings_cactus.png:legs
-3d_armor/textures/3d_armor_boots_cactus.png:feet
-
-3d_armor/textures/3d_armor_helmet_steel.png:head
-3d_armor/textures/3d_armor_chestplate_steel.png:torso
-3d_armor/textures/3d_armor_leggings_steel.png:legs
-3d_armor/textures/3d_armor_boots_steel.png:feet
-
-3d_armor/textures/3d_armor_helmet_bronze.png:head
-3d_armor/textures/3d_armor_chestplate_bronze.png:torso
-3d_armor/textures/3d_armor_leggings_bronze.png:legs
-3d_armor/textures/3d_armor_boots_bronze.png:feet
-
-3d_armor/textures/3d_armor_helmet_gold.png:head
-3d_armor/textures/3d_armor_chestplate_gold.png:torso
-3d_armor/textures/3d_armor_leggings_gold.png:legs
-3d_armor/textures/3d_armor_boots_gold.png:feet
-
-3d_armor/textures/3d_armor_helmet_diamond.png:head
-3d_armor/textures/3d_armor_chestplate_diamond.png:torso
-3d_armor/textures/3d_armor_leggings_diamond.png:legs
-3d_armor/textures/3d_armor_boots_diamond.png:feet
-
-3d_armor/textures/3d_armor_helmet_mithril.png:head
-3d_armor/textures/3d_armor_chestplate_mithril.png:torso
-3d_armor/textures/3d_armor_leggings_mithril.png:legs
-3d_armor/textures/3d_armor_boots_mithril.png:feet
-
-3d_armor/textures/3d_armor_helmet_crystal.png:head
-3d_armor/textures/3d_armor_chestplate_crystal.png:torso
-3d_armor/textures/3d_armor_leggings_crystal.png:legs
-3d_armor/textures/3d_armor_boots_crystal.png:feet
-
-3d_armor/textures/3d_armor_helmet_nether.png:head
-3d_armor/textures/3d_armor_chestplate_nether.png:torso
-3d_armor/textures/3d_armor_leggings_nether.png:legs
-3d_armor/textures/3d_armor_boots_nether.png:feet
-
-3d_armor/textures/3d_armor_helmet_admin.png:head
-3d_armor/textures/3d_armor_chestplate_admin.png:torso
-3d_armor/textures/3d_armor_leggings_admin.png:legs
-3d_armor/textures/3d_armor_boots_admin.png:feet

3d_armor_ip/LICENSE.txt

@@ -1,18 +0,0 @@
-[mod] 3d Armor integration to inventory plus [3d_armor_ip]
-==========================================================
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

3d_armor_ip/depends.txt

@@ -1,2 +0,0 @@
-3d_armor
-inventory_plus?

3d_armor_ip/description.txt

@@ -1 +0,0 @@
-Adds 3d_armor page to the inventory plus.

3d_armor_ip/init.lua

@@ -3,7 +3,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
 local F = minetest.formspec_escape
 
 if not minetest.global_exists("inventory_plus") then
-	minetest.log("warning", S("3d_armor_ip: Mod loaded but unused."))
+	minetest.log("warning", "3d_armor_ip: Mod loaded but unused.")
 	return
 end
 

3d_armor_ip/locale/3d_armor_ip.de.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Zurück
+Armor=Rüstung

3d_armor_ip/locale/3d_armor_ip.eo.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Dorso
+Armor=Armaĵo

3d_armor_ip/locale/3d_armor_ip.fr.tr

@@ -1,8 +1,3 @@
 # textdomain: 3d_armor_ip
-
-
-### init.lua ###
-
-3d_armor_ip: Mod loaded but unused.=3d_armor_ip : Mod chargé mais inutilisé.
-Armor=Armure
 Back=Retour
+Armor=Armure

3d_armor_ip/locale/3d_armor_ip.pt_BR.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Voltar
+Armor=Armadura

3d_armor_ip/locale/3d_armor_ip.ru.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Назад
+Armor=Броня

3d_armor_ip/locale/3d_armor_ip.sv.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Tillbaka
+Armor=Rustning

3d_armor_ip/locale/3d_armor_ip.uk.tr

@@ -0,0 +1,3 @@
+# textdomain: 3d_armor_ip
+Back=Назад
+Armor=Броня

3d_armor_ip/locale/template.txt

@@ -1,8 +1,3 @@
 # textdomain: 3d_armor_ip
-
-
-### init.lua ###
-
-3d_armor_ip: Mod loaded but unused.=
-Armor=
 Back=
+Armor=

3d_armor_sfinv/LICENSE.txt

@@ -1,18 +0,0 @@
-[mod] 3d Armor sfinv integration [3d_armor_sfinv]
-=================================================
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

3d_armor_sfinv/depends.txt

@@ -1,2 +0,0 @@
-3d_armor
-sfinv?

3d_armor_sfinv/description.txt

@@ -1 +0,0 @@
-Adds 3d_armor page to the sfinv inventory.

3d_armor_sfinv/init.lua

@@ -2,7 +2,7 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
 if not minetest.global_exists("sfinv") then
-	minetest.log("warning", S("3d_armor_sfinv: Mod loaded but unused."))
+	minetest.log("warning", "3d_armor_sfinv: Mod loaded but unused.")
 	return
 end
 
@@ -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)

3d_armor_sfinv/locale/3d_armor_sfinv.de.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Rüstung

3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Armaĵoj

3d_armor_sfinv/locale/3d_armor_sfinv.es.tr

@@ -1,7 +1,2 @@
 # textdomain: 3d_armor_sfinv
-
-
-### init.lua ###
-
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv : Mod cargado pero no activado.
 Armor=Armadura

3d_armor_sfinv/locale/3d_armor_sfinv.fr.tr

@@ -1,7 +1,2 @@
 # textdomain: 3d_armor_sfinv
-
-
-### init.lua ###
-
-3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv : Mod chargé mais inutilisé.
 Armor=Armure

3d_armor_sfinv/locale/3d_armor_sfinv.pt_BR.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Armadura

3d_armor_sfinv/locale/3d_armor_sfinv.ru.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Броня

3d_armor_sfinv/locale/3d_armor_sfinv.sv.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Rustning

3d_armor_sfinv/locale/3d_armor_sfinv.uk.tr

@@ -0,0 +1,2 @@
+# textdomain: 3d_armor_sfinv
+Armor=Броня

3d_armor_sfinv/locale/template.txt

@@ -1,7 +1,2 @@
 # textdomain: 3d_armor_sfinv
-
-
-### init.lua ###
-
-3d_armor_sfinv: Mod loaded but unused.=
 Armor=

3d_armor_stand/LICENSE.txt

@@ -1,43 +0,0 @@
-[mod] 3d Armor Stand [3d_armor_stand]
-=====================================
-
-License Source Code
--------------------
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Lecense Models
---------------
-
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
-
-UV model mapping by tobyplowy(aka toby109tt)
-
-License Textures
-----------------
-
-3d_armor_stand.png
-3d_armor_stand_locked.png
-
-Copyright (C) 2017-2019 tobyplowy - CC BY-SA 3.0
-
-3d_armor_stand_feet.png
-3d_armor_stand_head.png
-3d_armor_stand_legs.png
-3d_armor_stand_torso.png
-
-Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0

3d_armor_stand/depends.txt

@@ -1,2 +0,0 @@
-3d_armor
-

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()
@@ -134,7 +134,7 @@ local function remove_hidden_node(pos)
 end
 
 minetest.register_node("3d_armor_stand:top", {
-	description = S("Armor stand top"),
+	description = S("Armor Stand Top"),
 	paramtype = "light",
 	drawtype = "plantlike",
 	sunlight_propagates = true,
@@ -144,12 +144,13 @@ 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", {
-	description = S("Armor stand"),
+	description = S("Armor Stand"),
 	drawtype = "mesh",
 	mesh = "3d_armor_stand.obj",
 	tiles = {"3d_armor_stand.png"},
@@ -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)
@@ -218,7 +220,7 @@ minetest.register_node("3d_armor_stand:armor_stand", {
 })
 
 minetest.register_node("3d_armor_stand:locked_armor_stand", {
-	description = S("Locked Armor stand"),
+	description = S("Locked Armor Stand"),
 	drawtype = "mesh",
 	mesh = "3d_armor_stand.obj",
 	tiles = {"3d_armor_stand_locked.png"},
@@ -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)
@@ -299,27 +302,107 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
 	end,
 })
 
+minetest.register_node("3d_armor_stand:shared_armor_stand", {
+	description = S("Shared Armor Stand"),
+	drawtype = "mesh",
+	mesh = "3d_armor_stand.obj",
+	tiles = {"3d_armor_stand_shared.png"},
+	use_texture_alpha = "clip",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.25, -0.4375, -0.25, 0.25, 1.4, 0.25},
+			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
+		},
+	},
+	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)
+		meta:set_string("formspec", armor_stand_formspec)
+		meta:set_string("infotext", S("Shared Armor Stand"))
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			inv:set_size("armor_"..element, 1)
+		end
+	end,
+	can_dig = function(pos, player)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			if not inv:is_empty("armor_"..element) then
+				return false
+			end
+		end
+		return true
+	end,
+	after_place_node = function(pos, placer)
+		minetest.add_entity(pos, "3d_armor_stand:armor_entity")
+		local meta = minetest.get_meta(pos)
+		meta:set_string("infotext", S("Shared Armor Stand"))
+		add_hidden_node(pos, placer)
+	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		if not minetest.is_player(player) or minetest.is_protected(pos, player:get_player_name()) then
+			return 0
+		end
+		local def = stack:get_definition() or {}
+		local groups = def.groups or {}
+		if groups[listname] then
+			return 1
+		end
+		return 0
+	end,
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		if not minetest.is_player(player) or minetest.is_protected(pos, player:get_player_name()) then
+			return 0
+		end
+		return stack:get_count()
+	end,
+	allow_metadata_inventory_move = function(pos)
+		return 0
+	end,
+	on_metadata_inventory_put = function(pos)
+		update_entity(pos)
+	end,
+	on_metadata_inventory_take = function(pos)
+		update_entity(pos)
+	end,
+	after_destruct = function(pos)
+		update_entity(pos)
+		remove_hidden_node(pos)
+	end,
+	on_blast = function(pos)
+		-- Not affected by TNT
+	end,
+})
+
 minetest.register_entity("3d_armor_stand:armor_entity", {
-	physical = true,
-	visual = "mesh",
-	mesh = "3d_armor_entity.obj",
-	visual_size = {x=1, y=1},
-	collisionbox = {0,0,0,0,0,0},
-	textures = {"3d_armor_trans.png"},
-	pos = nil,
-	timer = 0,
+	initial_properties = {
+		physical = true,
+		visual = "mesh",
+		mesh = "3d_armor_entity.obj",
+		visual_size = {x=1, y=1},
+		collisionbox = {0,0,0,0,0,0},
+		textures = {"blank.png"},
+	},
+	_pos = nil,
 	on_activate = function(self)
 		local pos = self.object:get_pos()
 		if pos then
-			self.pos = vector.round(pos)
+			self._pos = vector.round(pos)
 			update_entity(pos)
 		end
 	end,
 	on_blast = function(self, damage)
 		local drops = {}
-		local node = minetest.get_node(self.pos)
+		local node = minetest.get_node(self._pos)
 		if node.name == "3d_armor_stand:armor_stand" then
-			drop_armor(self.pos)
+			drop_armor(self._pos)
 			self.object:remove()
 		end
 		return false, false, drops
@@ -327,7 +410,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 })
 
 minetest.register_abm({
-	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:armor_stand"},
+	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:shared_armor_stand", "3d_armor_stand:armor_stand"},
 	interval = 15,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -353,3 +436,10 @@ minetest.register_craft({
 		{"3d_armor_stand:armor_stand", "default:steel_ingot"},
 	}
 })
+
+minetest.register_craft({
+	output = "3d_armor_stand:shared_armor_stand",
+	recipe = {
+		{"3d_armor_stand:armor_stand", "default:copper_ingot"},
+	}
+})

3d_armor_stand/locale/3d_armor_stand.de.tr

@@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Rüstungsständeroberseite
+Armor Stand=Rüstungsständer
+Locked Armor Stand=Abgeschlossener Rüstungsständer
+Armor Stand (owned by @1)=Rüstungsständer (Eigentum von @1)

3d_armor_stand/locale/3d_armor_stand.eo.tr

@@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+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)

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)

3d_armor_stand/locale/3d_armor_stand.fr.tr

@@ -1,10 +1,5 @@
 # textdomain: 3d_armor_stand
-
-
-### init.lua ###
-
+Armor Stand Top=Haut de support d'armure
 Armor Stand=Support d'armure
+Locked Armor Stand=Support d'armure verrouillé
 Armor Stand (owned by @1)=Support d'armure (propriété de @1)
-Armor stand=Support d'armure
-Armor stand top=Haut de support d'armure
-Locked Armor stand=Support d'armure verrouillé

3d_armor_stand/locale/3d_armor_stand.pt_BR.tr

@@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Topo do suporte de armadura
+Armor Stand=Suporte de Armadura
+Locked Armor Stand=Suporte de armadura trancado
+Armor Stand (owned by @1)=Suporte de Armadura (dono: @1)

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)

3d_armor_stand/locale/3d_armor_stand.sv.tr

@@ -0,0 +1,5 @@
+# textdomain: 3d_armor_stand
+Armor Stand Top=Rustningställstopp
+Armor Stand=Rustningställ
+Locked Armor Stand=Låst rustningställ
+Armor Stand (owned by @1)=Rustningställ (ägd av @1)

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)

3d_armor_stand/locale/template.txt

@@ -1,10 +1,6 @@
 # textdomain: 3d_armor_stand
-
-
-### init.lua ###
-
+Armor Stand Top=
 Armor Stand=
+Locked Armor Stand=
+Shared Armor Stand=
 Armor Stand (owned by @1)=
-Armor stand=
-Armor stand top=
-Locked Armor stand=

3d_armor_ui/LICENSE.txt

@@ -1,18 +0,0 @@
-[mod] 3d Armor integration to unified inventory [3d_armor_ui]
-=============================================================
-
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

3d_armor_ui/depends.txt

@@ -1,2 +0,0 @@
-3d_armor
-unified_inventory?

3d_armor_ui/description.txt

@@ -1 +0,0 @@
-Adds 3d_armor page to the unified inventory.

3d_armor_ui/init.lua

@@ -23,7 +23,7 @@ end)
 unified_inventory.register_button("armor", {
 	type = "image",
 	image = "inventory_plus_armor.png",
-	tooltip = S("3d Armor")
+	tooltip = S("3D Armor")
 })
 
 unified_inventory.register_page("armor", {
@@ -33,9 +33,6 @@ unified_inventory.register_page("armor", {
 		local gridy = 0.6
 
 		local name = player:get_player_name()
-		if armor.def[name].init_time == 0 then
-			return {formspec="label[0,0;"..F(S("Armor not initialized!")).."]"}
-		end
 		local formspec = perplayer_formspec.standard_inv_bg..
 			perplayer_formspec.standard_inv..
 			ui.make_inv_img_grid(gridx, gridy, 2, 3)..

3d_armor_ui/locale/3d_armor_ui.de.tr

@@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=3D-Rüstung
+Armor not initialized!=Rüstung ist nicht initialisiert!
+Armor=Rüstung
+Level=Stufe
+Heal=Heilung
+Fire=Feuer
+Radiation=Strahlung

3d_armor_ui/locale/3d_armor_ui.eo.tr

@@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=3D Armaĵoj
+Armor not initialized!=Armaĵoj ne pretigitaj!
+Armor=Armaĵo
+Level=Nivelo
+Heal=Sanigi
+Fire=Fajro
+Radiation=Radiado

3d_armor_ui/locale/3d_armor_ui.fr.tr

@@ -1,12 +1,8 @@
 # textdomain: 3d_armor_ui
-
-
-### init.lua ###
-
-3d Armor=Armure 3d
-Armor=Armure
+3D Armor=Armure 3D
 Armor not initialized!=Armure non initialisée !
-Fire=Feu
-Heal=Soins
+Armor=Armure
 Level=Niveau
+Heal=Soins
+Fire=Feu
 Radiation=Radiation

3d_armor_ui/locale/3d_armor_ui.pt_BR.tr

@@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=3D Armor
+Armor not initialized!=Armadura não inicializada!
+Armor=Armadura
+Level=Nível
+Heal=Vida
+Fire=Fogo
+Radiation=Radiação

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=Излучение

3d_armor_ui/locale/3d_armor_ui.sv.tr

@@ -0,0 +1,8 @@
+# textdomain: 3d_armor_ui
+3D Armor=
+Armor not initialized!=Rustning har inte initialiserats
+Armor=Rustning
+Level=Nivå
+Heal=Läkning
+Fire=Eld
+Radiation=Strålning

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=Радіація

3d_armor_ui/locale/template.txt

@@ -1,12 +1,8 @@
 # textdomain: 3d_armor_ui
-
-
-### init.lua ###
-
-3d Armor=
-Armor=
+3D Armor=
 Armor not initialized!=
-Fire=
-Heal=
+Armor=
 Level=
+Heal=
+Fire=
 Radiation=

LICENSE.md

@@ -1,9 +1,9 @@
 3D Armor - Visible Player Armor
 ===============================
 
-License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
+License Source Code: Copyright (C) 2013-2023 Stuart Jones - LGPL v2.1
 
-Armor Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0
+Armor Textures: Copyright (C) 2017-2023 davidthecreator - CC-BY-SA 3.0
 
 Special credit to Jordach and MirceaKitsune for providing the default 3d character model.
 

README.md

@@ -1,5 +1,5 @@
-Modpack - 3d Armor [0.4.13]
-===========================
+Modpack - 3d Armor
+==================
 ![3d_armor screenshot](https://github.com/minetest-mods/3d_armor/blob/master/screenshot.png)
 
 
@@ -22,7 +22,7 @@ Modpack - 3d Armor [0.4.13]
 [mod] Visible Player Armor [3d_armor]
 -------------------------------------
 
-Minetest Version: 5.0.0
+Minetest Version: 5.0.0 and newer
 
 Game: minetest_game and many derivatives
 
@@ -49,7 +49,24 @@ and [simple_skins] by TenPlus1.
 Armor can be configured by adding a file called armor.conf in 3d_armor mod or world directory.
 see armor.conf.example for all available options.
 
-For mod installation instructions, please visit: http://wiki.minetest.com/wiki/Installing_Mods
+For **mod installation** instructions, please visit: http://wiki.minetest.com/wiki/Installing_Mods
+
+The specific "armors as modpack" refactorization allows anyone to enable/disable any armors they want as mods rather than obscure settings of the past. (See [#78](https://github.com/minetest-mods/3d_armor/commit/9444afd7222a71fc17d40c9793506812d715dcc3) for further explanation.)
+
+Currently, the modpack includes:
+
+- armor_admin
+- armor_bronze
+- armor_cactus
+- armor_crystal
+- armor_diamond
+- armor_gold
+- armor_mithril
+- armor_nether
+- armor_steel
+- armor_wood
+
+as separate armor mods intentionally. All these mods depend on 3d_armor.
 
 [API Reference](https://minetest-mods.github.io/3d_armor/reference/)
 

armor_admin/init.lua

@@ -0,0 +1,94 @@
+
+--- Registered armors.
+--
+--  @topic armor
+
+
+-- support for i18n
+local S = minetest.get_translator(minetest.get_current_modname())
+
+--- Admin Helmet
+--
+--  @helmet 3d_armor:helmet_admin
+--  @img 3d_armor_inv_helmet_admin.png
+--  @grp armor_head 1
+--  @grp armor_heal 100
+--  @grp armor_use 0
+--  @grp armor_water 1
+--  @grp not_in_creative_inventory 1
+--  @armorgrp fleshy 100
+armor:register_armor(":3d_armor:helmet_admin", {
+	description = S("Admin Helmet"),
+	inventory_image = "3d_armor_inv_helmet_admin.png",
+	armor_groups = {fleshy=100},
+	groups = {armor_head=1, armor_heal=100, armor_use=0, armor_water=1,
+			not_in_creative_inventory=1},
+	on_drop = function(itemstack, dropper, pos)
+		return
+	end,
+})
+
+--- Admin Chestplate
+--
+--  @chestplate 3d_armor:chestplate_admin
+--  @img 3d_armor_inv_chestplate_admin.png
+--  @grp armor_torso 1
+--  @grp armor_heal 100
+--  @grp armor_use 0
+--  @grp not_in_creative_inventory 1
+--  @armorgrp fleshy 100
+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, armor_water=1,
+			not_in_creative_inventory=1},
+	on_drop = function(itemstack, dropper, pos)
+		return
+	end,
+})
+
+--- Admin Leggings
+--
+--  @leggings 3d_armor:leggings_admin
+--  @img 3d_armor_inv_leggings_admin.png
+--  @grp armor_legs 1
+--  @grp armor_heal 100
+--  @grp armor_use 0
+--  @grp not_in_creative_inventory 1
+--  @armorgrp fleshy 100
+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, armor_water=1,
+			not_in_creative_inventory=1},
+	on_drop = function(itemstack, dropper, pos)
+		return
+	end,
+})
+
+--- Admin Boots
+--
+--  @boots 3d_armor:boots_admin
+--  @img 3d_armor_inv_boots_admin.png
+--  @grp armor_feet 1
+--  @grp armor_heal 100
+--  @grp armor_use 0
+--  @grp not_in_creative_inventory 1
+--  @armorgrp fleshy 100
+armor:register_armor(":3d_armor:boots_admin", {
+	description = S("Admin Boots"),
+	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,
+			armor_water=1, not_in_creative_inventory=1},
+	on_drop = function(itemstack, dropper, pos)
+		return
+	end,
+})
+
+minetest.register_alias("adminboots", "3d_armor:boots_admin")
+minetest.register_alias("adminhelmet", "3d_armor:helmet_admin")
+minetest.register_alias("adminchestplate", "3d_armor:chestplate_admin")
+minetest.register_alias("adminleggings", "3d_armor:leggings_admin")

armor_admin/locale/armor_admin.de.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Adminhelm
+Admin Chestplate=Adminbrustplatte
+Admin Leggings=Adminhose
+Admin Boots=Adminstiefel

armor_admin/locale/armor_admin.eo.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Administra Kasko
+Admin Chestplate=Administra Kiraso
+Admin Leggings=Administra Pantalono
+Admin Boots=Administraj Botoj

armor_admin/locale/armor_admin.es.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Casco de admin
+Admin Chestplate=Peto de admin
+Admin Leggings=Grebas de admin
+Admin Boots=Botas de admin

armor_admin/locale/armor_admin.fr.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Casque d'admin
+Admin Chestplate=Cuirasse d'admin
+Admin Leggings=Jambières d'admin
+Admin Boots=Bottes d'admin

armor_admin/locale/armor_admin.it.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Elmo dell'amministratrice/tore
+Admin Chestplate=Corazza dell'amministratrice/tore
+Admin Leggings=Gambali dell'amministratrice/tore
+Admin Boots=Stivali dell'amministratrice/tore

armor_admin/locale/armor_admin.ms.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Helmet Pentadbir
+Admin Chestplate=Perisai Dada Pentadbir
+Admin Leggings=Perisai Kaki Pentadbir
+Admin Boots=But Pentadbir

armor_admin/locale/armor_admin.pt.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=
+Admin Chestplate=
+Admin Leggings=
+Admin Boots=

armor_admin/locale/armor_admin.pt_BR.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Capacete de Administrador
+Admin Chestplate=Peitoral de Administrador
+Admin Leggings=Calças de Administrador
+Admin Boots=Botas de Administrador

armor_admin/locale/armor_admin.ru.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Шлем Админа
+Admin Chestplate=Нагрудник Админа
+Admin Leggings=Поножи Админа
+Admin Boots=Ботинки Админа

armor_admin/locale/armor_admin.sv.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Adminhjälm
+Admin Chestplate=Adminbröstplåt
+Admin Leggings=Adminbyxor
+Admin Boots=Adminstövlar

armor_admin/locale/armor_admin.uk.tr

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=Шолом адміна
+Admin Chestplate=Броня адміна
+Admin Leggings=Штани адміна
+Admin Boots=Взуття адміна

armor_admin/locale/template.txt

@@ -0,0 +1,5 @@
+# textdomain: armor_admin
+Admin Helmet=
+Admin Chestplate=
+Admin Leggings=
+Admin Boots=

armor_admin/mod.conf

@@ -0,0 +1,3 @@
+name = armor_admin
+depends = 3d_armor
+description = Adds admin armor.