AntumMT
/
game-antum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 3d_armor modpack to Git commit 47ecef4... 

https://github.com/stujones11/minetest-3d_armor/tree/47ecef4
master
Jordan Irwin 2021-04-12 15:18:07 -07:00
parent 71e217b932
commit 4c706b816e
24 changed files with 138 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -138,7 +138,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
### This is a list of installed modpacks & their components (trying to keep them listed separate for sake of organization):
* [3d_armor][] ([LGPL / CC BY-SA][lic.3d_armor]) - version: [7e2d942 Git][ver.3d_armor] *2019-01-19* ([patched][patch.3d_armor])
* [3d_armor][] ([LGPL / CC BY-SA][lic.3d_armor]) - version: [47ecef4 Git][ver.3d_armor] *2019-05-27* ([patched][patch.3d_armor])
* [deploy_nodes][] ([BSD 3-Clause][lic.deploy_nodes]) -- version [b67e162 Git][ver.deploy_nodes] *2017-06-08*
* [homedecor][] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version: [81e0d4e Git][ver.homedecor] *2021-03-30* ([patched][patch.homedecor])
* [mesecons][] ([LGPL / CC BY-SA][lic.mesecons]) -- version [1.2 (d4e05f3 Git)][ver.mesecons] *2018-07-23*
@ -385,7 +385,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[lic.wtfpl]: doc/licenses/WTFPL.txt
[lic.zlib]: doc/licenses/zlib.txt
[ver.3d_armor]: https://github.com/stujones11/minetest-3d_armor/tree/7e2d942
[ver.3d_armor]: https://github.com/stujones11/minetest-3d_armor/tree/47ecef4
[ver.airtanks]: https://github.com/minetest-mods/airtanks/tree/868c3a7
[ver.amber]: https://github.com/theraven262/amber/tree/56627fa
[ver.animals_aggressive]: https://github.com/AntumMT/mp-animals_aggressive/tree/4eede4d
@ -500,7 +500,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.workbench]: https://github.com/minetest-mods/workbench/tree/bd14f59
[ver.worldedge]: https://github.com/minetest-mods/worldedge/tree/608462d
[patch.3d_armor]: https://github.com/AntumMT/mp-3d_armor/tree/0561ad9
[patch.3d_armor]: https://github.com/AntumMT/mp-3d_armor/tree/19d1001
[patch.airtanks]: https://github.com/AntumMT/mod-airtanks/tree/42d31cb
[patch.amber]: https://github.com/AntumMT/mod-amber/tree/b7bd9f0
[patch.away]: https://github.com/AntumMT/mod-away/tree/3b0bf9e

23
mods/modpacks/3d_armor/3d_armor/LICENSE.txt
View File

@ -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 <stujones111@gmail.com>
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

2
mods/modpacks/3d_armor/3d_armor/README.txt
View File

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

2
mods/modpacks/3d_armor/3d_armor/api.lua
View File

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

6
mods/modpacks/3d_armor/3d_armor/init.lua
View File

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

BIN
mods/modpacks/3d_armor/3d_armor/models/3d_armor_character.b3d
View File

Binary file not shown.

BIN
mods/modpacks/3d_armor/3d_armor/models/3d_armor_character.blend
View File

Binary file not shown.

7
mods/modpacks/3d_armor/3d_armor/tools/README.md Normal file
View File

@ -0,0 +1,7 @@
# Intllib tool
please consider using the intllib tool to update locale files:
```../../intllib/tools/xgettext.sh ../**/*.lua```
make sure you are in `3d_armor` derectory before running this command

24
mods/modpacks/3d_armor/3d_armor/tools/updatepo.sh Normal file
View File

@ -0,0 +1,24 @@
#! /bin/bash
# To create a new translation:
# msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
cd "$(dirname "${BASH_SOURCE[0]}")/..";
# Extract translatable strings.
xgettext --from-code=UTF-8 \
--language=Lua \
--sort-by-file \
--keyword=S \
--keyword=NS:1,2 \
--keyword=N_ \
--add-comments='Translators:' \
--add-location=file \
-o locale/template.pot \
$(find .. -name '*.lua')
# Update translations.
find locale -name '*.po' | while read -r file; do
echo $file
msgmerge --update $file locale/template.pot;
done

5
mods/modpacks/3d_armor/3d_armor_ip/LICENSE.txt
View File

@ -1,5 +0,0 @@
[mod] 3d Armor integration to inventory plus [3d_armor_ip]
==========================================================
License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1

2
mods/modpacks/3d_armor/3d_armor_ip/depends.txt
View File

@ -1,2 +0,0 @@
3d_armor
inventory_plus?

1
mods/modpacks/3d_armor/3d_armor_ip/description.txt
View File

@ -1 +0,0 @@
Adds 3d_armor page to the inventory plus

38
mods/modpacks/3d_armor/3d_armor_ip/init.lua
View File

@ -1,38 +0,0 @@
-- support for i18n
local S = armor_i18n.gettext
local F = minetest.formspec_escape
if not minetest.global_exists("inventory_plus") then
minetest.log("warning", S("3d_armor_ip: Mod loaded but unused."))
return
end
armor.formspec = "size[8,8.5]button[6,0;2,0.5;main;"..F(S("Back")).."]"..armor.formspec
armor:register_on_update(function(player)
local name = player:get_player_name()
local formspec = armor:get_armor_formspec(name, true)
local page = player:get_inventory_formspec()
if page:find("detached:"..name.."_armor") then
inventory_plus.set_inventory_formspec(player, formspec)
end
end)
if minetest.get_modpath("crafting") then
inventory_plus.get_formspec = function(player, page)
end
end
minetest.register_on_joinplayer(function(player)
inventory_plus.register_button(player,"armor", S("Armor"))
end)
minetest.register_on_player_receive_fields(function(player, formname, fields)
if fields.armor then
local name = armor:get_valid_player(player, "[on_player_receive_fields]")
if not name then
return
end
local formspec = armor:get_armor_formspec(name, true)
inventory_plus.set_inventory_formspec(player, formspec)
end
end)

15
mods/modpacks/3d_armor/3d_armor_sfinv/LICENSE.txt
View File

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

31
mods/modpacks/3d_armor/3d_armor_stand/LICENSE.txt
View File

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

2
mods/modpacks/3d_armor/3d_armor_stand/init.lua
View File

@ -307,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)

5
mods/modpacks/3d_armor/3d_armor_ui/LICENSE.txt
View File

@ -1,5 +0,0 @@
[mod] 3d Armor integration to unified inventory [3d_armor_ui]
=============================================================
License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1

2
mods/modpacks/3d_armor/3d_armor_ui/depends.txt
View File

@ -1,2 +0,0 @@
3d_armor
unified_inventory?

1
mods/modpacks/3d_armor/3d_armor_ui/description.txt
View File

@ -1 +0,0 @@
Adds 3d_armor page to the unified inventory

53
mods/modpacks/3d_armor/3d_armor_ui/init.lua
View File

@ -1,53 +0,0 @@
-- support for i18n
local S = armor_i18n.gettext
local F = minetest.formspec_escape
local has_technic = minetest.get_modpath("technic") ~= nil
if not minetest.global_exists("unified_inventory") then
minetest.log("warning", S("3d_armor_ui: Mod loaded but unused."))
return
end
if unified_inventory.sfinv_compat_layer then
return
end
armor:register_on_update(function(player)
local name = player:get_player_name()
if unified_inventory.current_page[name] == "armor" then
unified_inventory.set_inventory_formspec(player, "armor")
end
end)
unified_inventory.register_button("armor", {
type = "image",
image = "inventory_plus_armor.png",
tooltip = S("3d Armor")
})
unified_inventory.register_page("armor", {
get_formspec = function(player, perplayer_formspec)
local fy = perplayer_formspec.formspec_y
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 = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]"..
"label[0,0;"..F(S("Armor")).."]"..
"list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]"..
"image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
"label[5.0,"..(fy + 0.0)..";"..F(S("Level"))..": "..armor.def[name].level.."]"..
"label[5.0,"..(fy + 0.5)..";"..F(S("Heal"))..": "..armor.def[name].heal.."]"..
"listring[current_player;main]"..
"listring[detached:"..name.."_armor;armor]"
if armor.config.fire_protect then
formspec = formspec.."label[5.0,"..(fy + 1.0)..";"..
F(S("Fire"))..": "..armor.def[name].fire.."]"
end
if has_technic then
formspec = formspec.."label[5.0,"..(fy + 1.5)..";"..
F(S("Radiation"))..": "..armor.def[name].groups["radiation"].."]"
end
return {formspec=formspec}
end,
})

4
mods/modpacks/3d_armor/README.md
View File

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

24
mods/modpacks/3d_armor/shields/LICENSE.txt
View File

@ -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 <stujones111@gmail.com>
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

2
mods/modpacks/3d_armor/shields/init.lua
View File

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

15
mods/modpacks/3d_armor/wieldview/LICENSE.txt
View File

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