Merge branch 'master' into nalc-1.2

3d_armor/README.txt

@@ -32,11 +32,11 @@ armor_material_mithril = true
 armor_material_crystal = true
 
 -- Increase this if you get initialization glitches when a player first joins.
-armor_init_delay = 1
+armor_init_delay = 2
 
 -- Number of initialization attempts.
 -- Use in conjunction with armor_init_delay if initialization problems persist.
-armor_init_times = 1
+armor_init_times = 10
 
 -- Increase this if armor is not getting into bones due to server lag.
 armor_bones_delay = 1
@@ -111,7 +111,7 @@ armor:register_armor("mod_name:speed_boots", {
 	damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1},
 	reciprocate_damage = true,
 	on_destroy = function(player, index, stack)
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		if pos then
 			minetest.sound_play({
 				name = "mod_name_break_sound",

3d_armor/api.lua

@@ -74,7 +74,7 @@ armor = {
 		on_destroy = {},
 	},
 	migrate_old_inventory = true,
-	version = "0.4.12",
+	version = "0.4.13",
 }
 
 armor.config = {

3d_armor/init.lua

@@ -160,7 +160,7 @@ end
 
 local function init_player_armor(player)
 	local name = player:get_player_name()
-	local pos = player:getpos()
+	local pos = player:get_pos()
 	if not name or not pos then
 		return false
 	end
@@ -326,7 +326,7 @@ if armor.config.drop == true or armor.config.destroy == true then
 		end
 		armor:save_armor_inventory(player)
 		armor:set_player_armor(player)
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		if pos and armor.config.destroy == false then
 			minetest.after(armor.config.bones_delay, function()
 				local meta = nil
@@ -427,7 +427,7 @@ if armor.config.water_protect == true or armor.config.fire_protect == true then
 		end
 		for _,player in pairs(minetest.get_connected_players()) do
 			local name = player:get_player_name()
-			local pos = player:getpos()
+			local pos = player:get_pos()
 			local hp = player:get_hp()
 			if not name or not pos or not hp then
 				return

3d_armor_stand/init.lua

@@ -75,8 +75,11 @@ local function update_entity(pos)
 					local def = stack:get_definition() or {}
 					local groups = def.groups or {}
 					if groups["armor_"..element] then
-						local texture = def.texture or item:gsub("%:", "_")
-						table.insert(textures, texture..".png")
+						if def.texture then
+							table.insert(textures, def.texture)
+						else
+							table.insert(textures, item:gsub("%:", "_")..".png")
+						end
 					end
 				end
 			end
@@ -304,7 +307,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 	pos = nil,
 	timer = 0,
 	on_activate = function(self)
-		local pos = self.object:getpos()
+		local pos = self.object:get_pos()
 		if pos then
 			self.pos = vector.round(pos)
 			update_entity(pos)

README.md

@@ -1,4 +1,4 @@
-Modpack - 3d Armor [0.4.12]
+Modpack - 3d Armor [0.4.13]
 ===========================
 
 ### Table of Contents
@@ -17,7 +17,7 @@ Modpack - 3d Armor [0.4.12]
 [mod] Visible Player Armor [3d_armor]
 -------------------------------------
 
-Minetest Version: 0.4.16 - 0.4.17.1
+Minetest Version: 5.0.0
 
 Game: minetest_game and many derivatives
 

settingtypes.txt

@@ -0,0 +1,65 @@
+
+[3d_armor]
+
+armor_material_wood (Enable wood armor) bool true
+armor_material_cactus (Enable cactus armor) bool true
+armor_material_steel (Enable steel armor) bool true
+armor_material_bronze (Enable bronze armor) bool true
+armor_material_diamond (Enable diamond armor) bool true
+armor_material_gold (Enable gold armor) bool true
+armor_material_mithril (Enable mithril armor) bool true
+armor_material_crystal (Enable crystal armor) bool true
+
+# Increase this if you get initialization glitches when a player first joins.
+armor_init_delay (Initialization delay) int 2
+
+# Number of initialization attempts.
+# Use in conjunction with armor_init_delay if initialization problems persist.
+armor_init_times (Initialization attempts) int 10
+
+# Increase this if armor is not getting into bones due to server lag.
+armor_bones_delay (Delay for bones) int 1
+
+# How often player armor items are updated.
+armor_update_time (Armor refresh rate [seconds]) int 1
+
+# Drop armor when a player dies.
+# Uses bones mod if present, otherwise items are dropped around the player.
+armor_drop (Drop armor on death) bool true
+
+# Pulverize armor when a player dies, overrides armor_drop.
+armor_destroy (Pulverize armor on death) bool false
+
+# You can use this to increase or decrease overall armor effectiveness,
+# eg: level_multiplier = 0.5 will reduce armor level by half.
+armor_level_multiplier (Armor effectiveness multiplier) float 1
+
+# You can use this to increase or decrease overall armor healing,
+# eg: armor_heal_multiplier = 0 will disable healing altogether.
+armor_heal_multiplier (Armor healing multiplier) float 1
+
+# Enable water protection (periodically restores breath when activated).
+armor_water_protect (Enable water protection) bool true
+
+# Enable fire protection (defaults true if using ethereal mod).
+armor_fire_protect (Enable fire protection) bool false
+
+# Enable punch damage effects.
+armor_punch_damage (Enable damage effects) bool true
+
+# Enable migration of old armor inventories.
+armor_migrate_old_inventory (Migrate old armor inventories) bool true
+
+
+[shields]
+
+shields_disable_sounds (Disable shield sounds) bool false
+
+
+[wieldview]
+
+# Set number of seconds between visible wielded item updates.
+wieldview_update_time (Wieldview refresh rate [seconds]) int 2
+
+# Show nodes as tiles, disabled by default.
+wieldview_node_tiles (Show nodes as tiles) bool false

shields/init.lua

@@ -5,7 +5,7 @@ local disable_sounds = minetest.settings:get_bool("shields_disable_sounds")
 local use_moreores = minetest.get_modpath("moreores")
 local function play_sound_effect(player, name)
 	if not disable_sounds and player then
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		if pos then
 			minetest.sound_play(name, {
 				pos = pos,