diff --git a/README.md b/README.md index 36feb3a0..baa90f12 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: [3187ddd Git][ver.antum] *2017-06-09* +* [antum][] ([MIT][lic.antum]) -- version: [98e490a Git][ver.antum] *2017-06-16* * buildings/ * [bridges][] ([GPL][lic.gpl3.0]) -- version: [5b5f475 Git][ver.bridges] *2015-08-23* ([patched][patch.bridges]) * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas]) @@ -409,7 +409,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/3187ddd +[ver.antum]: https://github.com/AntumDeluge/mtmp-antum/tree/98e490a [ver.areas]: https://github.com/ShadowNinja/areas/tree/289d0e6 [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/antum/crafting.lua b/mods/antum/antum/crafting.lua new file mode 100644 index 00000000..5f9c00ba --- /dev/null +++ b/mods/antum/antum/crafting.lua @@ -0,0 +1,39 @@ +--[[ 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. + +--]] + + +local thread_depends = { + 'farming', + 'wool', +} + +if antum.dependsSatisfied(thread_depends) then + antum.registerCraft({ + type = 'shapeless', + output = 'farming:cotton 4', + recipe = {'group:wool'}, + }) +end diff --git a/mods/antum/antum/depends.txt b/mods/antum/antum/depends.txt index daec980c..ca804322 100644 --- a/mods/antum/antum/depends.txt +++ b/mods/antum/antum/depends.txt @@ -1,3 +1,5 @@ bucket? craft_guide? +farming? vessels? +wool? diff --git a/mods/antum/antum/functions.lua b/mods/antum/antum/functions.lua index 2db77177..b6bec64c 100644 --- a/mods/antum/antum/functions.lua +++ b/mods/antum/antum/functions.lua @@ -86,3 +86,15 @@ function antum.registerCraft(craft) antum.logAction('Registering craft recipe for "' .. craft.output .. '"') minetest.register_craft(craft) end + + +-- Checks if dependencies are satisfied +function antum.dependsSatisfied(depends) + for index, dep in ipairs(depends) do + if not minetest.get_modpath(dep) then + return false + end + end + + return true +end diff --git a/mods/antum/antum/init.lua b/mods/antum/antum/init.lua index 546de8ac..d7761c59 100644 --- a/mods/antum/antum/init.lua +++ b/mods/antum/antum/init.lua @@ -33,6 +33,7 @@ antum.modpath = minetest.get_modpath(antum.modname) local scripts = { 'functions', 'items', + 'crafting', } for I in pairs(scripts) do