Ajoute les textures MFF

- [3d_armor_ui] et [shields] sont concernés

.github/workflows/integration-test.yml

@@ -1,14 +0,0 @@
-name: integration-test
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: integration-test
-      run: ./integration-test.sh

.github/workflows/luacheck.yml

@@ -1,17 +0,0 @@
-name: luacheck
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: apt
-      run: sudo apt-get install -y luarocks
-    - name: luacheck install
-      run: luarocks install --local luacheck
-    - name: luacheck run
-      run: $HOME/.luarocks/bin/luacheck ./

.gitignore

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

.luacheckrc

@@ -1,34 +0,0 @@
-
-unused_args = false
-
-globals = {
-	"wieldview",
-	"armor",
-	"armor_i18n",
-	"inventory_plus"
-}
-
-read_globals = {
-	-- Stdlib
-	string = {fields = {"split"}},
-	table = {fields = {"copy", "getn"}},
-
-	-- Minetest
-	"vector", "ItemStack",
-	"dump", "VoxelArea",
-
-	-- deps
-	"default",
-	"minetest",
-	"unified_inventory",
-	"intllib",
-	"wardrobe",
-	"player_monoids",
-	"armor_monoid",
-	"sfinv",
-	"ARMOR_MATERIALS",
-	"ARMOR_FIRE_NODES",
-	"pova",
-	"skins",
-	"u_skins"
-}

3d_armor/LICENSE.txt

@@ -1,26 +1,9 @@
 [mod] 3d Armor [3d_armor]
 =========================
 
-License Source Code
--------------------
+License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
 
-Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
 
-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.
+https://github.com/daviddoesminetest/3d-armors-new-textures
 
-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.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 = 2
+armor_init_delay = 1
 
 -- Number of initialization attempts.
 -- Use in conjunction with armor_init_delay if initialization problems persist.
-armor_init_times = 10
+armor_init_times = 1
 
 -- 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:get_pos()
+		local pos = player:getpos()
 		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.13",
+	version = "0.4.12",
 }
 
 armor.config = {
@@ -185,6 +185,7 @@ armor.set_player_armor = function(self, player)
 	local material = {count=1}
 	local preview = armor:get_preview(name)
 	local texture = "3d_armor_trans.png"
+	local textures = {}
 	local physics = {}
 	local attributes = {}
 	local levels = {}
@@ -278,11 +279,6 @@ armor.set_player_armor = function(self, player)
 	if use_armor_monoid then
 		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
-		if immortal and immortal ~= 0 then
-			groups.immortal = 1
-		end
 		player:set_armor_groups(groups)
 	end
 	if use_player_monoids then
@@ -316,8 +312,6 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
 	if not name then
 		return
 	end
-	local set_state
-	local set_count
 	local state = 0
 	local count = 0
 	local recip = true
@@ -325,8 +319,8 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
 	local list = armor_inv:get_list("armor")
 	for i, stack in pairs(list) do
 		if stack:get_count() == 1 then
-			local itemname = stack:get_name()
-			local use = minetest.get_item_group(itemname, "armor_use") or 0
+			local name = stack:get_name()
+			local use = minetest.get_item_group(name, "armor_use") or 0
 			local damage = use > 0
 			local def = stack:get_definition() or {}
 			if type(def.on_punched) == "function" then
@@ -374,21 +368,15 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
 				end
 			end
 			if damage == true and hitter == "fire" then
-				damage = minetest.get_item_group(itemname, "flammable") > 0
+				damage = minetest.get_item_group(name, "flammable") > 0
 			end
 			if damage == true then
 				self:damage(player, i, stack, use)
-				set_state = self.def[name].state
-				set_count = self.def[name].count
 			end
 			state = state + stack:get_wear()
 			count = count + 1
 		end
 	end
-	if set_count and set_count ~= count then
-		state = set_state or state
-		count = set_count or count
-	end
 	self.def[name].state = state
 	self.def[name].count = count
 end
@@ -478,8 +466,7 @@ end
 armor.load_armor_inventory = function(self, player)
 	local _, inv = self:get_valid_player(player, "[load_armor_inventory]")
 	if inv then
-		local meta = player:get_meta()
-		local armor_list_string = meta:get_string("3d_armor_inventory")
+		local armor_list_string = player:get_attribute("3d_armor_inventory")
 		if armor_list_string then
 			inv:set_list("armor",
 				self:deserialize_inventory_list(armor_list_string))
@@ -491,8 +478,7 @@ end
 armor.save_armor_inventory = function(self, player)
 	local _, inv = self:get_valid_player(player, "[save_armor_inventory]")
 	if inv then
-		local meta = player:get_meta()
-		meta:set_string("3d_armor_inventory",
+		player:set_attribute("3d_armor_inventory",
 			self:serialize_inventory_list(inv:get_list("armor")))
 	end
 end
@@ -533,7 +519,7 @@ armor.drop_armor = function(pos, stack)
 	if node then
 		local obj = minetest.add_item(pos, stack)
 		if obj then
-			obj:set_velocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)})
+			obj:setvelocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)})
 		end
 	end
 end

3d_armor/armor.conf

@@ -0,0 +1,37 @@
+-- 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.lua

@@ -79,19 +79,6 @@ if armor.materials.wood then
 		damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1},
 		groups = {armor_feet=1, armor_heal=0, armor_use=2000, flammable=1},
 	})
-	local wood_armor_fuel = {
-		helmet = 6,
-		chestplate = 8,
-		leggings = 7,
-		boots = 5
-	}
-	for armor, burn in pairs(wood_armor_fuel) do
-		minetest.register_craft({
-			type = "fuel",
-			recipe = "3d_armor:" .. armor .. "_wood",
-			burntime = burn,
-		})
-	end
 end
 
 if armor.materials.cactus then
@@ -123,19 +110,6 @@ if armor.materials.cactus then
 		armor_groups = {fleshy=5},
 		damage_groups = {cracky=3, snappy=3, choppy=2, crumbly=2, level=1},
 	})
-	local cactus_armor_fuel = {
-		helmet = 14,
-		chestplate = 16,
-		leggings = 15,
-		boots = 13
-	}
-	for armor, burn in pairs(cactus_armor_fuel) do
-		minetest.register_craft({
-			type = "fuel",
-			recipe = "3d_armor:" .. armor .. "_cactus",
-			burntime = burn,
-		})
-	end
 end
 
 if armor.materials.steel then

3d_armor/init.lua

@@ -15,23 +15,19 @@ local F = minetest.formspec_escape
 
 dofile(modpath.."/api.lua")
 
--- integration test
-if minetest.settings:get_bool("enable_3d_armor_integration_test") then
-        dofile(modpath.."/integration_test.lua")
-end
-
-
 -- Legacy Config Support
 
 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
 for name, _ in pairs(armor.config) do
 	local global = "ARMOR_"..name:upper()
@@ -103,33 +99,22 @@ armor.formspec = armor.formspec..
 if armor.config.fire_protect then
 	armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..":  armor_attr_fire]"
 end
-armor:register_on_damage(function(player, index, stack)
-	local name = player:get_player_name()
-	local def = stack:get_definition()
-	if name and def and def.description and stack:get_wear() > 60100 then
-		minetest.chat_send_player(name, S("Your @1 is almost broken!", def.description))
-		minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0})
-	end
-end)
 armor:register_on_destroy(function(player, index, stack)
 	local name = player:get_player_name()
 	local def = stack:get_definition()
 	if name and def and def.description then
 		minetest.chat_send_player(name, S("Your @1 got destroyed!", def.description))
-		minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0})
 	end
 end)
 
 local function validate_armor_inventory(player)
 	-- Workaround for detached inventory swap exploit
 	local _, inv = armor:get_valid_player(player, "[validate_armor_inventory]")
-	local pos = player:get_pos()
 	if not inv then
 		return
 	end
 	local armor_prev = {}
-	local attribute_meta = player:get_meta() -- I know, the function's name is weird but let it be like that. ;)
-	local armor_list_string = attribute_meta:get_string("3d_armor_inventory")
+	local armor_list_string = player:get_attribute("3d_armor_inventory")
 	if armor_list_string then
 		local armor_list = armor:deserialize_inventory_list(armor_list_string)
 		for i, stack in ipairs(armor_list) do
@@ -155,7 +140,6 @@ local function validate_armor_inventory(player)
 				elements[element] = true;
 			else
 				inv:remove_item("armor", stack)
-				minetest.item_drop(stack, player, pos)
 				-- The following code returns invalid items to the player's main
 				-- inventory but could open up the possibity for a hacked client
 				-- to receive items back they never really had. I am not certain
@@ -174,9 +158,9 @@ local function validate_armor_inventory(player)
 	end
 end
 
-local function init_player_armor(initplayer)
-	local name = initplayer:get_player_name()
-	local pos = initplayer:get_pos()
+local function init_player_armor(player)
+	local name = player:get_player_name()
+	local pos = player:getpos()
 	if not name or not pos then
 		return false
 	end
@@ -219,20 +203,20 @@ local function init_player_armor(initplayer)
 		end,
 	}, name)
 	armor_inv:set_size("armor", 6)
-	if not armor:load_armor_inventory(initplayer) and armor.migrate_old_inventory then
-		local player_inv = initplayer:get_inventory()
+	if not armor:load_armor_inventory(player) and armor.migrate_old_inventory then
+		local player_inv = player:get_inventory()
 		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
-		armor:save_armor_inventory(initplayer)
+		armor:save_armor_inventory(player)
 		player_inv:set_size("armor", 0)
 	end
 	for i=1, 6 do
 		local stack = armor_inv:get_stack("armor", i)
 		if stack:get_count() > 0 then
-			armor:run_callbacks("on_equip", initplayer, i, stack)
+			armor:run_callbacks("on_equip", player, i, stack)
 		end
 	end
 	armor.def[name] = {
@@ -268,7 +252,7 @@ local function init_player_armor(initplayer)
 			end
 		end
 	end
-	armor:set_player_armor(initplayer)
+	armor:set_player_armor(player)
 	return true
 end
 
@@ -296,31 +280,24 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if not name then
 		return
 	end
-  local player_name = player:get_player_name()
 	for field, _ in pairs(fields) do
 		if string.find(field, "skins_set") then
-			minetest.after(0, function()
-        local pplayer = minetest.get_player_by_name(player_name)
-        if player then
-          local skin = armor:get_player_skin(name)
-          armor.textures[name].skin = skin
-          armor:set_player_armor(pplayer)
-        end
-			end)
+			minetest.after(0, function(player)
+				local skin = armor:get_player_skin(name)
+				armor.textures[name].skin = skin
+				armor:set_player_armor(player)
+			end, player)
 		end
 	end
 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()
-    local pplayer = minetest.get_player_by_name(player_name)
-		if pplayer and init_player_armor(pplayer) == false then
-			pending_players[pplayer] = 0
+	minetest.after(0, function(player)
+		if init_player_armor(player) == false then
+			pending_players[player] = 0
 		end
-	end)
+	end, player)
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -349,12 +326,12 @@ 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:get_pos()
+		local pos = player:getpos()
 		if pos and armor.config.destroy == false then
 			minetest.after(armor.config.bones_delay, function()
 				local meta = nil
-				local maxp = vector.add(pos, 16)
-				local minp = vector.subtract(pos, 16)
+				local maxp = vector.add(pos, 8)
+				local minp = vector.subtract(pos, 8)
 				local bones = minetest.find_nodes_in_area(minp, maxp, {"bones:bones"})
 				for _, p in pairs(bones) do
 					local m = minetest.get_meta(p)
@@ -393,9 +370,8 @@ if armor.config.punch_damage == true then
 	end)
 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
+minetest.register_on_player_hpchange(function(player, hp_change)
+	if player and hp_change < 0 then
 		local name = player:get_player_name()
 		if name then
 			local heal = armor.def[name].heal
@@ -430,7 +406,7 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
--- Fire Protection and water breathing, added by TenPlus1.
+-- Fire Protection and water breating, added by TenPlus1
 
 if armor.config.fire_protect == true then
 	-- override hot nodes so they do not hurt player anywhere but mod
@@ -451,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:get_pos()
+			local pos = player:getpos()
 			local hp = player:get_hp()
 			if not name or not pos or not hp then
 				return
@@ -491,3 +467,5 @@ if armor.config.water_protect == true or armor.config.fire_protect == true then
 		armor.timer = 0
 	end)
 end
+
+minetest.log("action", "[3d_armor] loaded.")

3d_armor/integration_test.lua

@@ -1,25 +0,0 @@
-
-minetest.log("warning", "[TEST] integration-test enabled!")
-
-minetest.register_on_mods_loaded(function()
-	minetest.after(1, function()
-
-		local data = minetest.write_json({ success = true }, true);
-		local file = io.open(minetest.get_worldpath().."/integration_test.json", "w" );
-		if file then
-			file:write(data)
-			file:close()
-		end
-
-		file = io.open(minetest.get_worldpath().."/registered_nodes.txt", "w" );
-		if file then
-			for name in pairs(minetest.registered_nodes) do
-				file:write(name .. '\n')
-			end
-			file:close()
-		end
-
-		minetest.log("warning", "[TEST] integration tests done!")
-		minetest.request_shutdown("success")
-	end)
-end)

3d_armor/mod.conf

@@ -1,4 +0,0 @@
-name = 3d_armor
-depends = default
-optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, intllib
-description = Adds craftable armor that is visible to other players.