From 7a232f772b2fe303795004debe88f67a5fea1bfa Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Wed, 7 Jun 2017 00:53:14 -0700 Subject: [PATCH] [antum (mp)] Update to Git commit 3af5496: https://github.com/AntumDeluge/mtmp-antum/tree/3af5496 --- README.md | 4 +- mods/antum/overrides/depends.txt | 1 - mods/antum/overrides/items.lua | 1 - mods/antum/overrides/items/kpgmobs.lua | 74 -------------------------- mods/antum/spawneggs/depends.txt | 1 - mods/antum/spawneggs/eggs.lua | 7 +-- 6 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 mods/antum/overrides/items/kpgmobs.lua diff --git a/README.md b/README.md index 5a45d0bb..48c036c9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [privs][] ([CC0][lic.cc0]) * [spectator_mode][] ([WTFPL][lic.spectator_mode]) -- version: [7d68bec Git][ver.spectator_mode] *2017-03-30* * [awards][] ([LGPL][lic.lgpl2.1]) -- version: [096fe16 Git][ver.awards] *2017-02-25* ([patched][patch.awards]) -* [antum][] ([MIT][lic.antum]) -- version: [2a0e695 Git][ver.antum] *2017-05-29* +* [antum][] ([MIT][lic.antum]) -- version: [3af5496 Git][ver.antum] *2017-06-08* * buildings/ * [bridges][] ([GPL][lic.gpl3.0]) -- version: [5b5f475 Git][ver.bridges] *2015-08-23* * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas]) @@ -395,7 +395,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.airtanks]: https://github.com/minetest-mods/airtanks/tree/5787956 [ver.animalmaterials]: https://github.com/sapier/animalmaterials/tree/d952d27 [ver.animals]: https://github.com/sapier/animals_modpack/tree/b9d0172 -[ver.antum]: https://github.com/AntumDeluge/mtmp-antum/tree/2a0e695 +[ver.antum]: https://github.com/AntumDeluge/mtmp-antum/tree/3af5496 [ver.areas]: https://github.com/ShadowNinja/areas/tree/d3d43d9 [ver.awards]: https://github.com/minetest-mods/awards/tree/096fe16 [ver.away]: https://github.com/kahrl/minetest-mod-away/tree/4c1e5a9 diff --git a/mods/antum/overrides/depends.txt b/mods/antum/overrides/depends.txt index 9bd07bdf..bd817c11 100644 --- a/mods/antum/overrides/depends.txt +++ b/mods/antum/overrides/depends.txt @@ -10,7 +10,6 @@ farming? flowers? helicopter? invisibility? -kpgmobs? mobs? moreblocks? simple_protection? diff --git a/mods/antum/overrides/items.lua b/mods/antum/overrides/items.lua index 72751142..23d9b134 100644 --- a/mods/antum/overrides/items.lua +++ b/mods/antum/overrides/items.lua @@ -28,7 +28,6 @@ local modoverrides = { 'animalmaterials', 'cooking', - 'kpgmobs', 'mobs', 'simple_protection', } diff --git a/mods/antum/overrides/items/kpgmobs.lua b/mods/antum/overrides/items/kpgmobs.lua deleted file mode 100644 index de74ecfd..00000000 --- a/mods/antum/overrides/items/kpgmobs.lua +++ /dev/null @@ -1,74 +0,0 @@ ---[[ LICENSE HEADER - - MIT License - - Copyright © 2017 Jordan Irwin - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - ---]] - - --- Directory where textures are located -local tdir = 'animal_inventory' - -minetest.register_craftitem(':kpgmobs:horseh1', { - description = 'Brown Horse', - inventory_image = 'horse_brown.png', - - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.above then - minetest.env:add_entity(pointed_thing.above, 'kpgmobs:horseh1') - itemstack:take_item() - end - return itemstack - end, -}) -minetest.register_alias('kpgmobs:brown_horse', 'kpgmobs:horseh1') -minetest.register_alias('brown_horse', 'kpgmobs:horseh1') - -minetest.register_craftitem(':kpgmobs:horsepegh1', { - description = 'White Horse', - inventory_image = 'horse_white.png', - - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.above then - minetest.env:add_entity(pointed_thing.above, 'kpgmobs:horsepegh1') - itemstack:take_item() - end - return itemstack - end, -}) -minetest.register_alias('kpgmobs:white_horse', 'kpgmobs:horsepegh1') -minetest.register_alias('white_horse', 'kpgmobs:horsepegh1') - -minetest.register_craftitem(':kpgmobs:horsearah1', { - description = 'Black Horse', - inventory_image = 'horse_black.png', - - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.above then - minetest.env:add_entity(pointed_thing.above, 'kpgmobs:horsearah1') - itemstack:take_item() - end - return itemstack - end, -}) -minetest.register_alias('kpgmobs:black_horse', 'kpgmobs:horsearah1') -minetest.register_alias('black_horse', 'kpgmobs:horsearah1') diff --git a/mods/antum/spawneggs/depends.txt b/mods/antum/spawneggs/depends.txt index 6c55075d..f838f895 100644 --- a/mods/antum/spawneggs/depends.txt +++ b/mods/antum/spawneggs/depends.txt @@ -3,7 +3,6 @@ spawneggs animal_chicken? chicken? default? -kpgmobs? mobs? mobs_monster? oerrki? diff --git a/mods/antum/spawneggs/eggs.lua b/mods/antum/spawneggs/eggs.lua index 32ce2431..850b7995 100644 --- a/mods/antum/spawneggs/eggs.lua +++ b/mods/antum/spawneggs/eggs.lua @@ -45,7 +45,7 @@ antum.spawneggs.addEgg = function(name, spawn, ingredients) local pos = target.above pos.y = pos.y + 1 minetest.add_entity(pos, spawn) - if not minetest.setting_getbool('creative_mode') then + if not minetest.settings:get_bool('creative_mode') then itemstack:take_item() end @@ -92,11 +92,6 @@ if minetest.get_modpath('chicken') then antum.spawneggs.addEgg('chicken', 'creatures:chicken', {'creatures:feather'}) end --- Cow spawnegg -if minetest.get_modpath('kpgmobs') and minetest.get_modpath('mobs') then - antum.spawneggs.addEgg('cow', 'kpgmobs:cow', {'mobs:leather'}) -end - -- mobs_redo monsters if minetest.get_modpath('mobs_monster') and minetest.get_modpath('default') then