Bugfix: invalid capture index with non-english player names, resolves #39

dtime glitches

.gitignore

@@ -4,4 +4,5 @@
 *bak*
 tags
 *.vim
+armor.conf
 

3d_armor/README.txt

@@ -1,7 +1,9 @@
 [mod] Visible Player Armor [3d_armor]
 =====================================
 
-depends: default, inventory_plus
+Depends: default
+
+Recommends: inventory_plus or unified_inventory (use only one)
 
 Adds craftable armor that is visible to other players. Each armor item worn contributes to
 a player's armor group level making them less vulnerable to weapons.
@@ -9,8 +11,14 @@ a player's armor group level making them less vulnerable to weapons.
 Armor takes damage when a player is hurt but also offers a percentage chance of healing.
 Overall level is boosted by 10% when wearing a full matching set.
 
-default settings: [minetest.conf]
+Fire protection added by TenPlus1 when using crystal armor if Ethereal mod active, level 1
+protects against torches, level 2 for crystal spike, level 3 for fire, level 5 for lava.
 
-# Set number of seconds between armor updates.
+Configuration
-3d_armor_update_time = 1
+-------------
+
+Armor can be configured by adding a file called armor.conf in 3d_armor mod and/or world directory.
+see armor.conf.example for all available options.
+
+Note: worldpath config settings override any settings made in the mod's directory.
 

3d_armor/admin.lua

@@ -0,0 +1,33 @@
+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("adminlegginss","3d_armor:leggings_admin")
+
+minetest.register_tool("3d_armor:helmet_admin", {
+	description = "Admin Helmet",
+	inventory_image = "3d_armor_inv_helmet_admin.png",
+	groups = {armor_head=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	wear = 0,
+})
+
+minetest.register_tool("3d_armor:chestplate_admin", {
+	description = "Admin Chestplate",
+	inventory_image = "3d_armor_inv_chestplate_admin.png",
+	groups = {armor_torso=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	wear = 0,
+})
+
+minetest.register_tool("3d_armor:leggings_admin", {
+	description = "Admin Leggings",
+	inventory_image = "3d_armor_inv_leggings_admin.png",
+	groups = {armor_legs=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	wear = 0,
+})
+
+minetest.register_tool("3d_armor:boots_admin", {
+	description = "Admin Boots",
+	inventory_image = "3d_armor_inv_boots_admin.png",
+	groups = {armor_feet=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	wear = 0,
+})
+

3d_armor/armor.conf.example

@@ -0,0 +1,56 @@
+-- Armor Configuration (defaults)
+
+-- You can remove any unwanted armor materials from this table.
+-- Note that existing armor that is removed will show up as an unknown item.
+ARMOR_MATERIALS = {
+	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",
+}
+
+-- Enable fire protection (defaults true if using ethereal mod)
+ARMOR_FIRE_PROTECT = false
+
+-- Fire protection nodes, (name, protection level, damage)
+ARMOR_FIRE_NODES = {
+	{"default:lava_source",		5,	4},
+	{"default:lava_flowing", 	5,	4},
+	{"fire:basic_flame",		3,	4},
+	{"ethereal:crystal_spike",	2,	1},
+	{"bakedclay:safe_fire",		2,	1},
+	{"default:torch",			1,	1},
+}
+
+-- 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
+
+-- 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
+

3d_armor/armor.lua

@@ -1,24 +1,132 @@
-local time = 0
+ARMOR_INIT_DELAY = 1
-local update_time = tonumber(minetest.setting_get("3d_armor_update_time"))
+ARMOR_INIT_TIMES = 1
-if not update_time then
+ARMOR_BONES_DELAY = 1
-	update_time = 1
+ARMOR_UPDATE_TIME = 1
-	minetest.setting_set("3d_armor_update_time", tostring(update_time))
+ARMOR_DROP = minetest.get_modpath("bones") ~= nil
+ARMOR_DESTROY = false
+ARMOR_LEVEL_MULTIPLIER = 1
+ARMOR_HEAL_MULTIPLIER = 1
+ARMOR_MATERIALS = {
+	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",
+}
+ARMOR_FIRE_PROTECT = minetest.get_modpath("ethereal") ~= nil
+ARMOR_FIRE_NODES = {
+	{"default:lava_source",     5, 4},
+	{"default:lava_flowing",    5, 4},
+	{"fire:basic_flame",        3, 4},
+	{"ethereal:crystal_spike",  2, 1},
+	{"bakedclay:safe_fire",     2, 1},
+	{"default:torch",           1, 1},
+}
+
+local skin_mod = nil
+local inv_mod = nil
+
+local modpath = minetest.get_modpath(ARMOR_MOD_NAME)
+local worldpath = minetest.get_worldpath()
+local input = io.open(modpath.."/armor.conf", "r")
+if input then
+	dofile(modpath.."/armor.conf")
+	input:close()
+	input = nil
 end
+input = io.open(worldpath.."/armor.conf", "r")
+if input then
+	dofile(worldpath.."/armor.conf")
+	input:close()
+	input = nil
+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
+
+-- override hot nodes so they do not hurt player anywhere but mod
+if ARMOR_FIRE_PROTECT == true then
+	for _, row in ipairs(ARMOR_FIRE_NODES) do
+		if minetest.registered_nodes[row[1]] then
+			minetest.override_item(row[1], {damage_per_second = 0})
+		end
+	end
+end
+
+local time = 0
 
 armor = {
 	player_hp = {},
 	elements = {"head", "torso", "legs", "feet"},
-	formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]"
+	physics = {"jump","speed","gravity"},
+	formspec = "size[8,8.5]image[2,0.75;2,4;armor_preview]"
 		.."list[current_player;main;0,4.5;8,4;]"
-		.."list[detached:player_name_armor;armor_head;3,0;1,1;]"
+		.."list[current_player;craft;4,1;3,3;]"
-		.."list[detached:player_name_armor;armor_torso;3,1;1,1;]"
+		.."list[current_player;craftpreview;7,2;1,1;]",
-		.."list[detached:player_name_armor;armor_legs;3,2;1,1;]"
-		.."list[detached:player_name_armor;armor_feet;3,3;1,1;]",
 	textures = {},
-	default_skin = "character.png",
+	default_skin = "character",
+	version = "0.4.4",
 }
 
--- armor.def - Added by BlockMen for HUD integration
+if minetest.get_modpath("inventory_plus") then
+	inv_mod = "inventory_plus"
+	armor.formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]"
+		.."image[2.5,0.75;2,4;armor_preview]"
+		.."label[5,1;Level: armor_level]"
+		.."label[5,1.5;Heal:  armor_heal]"
+		.."label[5,2;Fire:  armor_fire]"
+		.."list[current_player;main;0,4.5;8,4;]"
+	if minetest.get_modpath("crafting") then
+		inventory_plus.get_formspec = function(player, page)
+		end
+	end
+elseif minetest.get_modpath("unified_inventory") then
+	inv_mod = "unified_inventory"
+	unified_inventory.register_button("armor", {
+		type = "image",
+		image = "inventory_plus_armor.png",
+	})
+	unified_inventory.register_page("armor", {
+		get_formspec = function(player)
+			local name = player:get_player_name()
+			local formspec = "background[0.06,0.99;7.92,7.52;3d_armor_ui_form.png]"
+				.."label[0,0;Armor]"
+				.."list[detached:"..name.."_armor;armor;0,1;2,3;]"
+				.."image[2.5,0.75;2,4;"..armor.textures[name].preview.."]"
+				.."label[5,1;Level: "..armor.def[name].level.."]"
+				.."label[5,1.5;Heal:  "..armor.def[name].heal.."]"
+				.."label[5,2;Fire:  "..armor.def[name].fire.."]"
+			if minetest.setting_getbool("unified_inventory_lite") then
+				formspec = "background[0.06,0.49;7.92,7.52;3d_armor_ui_form.png]"
+					.."label[0,0;Armor]"
+					.."list[detached:"..name.."_armor;armor;0,0.5;2,3;]"
+					.."image[2.5,0.25;2,4;"..armor.textures[name].preview.."]"
+					.."label[5,0.5;Level: "..armor.def[name].level.."]"
+					.."label[5,1;Heal:  "..armor.def[name].heal.."]"
+					.."label[5,1.5;Fire:  "..armor.def[name].fire.."]"
+			end
+			return {formspec=formspec}
+		end,
+	})
+elseif minetest.get_modpath("inventory_enhanced") then
+	inv_mod = "inventory_enhanced"
+end
+
+if minetest.get_modpath("skins") then
+	skin_mod = "skins"
+elseif minetest.get_modpath("simple_skins") then
+	skin_mod = "simple_skins"
+elseif minetest.get_modpath("u_skins") then
+	skin_mod = "u_skins"
+elseif minetest.get_modpath("wardrobe") then
+	skin_mod = "wardrobe"
+end
 
 armor.def = {
 	state = 0,
@@ -40,37 +148,71 @@ armor.update_player_visuals = function(self, player)
 end
 
 armor.set_player_armor = function(self, player)
-	if not player then
+	local name, player_inv = armor:get_valid_player(player, "[set_player_armor]")
+	if not name then
 		return
 	end
-	local name = player:get_player_name()
-	local player_inv = player:get_inventory()
 	local armor_texture = "3d_armor_trans.png"
 	local armor_level = 0
+	local armor_heal = 0
+	local armor_fire = 0
 	local state = 0
 	local items = 0
-	local textures = {}
 	local elements = {}
-	for i, v in ipairs(self.elements) do
+	local textures = {}
-		local stack = player_inv:get_stack("armor_"..v, 1)
+	local physics_o = {speed=1,gravity=1,jump=1}
-		local level = stack:get_definition().groups["armor_"..v]
+	local material = {type=nil, count=1}
+	local preview = armor:get_preview(name) or "character_preview.png"
+	for _,v in ipairs(self.elements) do
+		elements[v] = false
+	end
+	for i=1, 6 do
+		local stack = player_inv:get_stack("armor", i)
 		local item = stack:get_name()
-		elements[i] = string.match(item, "%:.+_(.+)$")
+		if stack:get_count() == 1 then
-		if level then
+			local def = stack:get_definition()
-			table.insert(textures, item:gsub("%:", "_")..".png")
+			for k, v in pairs(elements) do
-			armor_level = armor_level + level
+				if v == false then
-			state = state + stack:get_wear()
+					local level = def.groups["armor_"..k]
-			items = items + 1
+					if level then
+						local texture = item:gsub("%:", "_")
+						table.insert(textures, texture..".png")
+						preview = preview.."^"..texture.."_preview.png"
+						armor_level = armor_level + level
+						state = state + stack:get_wear()
+						items = items + 1
+						local heal = def.groups["armor_heal"] or 0
+						armor_heal = armor_heal + heal
+						local fire = def.groups["armor_fire"] or 0
+						armor_fire = armor_fire + fire
+						for kk,vv in ipairs(self.physics) do
+							local o_value = def.groups["physics_"..vv]
+							if o_value then
+								physics_o[vv] = physics_o[vv] + o_value
+							end
+						end
+						local mat = string.match(item, "%:.+_(.+)$")
+						if material.type then
+							if material.type == mat then
+								material.count = material.count + 1
+							end
+						else
+							material.type = mat
+						end
+						elements[k] = true
+					end
+				end
+			end
 		end
 	end
 	if minetest.get_modpath("shields") then
 		armor_level = armor_level * 0.9
 	end
-	if elements[1] == elements[2] and
+	if material.type and material.count == #self.elements then
-		elements[1] == elements[3] and
-		elements[1] == elements[4] then
 		armor_level = armor_level * 1.1
 	end
+	armor_level = armor_level * ARMOR_LEVEL_MULTIPLIER
+	armor_heal = armor_heal * ARMOR_HEAL_MULTIPLIER
 	if #textures > 0 then
 		armor_texture = table.concat(textures, "^")
 	end
@@ -80,39 +222,59 @@ armor.set_player_armor = function(self, player)
 		armor_groups.fleshy = 100 - armor_level
 	end
 	player:set_armor_groups(armor_groups)
+	player:set_physics_override(physics_o)
 	self.textures[name].armor = armor_texture
+	self.textures[name].preview = preview
 	self.def[name].state = state
 	self.def[name].count = items
+	self.def[name].level = armor_level
+	self.def[name].heal = armor_heal
+	self.def[name].jump = physics_o.jump
+	self.def[name].speed = physics_o.speed
+	self.def[name].gravity = physics_o.gravity
+	self.def[name].fire = armor_fire
 	self:update_player_visuals(player)
 end
 
 armor.update_armor = function(self, player)
-	if not player then
+	local name, player_inv, armor_inv, pos = armor:get_valid_player(player, "[update_armor]")
+	if not name then
 		return
 	end
-	local name = player:get_player_name()
 	local hp = player:get_hp() or 0
-	if hp == 0 or hp == self.player_hp[name] then
+	if ARMOR_FIRE_PROTECT == true then
+		pos.y = pos.y + 1.4 -- head level
+		local node_head = minetest.get_node(pos).name
+		pos.y = pos.y - 1.2 -- feet level
+		local node_feet = minetest.get_node(pos).name
+		-- is player inside a hot node?
+		for _, row in ipairs(ARMOR_FIRE_NODES) do
+			-- check for fire protection, if not enough then get hurt
+			if row[1] == node_head or row[1] == node_feet then
+				if hp > 0 and armor.def[name].fire < row[2] then
+					hp = hp - row[3] * ARMOR_UPDATE_TIME
+					player:set_hp(hp)
+					break
+				end
+			end
+		end
+	end	
+	if hp <= 0 or hp == self.player_hp[name] then
 		return
 	end
 	if self.player_hp[name] > hp then
-		local player_inv = player:get_inventory()
-		local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
-		if not armor_inv then
-			return
-		end
 		local heal_max = 0
 		local state = 0
 		local items = 0
-		for _,v in ipairs(self.elements) do
+		for i=1, 6 do
-			local stack = armor_inv:get_stack("armor_"..v, 1)
+			local stack = player_inv:get_stack("armor", i)
 			if stack:get_count() > 0 then
 				local use = stack:get_definition().groups["armor_use"] or 0
 				local heal = stack:get_definition().groups["armor_heal"] or 0
 				local item = stack:get_name()
 				stack:add_wear(use)
-				armor_inv:set_stack("armor_"..v, 1, stack)
+				armor_inv:set_stack("armor", i, stack)
-				player_inv:set_stack("armor_"..v, 1, stack)
+				player_inv:set_stack("armor", i, stack)
 				state = state + stack:get_wear()
 				items = items + 1
 				if stack:get_count() == 0 then
@@ -121,12 +283,14 @@ armor.update_armor = function(self, player)
 						minetest.chat_send_player(name, "Your "..desc.." got destroyed!")
 					end
 					self:set_player_armor(player)
+					armor:update_inventory(player)
 				end
 				heal_max = heal_max + heal
 			end
 		end
 		self.def[name].state = state
 		self.def[name].count = items
+		heal_max = heal_max * ARMOR_HEAL_MULTIPLIER
 		if heal_max > math.random(100) then
 			player:set_hp(self.player_hp[name])
 			return
@@ -135,12 +299,96 @@ armor.update_armor = function(self, player)
 	self.player_hp[name] = hp
 end
 
+armor.get_player_skin = function(self, name)
+	local skin = nil
+	if skin_mod == "skins" or skin_mod == "simple_skins" then
+		skin = skins.skins[name]
+	elseif skin_mod == "u_skins" then
+		skin = u_skins.u_skins[name]
+	elseif skin_mod == "wardrobe" then
+		skin = string.gsub(wardrobe.playerSkins[name], "%.png$","")
+	end
+	return skin or armor.default_skin
+end
+
+armor.get_preview = function(self, name)
+	if skin_mod == "skins" then
+		return armor:get_player_skin(name).."_preview.png"
+	end
+end
+
+armor.get_armor_formspec = function(self, name)
+	if not armor.textures[name] then
+		minetest.log("error", "3d_armor: Player texture["..name.."] is nil [get_armor_formspec]")
+		return ""
+	end
+	if not armor.def[name] then
+		minetest.log("error", "3d_armor: Armor def["..name.."] is nil [get_armor_formspec]")
+		return ""
+	end
+	local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]"
+	formspec = formspec:gsub("armor_preview", armor.textures[name].preview)
+	formspec = formspec:gsub("armor_level", armor.def[name].level)
+	formspec = formspec:gsub("armor_heal", armor.def[name].heal)
+	formspec = formspec:gsub("armor_fire", armor.def[name].fire)
+	return formspec
+end
+
+armor.update_inventory = function(self, player)
+	local name = armor:get_valid_player(player, "[set_player_armor]")
+	if not name or inv_mod == "inventory_enhanced" then
+		return
+	end
+	if inv_mod == "unified_inventory" then
+		if unified_inventory.current_page[name] == "armor" then
+			unified_inventory.set_inventory_formspec(player, "armor")
+		end
+	else
+		local formspec = armor:get_armor_formspec(name)
+		if inv_mod == "inventory_plus" then
+			local page = player:get_inventory_formspec()
+			if page:find("detached:"..name.."_armor") then
+				inventory_plus.set_inventory_formspec(player, formspec)
+			end
+		else
+			player:set_inventory_formspec(formspec)
+		end
+	end
+end
+
+armor.get_valid_player = function(self, player, msg)
+	msg = msg or ""
+	if not player then
+		minetest.log("error", "3d_armor: Player reference is nil "..msg)
+		return
+	end
+	local name = player:get_player_name()
+	if not name then
+		minetest.log("error", "3d_armor: Player name is nil "..msg)
+		return
+	end
+	local pos = player:getpos()
+	local player_inv = player:get_inventory()
+	local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
+	if not pos then
+		minetest.log("error", "3d_armor: Player position is nil "..msg)
+		return
+	elseif not player_inv then
+		minetest.log("error", "3d_armor: Player inventory is nil "..msg)
+		return
+	elseif not armor_inv then
+		minetest.log("error", "3d_armor: Detached armor inventory is nil "..msg)
+		return
+	end
+	return name, player_inv, armor_inv, pos
+end
+
 -- Register Player Model
 
-default.player_register_model("3d_armor_character.x", {
+default.player_register_model("3d_armor_character.b3d", {
 	animation_speed = 30,
 	textures = {
-		armor.default_skin,
+		armor.default_skin..".png",
 		"3d_armor_trans.png",
 		"3d_armor_trans.png",
 	},
@@ -157,70 +405,114 @@ default.player_register_model("3d_armor_character.x", {
 -- Register Callbacks
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local name = player:get_player_name()
+	local name = armor:get_valid_player(player, "[on_player_receive_fields]")
-	if fields.armor then
+	if not name or inv_mod == "inventory_enhanced" then
-		local formspec = armor.formspec:gsub("player_name", name)
+		return
+	end
+	if inv_mod == "inventory_plus" and fields.armor then
+		local formspec = armor:get_armor_formspec(name)
 		inventory_plus.set_inventory_formspec(player, formspec)
 		return
 	end
 	for field, _ in pairs(fields) do
-		if string.find(field, "^skins_set_") then
+		if string.find(field, "skins_set") then
 			minetest.after(0, function(player)
-				armor.textures[name].skin = skins.skins[name]..".png"
+				local skin = armor:get_player_skin(name)
-				armor:update_player_visuals(player)
+				armor.textures[name].skin = skin..".png"
+				armor:set_player_armor(player)
 			end, player)
 		end
 	end
 end)
 
 minetest.register_on_joinplayer(function(player)
-	default.player_set_model(player, "3d_armor_character.x")
+	default.player_set_model(player, "3d_armor_character.b3d")
-	inventory_plus.register_button(player,"armor", "Armor")
-	local player_inv = player:get_inventory()
 	local name = player:get_player_name()
-	local armor_inv = minetest.create_detached_inventory(name.."_armor",{
+	local player_inv = player:get_inventory()
+	local armor_inv = minetest.create_detached_inventory(name.."_armor", {
 		on_put = function(inv, listname, index, stack, player)
 			player:get_inventory():set_stack(listname, index, stack)
 			armor:set_player_armor(player)
+			armor:update_inventory(player)
 		end,
 		on_take = function(inv, listname, index, stack, player)
 			player:get_inventory():set_stack(listname, index, nil)
 			armor:set_player_armor(player)
+			armor:update_inventory(player)
+		end,
+		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+			local plaver_inv = player:get_inventory()
+			local stack = inv:get_stack(to_list, to_index)
+			player_inv:set_stack(to_list, to_index, stack)
+			player_inv:set_stack(from_list, from_index, nil)
+			armor:set_player_armor(player)
+			armor:update_inventory(player)
 		end,
 		allow_put = function(inv, listname, index, stack, player)
-			if inv:is_empty(listname) then
+			return 1
-				return 1
-			end
-			return 0
 		end,
 		allow_take = function(inv, listname, index, stack, player)
 			return stack:get_count()
 		end,
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			return 0
+			return count
 		end,
 	})
-	for _,v in ipairs(armor.elements) do
+	if inv_mod == "inventory_plus" then
-		local list = "armor_"..v
+		inventory_plus.register_button(player,"armor", "Armor")
-		player_inv:set_size(list, 1)
-		armor_inv:set_size(list, 1)
-		armor_inv:set_stack(list, 1, player_inv:get_stack(list, 1))
 	end
+	armor_inv:set_size("armor", 6)
+	player_inv:set_size("armor", 6)
+	for i=1, 6 do
+		local stack = player_inv:get_stack("armor", i)
+		armor_inv:set_stack("armor", i, stack)
+	end	
+
+	-- Legacy support, import player's armor from old inventory format
+	for _,v in pairs(armor.elements) do
+		local list = "armor_"..v
+		armor_inv:add_item("armor", player_inv:get_stack(list, 1))
+		player_inv:set_stack(list, 1, nil)
+	end
+	-- TODO Remove this on the next version upate
+
 	armor.player_hp[name] = 0
 	armor.def[name] = {
 		state = 0,
 		count = 0,
+		level = 0,
+		heal = 0,
+		jump = 1,
+		speed = 1,
+		gravity = 1,
+		fire = 0,
 	}
 	armor.textures[name] = {
-		skin = armor.default_skin,
+		skin = armor.default_skin..".png",
 		armor = "3d_armor_trans.png",
 		wielditem = "3d_armor_trans.png",
+		preview = armor.default_skin.."_preview.png",
 	}
-	if minetest.get_modpath("skins") then
+	if skin_mod == "skins" then
 		local skin = skins.skins[name]
 		if skin and skins.get_type(skin) == skins.type.MODEL then
 			armor.textures[name].skin = skin..".png"
 		end
+	elseif skin_mod == "simple_skins" then
+		local skin = skins.skins[name]
+		if skin then
+		    armor.textures[name].skin = skin..".png"
+		end
+	elseif skin_mod == "u_skins" then
+		local skin = u_skins.u_skins[name]
+		if skin and u_skins.get_type(skin) == u_skins.type.MODEL then
+			armor.textures[name].skin = skin..".png"
+		end
+	elseif skin_mod == "wardrobe" then
+		local skin = wardrobe.playerSkins[name]
+		if skin then
+			armor.textures[name].skin = skin
+		end
 	end
 	if minetest.get_modpath("player_textures") then
 		local filename = minetest.get_modpath("player_textures").."/textures/player_"..name
@@ -230,14 +522,75 @@ minetest.register_on_joinplayer(function(player)
 			armor.textures[name].skin = "player_"..name..".png"
 		end
 	end
-	minetest.after(0, function(player)
+	for i=1, ARMOR_INIT_TIMES do
-		armor:set_player_armor(player)
+		minetest.after(ARMOR_INIT_DELAY * i, function(player)
-	end, player)
+			armor:set_player_armor(player)
+			if not inv_mod then
+				armor:update_inventory(player)
+			end
+		end, player)
+	end
 end)
 
+if ARMOR_DROP == true or ARMOR_DESTROY == true then
+	armor.drop_armor = function(pos, stack)
+		local obj = minetest.add_item(pos, stack)
+		if obj then
+			obj:setvelocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)})
+		end
+	end
+	minetest.register_on_dieplayer(function(player)
+		local name, player_inv, armor_inv, pos = armor:get_valid_player(player, "[on_dieplayer]")
+		if not name then
+			return
+		end
+		local drop = {}
+		for i=1, player_inv:get_size("armor") do
+			local stack = armor_inv:get_stack("armor", i)
+			if stack:get_count() > 0 then
+				table.insert(drop, stack)
+				armor_inv:set_stack("armor", i, nil)
+				player_inv:set_stack("armor", i, nil)
+			end
+		end
+		armor:set_player_armor(player)
+		if inv_mod == "unified_inventory" then
+			unified_inventory.set_inventory_formspec(player, "craft")
+		elseif inv_mod == "inventory_plus" then
+			local formspec = inventory_plus.get_formspec(player,"main")
+			inventory_plus.set_inventory_formspec(player, formspec)
+		else
+			armor:update_inventory(player)
+		end
+		if ARMOR_DESTROY == false then
+			minetest.after(ARMOR_BONES_DELAY, function()
+				local node = minetest.get_node(vector.round(pos))
+				if node then
+					if node.name == "bones:bones" then
+						local meta = minetest.get_meta(vector.round(pos))
+						local owner = meta:get_string("owner")
+						local inv = meta:get_inventory()
+						for _,stack in ipairs(drop) do
+							if name == owner and inv:room_for_item("main", stack) then
+								inv:add_item("main", stack)
+							else
+								armor.drop_armor(pos, stack)
+							end
+						end
+					end
+				else
+					for _,stack in ipairs(drop) do
+						armor.drop_armor(pos, stack)
+					end
+				end
+			end)
+		end
+	end)
+end
+
 minetest.register_globalstep(function(dtime)
 	time = time + dtime
-	if time > update_time then
+	if time > ARMOR_UPDATE_TIME then
 		for _,player in ipairs(minetest.get_connected_players()) do
 			armor:update_armor(player)
 		end

3d_armor/crafting_guide.txt

@@ -12,10 +12,13 @@ Helmets:
 +---+---+---+
 
 [3d_armor:helmet_wood] X = [default:wood]
+[3d_armor:helmet_cactus] X = [default:cactus]
 [3d_armor:helmet_steel] X = [default:steel_ingot]
 [3d_armor:helmet_bronze] X = [default:bronze_ingot]
 [3d_armor:helmet_diamond] X = [default:diamond]
+[3d_armor:helmet_gold] X = [default:gold_ingot]
 [3d_armor:helmet_mithril] X = [moreores:mithril_ingot] *
+[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] **
 
 Chestplates:
 
@@ -28,10 +31,13 @@ Chestplates:
 +---+---+---+
 
 [3d_armor:chestplate_wood] X = [default:wood]
+[3d_armor:chestplate_cactus] X = [default:cactus]
 [3d_armor:chestplate_steel] X = [default:steel_ingot]
 [3d_armor:chestplate_bronze] X = [default:bronze_ingot]
 [3d_armor:chestplate_diamond] X = [default:diamond]
+[3d_armor:chestplate_gold] X = [default:gold_ingot]
 [3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] *
+[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] **
 
 Leggings:
 
@@ -44,10 +50,13 @@ Leggings:
 +---+---+---+
 
 [3d_armor:leggings_wood] X = [default:wood]
+[3d_armor:leggings_cactus] X = [default:cactus]
 [3d_armor:leggings_steel] X = [default:steel_ingot]
 [3d_armor:leggings_bronze] X = [default:bronze_ingot]
 [3d_armor:leggings_diamond] X = [default:diamond]
+[3d_armor:leggings_gold] X = [default:gold_ingot]
 [3d_armor:leggings_mithril] X = [moreores:mithril_ingot] *
+[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] **
 
 Boots:
 
@@ -58,10 +67,13 @@ Boots:
 +---+---+---+
 
 [3d_armor:boots_wood] X = [default:wood]
+[3d_armor:boots_cactus] X = [default:cactus]
 [3d_armor:boots_steel] X = [default:steel_ingot]
 [3d_armor:boots_bronze] X = [default:bronze_ingot
 [3d_armor:boots_diamond] X = [default:diamond]
+[3d_armor:boots_gold] X = [default:gold_ingot]
 [3d_armor:boots_mithril] X = [moreores:mithril_ingot] *
+[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] **
 
-* Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
+ * Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
-
+** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal

3d_armor/depends.txt

@@ -1,3 +1,6 @@
 default
-inventory_plus
+inventory_plus?
-
+unified_inventory?
+fire?
+ethereal?
+bakedclay?

3d_armor/init.lua

@@ -1,154 +1,188 @@
-dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua")
+ARMOR_MOD_NAME = minetest.get_current_modname()
-local use_moreores = minetest.get_modpath("moreores")
+dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/armor.lua")
+dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/admin.lua")
 
--- Regisiter Head Armor
+if ARMOR_MATERIALS.wood then
+	minetest.register_tool("3d_armor:helmet_wood", {
+		description = "Wood Helmet",
+		inventory_image = "3d_armor_inv_helmet_wood.png",
+		groups = {armor_head=5, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_wood", {
+		description = "Wood Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_wood.png",
+		groups = {armor_torso=10, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_wood", {
+		description = "Wood Leggings",
+		inventory_image = "3d_armor_inv_leggings_wood.png",
+		groups = {armor_legs=5, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_wood", {
+		description = "Wood Boots",
+		inventory_image = "3d_armor_inv_boots_wood.png",
+		groups = {armor_feet=5, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+end
 
-minetest.register_tool("3d_armor:helmet_wood", {
+if ARMOR_MATERIALS.cactus then
-	description = "Wood Helmet",
+	minetest.register_tool("3d_armor:helmet_cactus", {
-	inventory_image = "3d_armor_inv_helmet_wood.png",
+		description = "Cactuc Helmet",
-	groups = {armor_head=5, armor_heal=0, armor_use=2000},
+		inventory_image = "3d_armor_inv_helmet_cactus.png",
-	wear = 0,
+		groups = {armor_head=5, armor_heal=0, armor_use=1000},
-})
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_cactus", {
+		description = "Cactus Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_cactus.png",
+		groups = {armor_torso=10, armor_heal=0, armor_use=1000},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_cactus", {
+		description = "Cactus Leggings",
+		inventory_image = "3d_armor_inv_leggings_cactus.png",
+		groups = {armor_legs=5, armor_heal=0, armor_use=1000},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_cactus", {
+		description = "Cactus Boots",
+		inventory_image = "3d_armor_inv_boots_cactus.png",
+		groups = {armor_feet=5, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+end
 
-minetest.register_tool("3d_armor:helmet_steel", {
+if ARMOR_MATERIALS.steel then
-	description = "Steel Helmet",
+	minetest.register_tool("3d_armor:helmet_steel", {
-	inventory_image = "3d_armor_inv_helmet_steel.png",
+		description = "Steel Helmet",
-	groups = {armor_head=10, armor_heal=0, armor_use=500},
+		inventory_image = "3d_armor_inv_helmet_steel.png",
-	wear = 0,
+		groups = {armor_head=10, armor_heal=0, armor_use=500},
-})
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_steel", {
+		description = "Steel Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_steel.png",
+		groups = {armor_torso=15, armor_heal=0, armor_use=500},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_steel", {
+		description = "Steel Leggings",
+		inventory_image = "3d_armor_inv_leggings_steel.png",
+		groups = {armor_legs=15, armor_heal=0, armor_use=500},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_steel", {
+		description = "Steel Boots",
+		inventory_image = "3d_armor_inv_boots_steel.png",
+		groups = {armor_feet=10, armor_heal=0, armor_use=500},
+		wear = 0,
+	})
+end
 
-minetest.register_tool("3d_armor:helmet_bronze", {
+if ARMOR_MATERIALS.bronze then
-	description = "Bronze Helmet",
+	minetest.register_tool("3d_armor:helmet_bronze", {
-	inventory_image = "3d_armor_inv_helmet_bronze.png",
+		description = "Bronze Helmet",
-	groups = {armor_head=10, armor_heal=6, armor_use=250},
+		inventory_image = "3d_armor_inv_helmet_bronze.png",
-	wear = 0,
+		groups = {armor_head=10, armor_heal=6, armor_use=250},
-})
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_bronze", {
+		description = "Bronze Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_bronze.png",
+		groups = {armor_torso=15, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_bronze", {
+		description = "Bronze Leggings",
+		inventory_image = "3d_armor_inv_leggings_bronze.png",
+		groups = {armor_legs=15, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_bronze", {
+		description = "Bronze Boots",
+		inventory_image = "3d_armor_inv_boots_bronze.png",
+		groups = {armor_feet=10, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+end
 
-minetest.register_tool("3d_armor:helmet_diamond", {
+if ARMOR_MATERIALS.diamond then
-	description = "Diamond Helmet",
+	minetest.register_tool("3d_armor:helmet_diamond", {
-	inventory_image = "3d_armor_inv_helmet_diamond.png",
+		description = "Diamond Helmet",
-	groups = {armor_head=15, armor_heal=12, armor_use=100},
+		inventory_image = "3d_armor_inv_helmet_diamond.png",
-	wear = 0,
+		groups = {armor_head=15, armor_heal=12, armor_use=100},
-})
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_diamond", {
+		description = "Diamond Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_diamond.png",
+		groups = {armor_torso=20, armor_heal=12, armor_use=100},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_diamond", {
+		description = "Diamond Leggings",
+		inventory_image = "3d_armor_inv_leggings_diamond.png",
+		groups = {armor_legs=20, armor_heal=12, armor_use=100},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_diamond", {
+		description = "Diamond Boots",
+		inventory_image = "3d_armor_inv_boots_diamond.png",
+		groups = {armor_feet=15, armor_heal=12, armor_use=100},
+		wear = 0,
+	})
+end
 
-if use_moreores then
+if ARMOR_MATERIALS.gold then
+	minetest.register_tool("3d_armor:helmet_gold", {
+		description = "Gold Helmet",
+		inventory_image = "3d_armor_inv_helmet_gold.png",
+		groups = {armor_head=10, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:chestplate_gold", {
+		description = "Gold Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_gold.png",
+		groups = {armor_torso=15, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_gold", {
+		description = "Gold Leggings",
+		inventory_image = "3d_armor_inv_leggings_gold.png",
+		groups = {armor_legs=15, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_gold", {
+		description = "Gold Boots",
+		inventory_image = "3d_armor_inv_boots_gold.png",
+		groups = {armor_feet=10, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+end
+
+if ARMOR_MATERIALS.mithril then
 	minetest.register_tool("3d_armor:helmet_mithril", {
 		description = "Mithril Helmet",
 		inventory_image = "3d_armor_inv_helmet_mithril.png",
 		groups = {armor_head=15, armor_heal=12, armor_use=50},
 		wear = 0,
 	})
-end
-
--- Regisiter Torso Armor
-
-minetest.register_tool("3d_armor:chestplate_wood", {
-	description = "Wood Chestplate",
-	inventory_image = "3d_armor_inv_chestplate_wood.png",
-	groups = {armor_torso=10, armor_heal=0, armor_use=2000},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:chestplate_steel", {
-	description = "Steel Chestplate",
-	inventory_image = "3d_armor_inv_chestplate_steel.png",
-	groups = {armor_torso=15, armor_heal=0, armor_use=500},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:chestplate_bronze", {
-	description = "Bronze Chestplate",
-	inventory_image = "3d_armor_inv_chestplate_bronze.png",
-	groups = {armor_torso=15, armor_heal=6, armor_use=250},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:chestplate_diamond", {
-	description = "Diamond Chestplate",
-	inventory_image = "3d_armor_inv_chestplate_diamond.png",
-	groups = {armor_torso=20, armor_heal=12, armor_use=100},
-	wear = 0,
-})
-
-if use_moreores then
 	minetest.register_tool("3d_armor:chestplate_mithril", {
 		description = "Mithril Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_mithril.png",
 		groups = {armor_torso=20, armor_heal=12, armor_use=50},
 		wear = 0,
 	})
-end
-
--- Regisiter Leg Armor
-
-minetest.register_tool("3d_armor:leggings_wood", {
-	description = "Wood Leggings",
-	inventory_image = "3d_armor_inv_leggings_wood.png",
-	groups = {armor_legs=5, armor_heal=0, armor_use=2000},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:leggings_steel", {
-	description = "Steel Leggings",
-	inventory_image = "3d_armor_inv_leggings_steel.png",
-	groups = {armor_legs=15, armor_heal=0, armor_use=500},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:leggings_bronze", {
-	description = "Bronze Leggings",
-	inventory_image = "3d_armor_inv_leggings_bronze.png",
-	groups = {armor_legs=15, armor_heal=6, armor_use=250},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:leggings_diamond", {
-	description = "Diamond Leggings",
-	inventory_image = "3d_armor_inv_leggings_diamond.png",
-	groups = {armor_legs=20, armor_heal=12, armor_use=100},
-	wear = 0,
-})
-
-if use_moreores then
 	minetest.register_tool("3d_armor:leggings_mithril", {
 		description = "Mithril Leggings",
 		inventory_image = "3d_armor_inv_leggings_mithril.png",
 		groups = {armor_legs=20, armor_heal=12, armor_use=50},
 		wear = 0,
 	})
-end
-
--- Regisiter Boots
-
-minetest.register_tool("3d_armor:boots_wood", {
-	description = "Wood Boots",
-	inventory_image = "3d_armor_inv_boots_wood.png",
-	groups = {armor_feet=5, armor_heal=0, armor_use=2000},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:boots_steel", {
-	description = "Steel Boots",
-	inventory_image = "3d_armor_inv_boots_steel.png",
-	groups = {armor_feet=10, armor_heal=0, armor_use=500},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:boots_bronze", {
-	description = "Bronze Boots",
-	inventory_image = "3d_armor_inv_boots_bronze.png",
-	groups = {armor_feet=10, armor_heal=6, armor_use=250},
-	wear = 0,
-})
-
-minetest.register_tool("3d_armor:boots_diamond", {
-	description = "Diamond Boots",
-	inventory_image = "3d_armor_inv_boots_diamond.png",
-	groups = {armor_feet=15, armor_heal=12, armor_use=100},
-	wear = 0,
-})
-
-if use_moreores then
 	minetest.register_tool("3d_armor:boots_mithril", {
 		description = "Mithril Boots",
 		inventory_image = "3d_armor_inv_boots_mithril.png",
@@ -157,20 +191,34 @@ if use_moreores then
 	})
 end
 
--- Register Craft Recipies
+if ARMOR_MATERIALS.crystal then
-
+	minetest.register_tool("3d_armor:helmet_crystal", {
-local craft_ingreds = {
+		description = "Crystal Helmet",
-	wood = "default:wood",
+		inventory_image = "3d_armor_inv_helmet_crystal.png",
-	steel = "default:steel_ingot",
+		groups = {armor_head=15, armor_heal=12, armor_use=50, armor_fire=1},
-	bronze = "default:bronze_ingot",
+		wear = 0,
-	diamond = "default:diamond",
+	})
-}
+	minetest.register_tool("3d_armor:chestplate_crystal", {
-
+		description = "Crystal Chestplate",
-if use_moreores then
+		inventory_image = "3d_armor_inv_chestplate_crystal.png",
-	craft_ingreds.mithril = "moreores:mithril_ingot"
+		groups = {armor_torso=20, armor_heal=12, armor_use=50, armor_fire=1},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:leggings_crystal", {
+		description = "Crystal Leggings",
+		inventory_image = "3d_armor_inv_leggings_crystal.png",
+		groups = {armor_legs=20, armor_heal=12, armor_use=50, armor_fire=1},
+		wear = 0,
+	})
+	minetest.register_tool("3d_armor:boots_crystal", {
+		description = "Crystal Boots",
+		inventory_image = "3d_armor_inv_boots_crystal.png",
+		groups = {armor_feet=15, armor_heal=12, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1},
+		wear = 0,
+	})
 end
 
-for k, v in pairs(craft_ingreds) do
+for k, v in pairs(ARMOR_MATERIALS) do
 	minetest.register_craft({
 		output = "3d_armor:helmet_"..k,
 		recipe = {