add nil check in armor.damage

.gitignore

@@ -4,6 +4,7 @@
 *bak*
 tags
 *.vim
+armor.conf
 
 ## Eclipse project files & directories
 .project

.ldoc/gendoc.sh

@@ -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

3d_armor/LICENSE.txt

@@ -0,0 +1,26 @@
+[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)
-|- - [wieldview_update_time](#how-often-player-wield-items-are-updated)     |||- - [Groups used by 3d_Armor](#groups-used-by-3d_armor)
+|- - [armor_init_times](#number-of-initialization-attempts)                 |||- - [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)
-|                                                                           |||- - - [armor:update_skin](#armor-update_skin)
+|- - [wieldview_update_time](#how-often-player-wield-items-are-updated)     |||- - - [armor:update_skin](#armor-update_skin)
 |-[Credits](#credits)                                                       |||- - [Callbacks](#Callbacks)
 |                                                                           |||- - - [Item callbacks](#item-callbacks)
 |                                                                           |||- - - [Global callbacks](#global-callbacks)
@@ -60,6 +60,11 @@ 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**
  

3d_armor/api.lua

@@ -162,6 +162,7 @@ armor = {
 
 armor.config = {
 	init_delay = 2,
+	init_times = 10,
 	bones_delay = 1,
 	update_time = 1,
 	drop = minetest.get_modpath("bones") ~= nil,
@@ -352,7 +353,7 @@ armor.update_player_visuals = function(self, player)
 	end
 	local name = player:get_player_name()
 	if self.textures[name] then
-		player_api.set_textures(player, {
+		default.player_set_textures(player, {
 			self.textures[name].skin,
 			self.textures[name].armor,
 			self.textures[name].wielditem,
@@ -373,7 +374,7 @@ armor.set_player_armor = function(self, player)
 	local state = 0
 	local count = 0
 	local preview = armor:get_preview(name)
-	local texture = "blank.png"
+	local texture = "3d_armor_trans.png"
 	local physics = {}
 	local attributes = {}
 	local levels = {}
@@ -415,7 +416,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"] = levels["radiation"] + def.groups["armor_radiation"]
+					levels["radiation"] = def.groups["armor_radiation"]
 				end
 			end
 			local item = stack:get_name()
@@ -719,14 +720,11 @@ 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 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
+				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)
 				end
 			end)
 			self:run_callbacks("on_unequip", player, i, stack)
@@ -811,6 +809,9 @@ 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

3d_armor/armor.conf

@@ -1,37 +0,0 @@
--- Armor Configuration (defaults)
-
--- Increase this if you get initialization glitches when a player first joins.
-ARMOR_INIT_DELAY = 3
-
--- Number of initialization attempts.
--- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
-ARMOR_INIT_TIMES = 3
-
--- Increase this if armor is not getting into bones due to server lag.
-ARMOR_BONES_DELAY = 3
-
--- How often player armor/wield items are updated.
-ARMOR_UPDATE_TIME = 1
-
--- Drop armor when a player dies.
--- Uses bones mod if present, otherwise items are dropped around the player.
-ARMOR_DROP = true
-
--- Pulverise armor when a player dies, overrides ARMOR_DROP.
-ARMOR_DESTROY = false
-
--- You can use this to increase or decrease overall armor effectiveness,
--- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half.
-ARMOR_LEVEL_MULTIPLIER = 1
-
--- You can use this to increase or decrease overall armor healing,
--- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
-ARMOR_HEAL_MULTIPLIER = 1
-
--- You can also use this file to execute arbitary lua code
--- eg: Dumb the armor down if using Simple Mobs
---if minetest.get_modpath("mobs") then
---	ARMOR_LEVEL_MULTIPLIER = 1
---	ARMOR_HEAL_MULTIPLIER = 0
---end
-

3d_armor/armor.conf.example

@@ -35,6 +35,10 @@ 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/init.lua

@@ -2,6 +2,7 @@ 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")
@@ -180,7 +181,11 @@ local function validate_armor_inventory(player)
 end
 
 local function init_player_armor(initplayer)
-	local name = assert(initplayer:get_player_name())
+	local name = initplayer:get_player_name()
+	local pos = initplayer:get_pos()
+	if not name or not pos then
+		return false
+	end
 	local armor_inv = minetest.create_detached_inventory(name.."_armor", {
 		on_put = function(inv, listname, index, stack, player)
 			validate_armor_inventory(player)
@@ -251,6 +256,7 @@ local function init_player_armor(initplayer)
 		end
 	end
 	armor.def[name] = {
+		init_time = minetest.get_gametime(),
 		level = 0,
 		state = 0,
 		count = 0,
@@ -268,8 +274,8 @@ local function init_player_armor(initplayer)
 	local skin = armor:get_player_skin(name)
 	armor.textures[name] = {
 		skin = skin,
-		armor = "blank.png",
-		wielditem = "blank.png",
+		armor = "3d_armor_trans.png",
+		wielditem = "3d_armor_trans.png",
 		preview = armor.default_skin.."_preview.png",
 	}
 	local texture_path = minetest.get_modpath("player_textures")
@@ -283,6 +289,7 @@ local function init_player_armor(initplayer)
 		end
 	end
 	armor:set_player_armor(initplayer)
+	return true
 end
 
 -- Armor Player Model
@@ -291,26 +298,21 @@ player_api.register_model("3d_armor_character.b3d", {
 	animation_speed = 30,
 	textures = {
 		armor.default_skin..".png",
-		"blank.png",
-		"blank.png",
+		"3d_armor_trans.png",
+		"3d_armor_trans.png",
 	},
 	animations = {
 		stand = {x=0, y=79},
-		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}},
+		lay = {x=162, y=166},
 		walk = {x=168, y=187},
 		mine = {x=189, y=198},
 		walk_mine = {x=200, y=219},
-		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}},
+		sit = {x=81, y=160},
 		-- 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)
@@ -327,8 +329,16 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 end)
 
 minetest.register_on_joinplayer(function(player)
-	player_api.set_model(player, "3d_armor_character.b3d")
-	init_player_armor(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)
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -337,6 +347,7 @@ 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
@@ -400,14 +411,10 @@ 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()
-		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
+		local hit_ip = hitter:is_player()
+		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+			return
+		elseif name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end
@@ -449,7 +456,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.5 then
+				if vel_y < 0 and vel_y < 3 then
 					vel_y = -(vel_y * 0.05)
 					player:add_velocity({x = 0, y = vel_y, z = 0})
 				end
@@ -462,6 +469,18 @@ minetest.register_globalstep(function(dtime)
 	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", "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
@@ -500,5 +519,3 @@ if armor.config.fire_protect == true then
 		return hp_change
 	end, true)
 end
-
-minetest.log("action", "[3d_armor] loaded.")

3d_armor/locale/3d_armor.de.tr

@@ -1,7 +1,7 @@
 # textdomain: 3d_armor
-Radiation=Strahlung
+Radiation=Strahlen
 Level=Stufe
-Heal=Heilung
+Heal=Heilen
 Fire=Feuer
-Your @1 is almost broken!=@1 ist fast kaputt!
-Your @1 got destroyed!=@1 wurde zerstört!
+Your @1 is almost broken!=Deine @1 ist fast kaputt!
+Your @1 got destroyed!=Deine @1 wurde zerstört!

3d_armor/locale/3d_armor.eo.tr

@@ -1,7 +1,7 @@
 # textdomain: 3d_armor
 Radiation=Radiado
 Level=Nivelo
-Heal=Blokŝanco
+Heal=Sanigi
 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.pl.tr

@@ -1,7 +0,0 @@
-# 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/mod.conf

@@ -2,4 +2,3 @@ name = 3d_armor
 depends = default, player_api
 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_ip/LICENSE.txt

@@ -0,0 +1,18 @@
+[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/locale/3d_armor_ip.de.tr

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

3d_armor_ip/locale/3d_armor_ip.eo.tr

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

3d_armor_sfinv/LICENSE.txt

@@ -0,0 +1,18 @@
+[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/locale/3d_armor_sfinv.de.tr

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

3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr

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

3d_armor_stand/LICENSE.txt

@@ -0,0 +1,43 @@
+[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/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 = "blank.png"
+		local texture = "3d_armor_trans.png"
 		local textures = {}
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -144,9 +144,8 @@ 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 = {"blank.png"},
+	tiles = {"3d_armor_trans.png"},
 })
 
 minetest.register_node("3d_armor_stand:armor_stand", {
@@ -166,7 +165,6 @@ 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)
@@ -236,7 +234,6 @@ 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)
@@ -302,107 +299,27 @@ 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", {
-	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,
+	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,
 	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
@@ -410,7 +327,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 })
 
 minetest.register_abm({
-	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:shared_armor_stand", "3d_armor_stand:armor_stand"},
+	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:armor_stand"},
 	interval = 15,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -436,12 +353,3 @@ 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"},
-	}
-})
-
-minetest.log("action", "[3d_armor_stand] loaded.")

3d_armor_stand/locale/3d_armor_stand.de.tr

@@ -1,5 +0,0 @@
-# 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

@@ -1,5 +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)
+Armor Stand Top=Kirasstando Supro
+Armor Stand=Kirasstando
+Locked Armor Stand=Ŝlosita Kirasstando
+Armor Stand (owned by @1)=Kirasstando (posedata de @1)

3d_armor_stand/locale/3d_armor_stand.es.tr

@@ -1,6 +0,0 @@
-# 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.ru.tr

@@ -1,5 +0,0 @@
-# textdomain: 3d_armor_stand
-Armor Stand Top=верх стойки для брони
-Armor Stand=стойка для брони
-Locked Armor Stand=стойка для брони с замком
-Armor Stand (owned by @1)=стойка для бони (владелец @1)

3d_armor_stand/locale/template.txt

@@ -2,5 +2,4 @@
 Armor Stand Top=
 Armor Stand=
 Locked Armor Stand=
-Shared Armor Stand=
 Armor Stand (owned by @1)=

3d_armor_ui/LICENSE.txt

@@ -0,0 +1,18 @@
+[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/init.lua

@@ -33,6 +33,9 @@ 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)..
@@ -43,9 +46,6 @@ unified_inventory.register_page("armor", {
 			"image[3.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
 			"label[6.0,"..(fy + 0.0)..";"..F(S("Level"))..": "..armor.def[name].level.."]"..
 			"label[6.0,"..(fy + 0.5)..";"..F(S("Heal"))..":  "..armor.def[name].heal.."]"..
-			"label[6.0,"..(fy + 2.0)..";"..F(S("Speed"))..":   "..armor.def[name].speed.."]"..
-			"label[6.0,"..(fy + 2.5)..";"..F(S("Jump"))..":    "..armor.def[name].jump.."]"..
-			"label[6.0,"..(fy + 3.0)..";"..F(S("Gravity"))..": "..armor.def[name].gravity.."]"..
 			"listring[current_player;main]"..
 			"listring[detached:"..name.."_armor;armor]"
 		if armor.config.fire_protect then
@@ -59,5 +59,3 @@ unified_inventory.register_page("armor", {
 		return {formspec=formspec}
 	end,
 })
-
-minetest.log("action", "[3d_armor_ui] loaded.")

3d_armor_ui/locale/3d_armor_ui.de.tr

@@ -1,8 +0,0 @@
-# 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

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

armor_admin/LICENSE.txt

@@ -0,0 +1,26 @@
+[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

armor_admin/init.lua

@@ -5,7 +5,7 @@
 
 
 -- support for i18n
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = armor.get_translator
 
 --- Admin Helmet
 --
@@ -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, armor_water=1,
+	groups = {armor_torso=1, armor_heal=100, armor_use=0,
 			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, armor_water=1,
+	groups = {armor_legs=1, armor_heal=100, armor_use=0,
 			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -81,8 +81,8 @@ 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},
+	groups = {armor_feet=1, armor_heal=100, armor_use=0,
+			not_in_creative_inventory=1},
 	on_drop = function(itemstack, dropper, pos)
 		return
 	end,
@@ -91,4 +91,4 @@ armor:register_armor(":3d_armor:boots_admin", {
 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")
+minetest.register_alias("adminleggings", "3d_armor:leggings_admin")

armor_admin/locale/armor_admin.eo.tr

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

armor_admin/locale/armor_admin.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_admin
 Admin Helmet=шлем админа
-Admin Chestplate=нагрудник админа
-Admin Leggings=штаны админа
+Admin Chestplate=бронежилет админа
+Admin Leggings=гамаши админа
 Admin Boots=ботинки админа

armor_bronze/LICENSE.txt

@@ -0,0 +1,26 @@
+[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

armor_bronze/init.lua

@@ -5,7 +5,8 @@
 
 
 -- support for i18n
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = armor.get_translator
+
 --- Bronze
 --
 --  Requires setting `armor_material_bronze`.
@@ -177,4 +178,4 @@ if armor.materials.bronze then
 			{m, "", m},
 		},
 	})
-end
+end

armor_bronze/locale/armor_bronze.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_bronze
 Bronze Helmet=Bronza Kasko
-Bronze Chestplate=Bronza Kiraso
+Bronze Chestplate=Bronza Brustkiraso
 Bronze Leggings=Bronza Pantalono
-Bronze Boots=Bronzaj Botoj
+Bronze Boots=Bronza Botoj

armor_bronze/locale/armor_bronze.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_bronze
 Bronze Helmet=бронзовый шлем
-Bronze Chestplate=бронзовый нагрудник
-Bronze Leggings=бронзовые штаны
+Bronze Chestplate=бронзовый бронежилет
+Bronze Leggings=бронзовые гамаши
 Bronze Boots=бронзовые ботинки

armor_cactus/LICENSE.txt

@@ -0,0 +1,26 @@
+[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

armor_cactus/init.lua

@@ -5,7 +5,7 @@
 
 
 -- support for i18n
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = armor.get_translator
 
 --- Cactus
 --
@@ -180,4 +180,4 @@ if armor.materials.cactus then
 			{m, "", m},
 		},
 	})
-end
+end

armor_cactus/locale/armor_cactus.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_cactus
 Cactus Helmet=Kakta Kasko
-Cactus Chestplate=Kakta Kiraso
+Cactus Chestplate=Kakta Brustkiraso
 Cactus Leggings=Kakta Pantalono
-Cactus Boots=Kaktaj Botoj
+Cactus Boots=Kakta Botoj

armor_cactus/locale/armor_cactus.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_cactus
 Cactus Helmet=кактусовый шлем
-Cactus Chestplate=кактусовый нагрудник
-Cactus Leggings=кактусовые штаны
+Cactus Chestplate=кактусовый бронежилет
+Cactus Leggings=кактусовые гамаши
 Cactus Boots=кактусовые ботинки

armor_crystal/LICENSE.txt

@@ -0,0 +1,26 @@
+[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

armor_crystal/init.lua

@@ -5,7 +5,8 @@
 
 
 -- support for i18n
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = armor.get_translator
+
 
 --- Crystal
 --
@@ -166,4 +167,4 @@ if armor.materials.crystal then
 			{m, "", m},
 		},
 	})
-end
+end

armor_crystal/locale/armor_crystal.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_crystal
 Crystal Helmet=Kristala Kasko
-Crystal Chestplate=Kristala Kiraso
+Crystal Chestplate=Kristala Brustkiraso
 Crystal Leggings=Kristala Pantalono
-Crystal Boots=Kristalaj Botoj
+Crystal Boots=Kristala Botoj

armor_crystal/locale/armor_crystal.ru.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_crystal
 Crystal Helmet=кристалловый шлем
-Crystal Chestplate=кристалловый нагрудник
-Crystal Leggings=кристалловые штаны
+Crystal Chestplate=кристалловый бронежилет
+Crystal Leggings=кристалловые гамаши
 Crystal Boots=кристалловые ботинки

armor_diamond/LICENSE.txt

@@ -0,0 +1,26 @@
+[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

armor_diamond/init.lua

@@ -5,7 +5,7 @@
 
 
 -- support for i18n
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = armor.get_translator
 
 --- Diamond
 --
@@ -163,4 +163,4 @@ if armor.materials.diamond then
 			{m, "", m},
 		},
 	})
-end
+end

armor_diamond/locale/armor_diamond.eo.tr

@@ -1,5 +1,5 @@
 # textdomain: armor_diamond
 Diamond Helmet=Diamanta Kasko
-Diamond Chestplate=Diamanta Kiraso
+Diamond Chestplate=Diamanta Brustkiraso
 Diamond Leggings=Diamanta Pantalono
-Diamond Boots=Diamantaj Botoj
+Diamond Boots=Diamanta Botoj