diff --git a/3d_armor/LICENSE.txt b/3d_armor/LICENSE.txt index e1949c0..f253f29 100644 --- a/3d_armor/LICENSE.txt +++ b/3d_armor/LICENSE.txt @@ -1,9 +1,26 @@ [mod] 3d Armor [3d_armor] ========================= -License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1 +License Source Code +------------------- -License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0 +Copyright (C) 2012-2019 stujones11, Stuart Jones -https://github.com/daviddoesminetest/3d-armors-new-textures +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 diff --git a/3d_armor/README.txt b/3d_armor/README.txt index a0cb3b1..7dbe82d 100644 --- a/3d_armor/README.txt +++ b/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", diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 9a456cb..e460a24 100644 --- a/3d_armor/api.lua +++ b/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 = { diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 4d8e362..9e26ca1 100644 --- a/3d_armor/init.lua +++ b/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 diff --git a/3d_armor/models/3d_armor_character.b3d b/3d_armor/models/3d_armor_character.b3d index 7c27cae..c4d45b5 100644 Binary files a/3d_armor/models/3d_armor_character.b3d and b/3d_armor/models/3d_armor_character.b3d differ diff --git a/3d_armor/models/3d_armor_character.blend b/3d_armor/models/3d_armor_character.blend index f61e222..44f7e27 100644 Binary files a/3d_armor/models/3d_armor_character.blend and b/3d_armor/models/3d_armor_character.blend differ diff --git a/3d_armor_ip/LICENSE.txt b/3d_armor_ip/LICENSE.txt index 96ff8c3..b924ac0 100644 --- a/3d_armor_ip/LICENSE.txt +++ b/3d_armor_ip/LICENSE.txt @@ -1,5 +1,18 @@ [mod] 3d Armor integration to inventory plus [3d_armor_ip] ========================================================== -License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1 +Copyright (C) 2012-2019 stujones11, Stuart Jones +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. diff --git a/3d_armor_sfinv/LICENSE.txt b/3d_armor_sfinv/LICENSE.txt index 5b4d955..2b2a9f6 100644 --- a/3d_armor_sfinv/LICENSE.txt +++ b/3d_armor_sfinv/LICENSE.txt @@ -1,5 +1,18 @@ [mod] 3d Armor sfinv integration [3d_armor_sfinv] ================================================= -License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1 +Copyright (C) 2012-2019 stujones11, Stuart Jones +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. diff --git a/3d_armor_stand/LICENSE.txt b/3d_armor_stand/LICENSE.txt index 82e5de6..e3cb55d 100644 --- a/3d_armor_stand/LICENSE.txt +++ b/3d_armor_stand/LICENSE.txt @@ -1,22 +1,43 @@ [mod] 3d Armor Stand [3d_armor_stand] ===================================== -License Source Code: (C) 2016-2018 Stuart Jones - LGPL v2.1 +License Source Code +------------------- -Lecense Models: (C) 2016-2018 Stuart Jones - CC BY-SA 3.0 +Copyright (C) 2012-2019 stujones11, Stuart Jones + +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: +License Textures +---------------- 3d_armor_stand.png 3d_armor_stand_locked.png -(C) 2017 tobyplowy - CC BY-SA 3.0 +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 -(C) 2016-2017 Stuart Jones - CC BY-SA 3.0 +Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0 diff --git a/3d_armor_stand/init.lua b/3d_armor_stand/init.lua index 387eb69..6df145a 100644 --- a/3d_armor_stand/init.lua +++ b/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) diff --git a/3d_armor_ui/LICENSE.txt b/3d_armor_ui/LICENSE.txt index 5dd82c8..6ae23a6 100644 --- a/3d_armor_ui/LICENSE.txt +++ b/3d_armor_ui/LICENSE.txt @@ -1,5 +1,18 @@ [mod] 3d Armor integration to unified inventory [3d_armor_ui] ============================================================= -License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1 +Copyright (C) 2012-2019 stujones11, Stuart Jones +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. diff --git a/README.md b/README.md index 088ed22..204bf9d 100644 --- a/README.md +++ b/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 diff --git a/settingtypes.txt b/settingtypes.txt new file mode 100644 index 0000000..c6c90de --- /dev/null +++ b/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 diff --git a/shields/LICENSE.txt b/shields/LICENSE.txt index 15e2345..1f84859 100644 --- a/shields/LICENSE.txt +++ b/shields/LICENSE.txt @@ -1,8 +1,26 @@ [mod] Shields [shields] ======================= -License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1 +License Source Code +------------------- -License Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0 +Copyright (C) 2012-2019 stujones11, Stuart Jones -https://github.com/daviddoesminetest/3d-armors-new-textures +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 diff --git a/shields/init.lua b/shields/init.lua index 2a5b7d1..c0d5890 100644 --- a/shields/init.lua +++ b/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, diff --git a/wieldview/LICENSE.txt b/wieldview/LICENSE.txt index fff42d8..e1552c0 100644 --- a/wieldview/LICENSE.txt +++ b/wieldview/LICENSE.txt @@ -1,5 +1,18 @@ [mod] visible wielded items [wieldview] ======================================= -License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1 +Copyright (C) 2012-2019 stujones11, Stuart Jones +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.