diff --git a/extras/autoblockbreaker/depends.txt b/extras/LogoSkyBlock/autoblockbreaker/depends.txt similarity index 100% rename from extras/autoblockbreaker/depends.txt rename to extras/LogoSkyBlock/autoblockbreaker/depends.txt diff --git a/extras/autoblockbreaker/init.lua b/extras/LogoSkyBlock/autoblockbreaker/init.lua similarity index 100% rename from extras/autoblockbreaker/init.lua rename to extras/LogoSkyBlock/autoblockbreaker/init.lua diff --git a/extras/autoblockbreaker/textures/autoblockbreaker_drill.png b/extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_drill.png similarity index 100% rename from extras/autoblockbreaker/textures/autoblockbreaker_drill.png rename to extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_drill.png diff --git a/extras/autoblockbreaker/textures/autoblockbreaker_drill_animated.png b/extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_drill_animated.png similarity index 100% rename from extras/autoblockbreaker/textures/autoblockbreaker_drill_animated.png rename to extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_drill_animated.png diff --git a/extras/autoblockbreaker/textures/autoblockbreaker_mask.png b/extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_mask.png similarity index 100% rename from extras/autoblockbreaker/textures/autoblockbreaker_mask.png rename to extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_mask.png diff --git a/extras/autoblockbreaker/textures/autoblockbreaker_off.png b/extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_off.png similarity index 100% rename from extras/autoblockbreaker/textures/autoblockbreaker_off.png rename to extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_off.png diff --git a/extras/autoblockbreaker/textures/autoblockbreaker_on.png b/extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_on.png similarity index 100% rename from extras/autoblockbreaker/textures/autoblockbreaker_on.png rename to extras/LogoSkyBlock/autoblockbreaker/textures/autoblockbreaker_on.png diff --git a/extras/crushingfurnace/depends.txt b/extras/LogoSkyBlock/crushingfurnace/depends.txt similarity index 100% rename from extras/crushingfurnace/depends.txt rename to extras/LogoSkyBlock/crushingfurnace/depends.txt diff --git a/extras/crushingfurnace/init.lua b/extras/LogoSkyBlock/crushingfurnace/init.lua similarity index 100% rename from extras/crushingfurnace/init.lua rename to extras/LogoSkyBlock/crushingfurnace/init.lua diff --git a/extras/crushingfurnace/textures/crushingfurnace_bottom.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_bottom.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_bottom.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_bottom.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_crush_bg.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_crush_bg.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_crush_bg.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_crush_bg.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_crush_fg.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_crush_fg.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_crush_fg.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_crush_fg.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_front.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_front.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_front.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_front.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_front_active.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_front_active.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_front_active.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_front_active.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_side.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_side.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_side.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_side.png diff --git a/extras/crushingfurnace/textures/crushingfurnace_top.png b/extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_top.png similarity index 100% rename from extras/crushingfurnace/textures/crushingfurnace_top.png rename to extras/LogoSkyBlock/crushingfurnace/textures/crushingfurnace_top.png diff --git a/extras/logger/depends.txt b/extras/LogoSkyBlock/logger/depends.txt similarity index 100% rename from extras/logger/depends.txt rename to extras/LogoSkyBlock/logger/depends.txt diff --git a/extras/logger/init.lua b/extras/LogoSkyBlock/logger/init.lua similarity index 100% rename from extras/logger/init.lua rename to extras/LogoSkyBlock/logger/init.lua diff --git a/extras/logger/textures/logger_top_off.png b/extras/LogoSkyBlock/logger/textures/logger_top_off.png similarity index 100% rename from extras/logger/textures/logger_top_off.png rename to extras/LogoSkyBlock/logger/textures/logger_top_off.png diff --git a/extras/logger/textures/logger_top_on.png b/extras/LogoSkyBlock/logger/textures/logger_top_on.png similarity index 100% rename from extras/logger/textures/logger_top_on.png rename to extras/LogoSkyBlock/logger/textures/logger_top_on.png diff --git a/extras/LogoSkyBlock/readme.txt b/extras/LogoSkyBlock/readme.txt new file mode 100644 index 0000000..b6106c4 --- /dev/null +++ b/extras/LogoSkyBlock/readme.txt @@ -0,0 +1,3 @@ +This folder contains the original automation mods used on my previously hosted LogoSkyBlock server. + +Updated versions of these can be found in Atvomat. \ No newline at end of file diff --git a/extras/SkyboxGen.blend1 b/extras/SkyboxGen.blend1 deleted file mode 100644 index d67e76c..0000000 Binary files a/extras/SkyboxGen.blend1 and /dev/null differ diff --git a/ntex/sp_pl.png b/extras/SolarPlainsPallette.png similarity index 100% rename from ntex/sp_pl.png rename to extras/SolarPlainsPallette.png diff --git a/extras/i.png b/extras/i.png deleted file mode 100644 index 11d55a8..0000000 Binary files a/extras/i.png and /dev/null differ diff --git a/extras/sky_test_bottom.png b/extras/sky_test_bottom.png deleted file mode 100644 index 4964a30..0000000 Binary files a/extras/sky_test_bottom.png and /dev/null differ diff --git a/extras/sky_test_side.png b/extras/sky_test_side.png deleted file mode 100644 index 231566f..0000000 Binary files a/extras/sky_test_side.png and /dev/null differ diff --git a/extras/sky_test_side_ovl.png b/extras/sky_test_side_ovl.png deleted file mode 100644 index 2f0b82b..0000000 Binary files a/extras/sky_test_side_ovl.png and /dev/null differ diff --git a/extras/sky_test_side_ovl_2.png b/extras/sky_test_side_ovl_2.png deleted file mode 100644 index a73da86..0000000 Binary files a/extras/sky_test_side_ovl_2.png and /dev/null differ diff --git a/extras/sky_test_top.png b/extras/sky_test_top.png deleted file mode 100644 index db892e7..0000000 Binary files a/extras/sky_test_top.png and /dev/null differ diff --git a/extras/skybox/0001.png b/extras/skybox/0001.png deleted file mode 100755 index c1a5ca9..0000000 Binary files a/extras/skybox/0001.png and /dev/null differ diff --git a/extras/skybox/0002.png b/extras/skybox/0002.png deleted file mode 100755 index 29203d4..0000000 Binary files a/extras/skybox/0002.png and /dev/null differ diff --git a/extras/skybox/0003.png b/extras/skybox/0003.png deleted file mode 100755 index 72f380e..0000000 Binary files a/extras/skybox/0003.png and /dev/null differ diff --git a/extras/skybox/0004.png b/extras/skybox/0004.png deleted file mode 100755 index 03591d1..0000000 Binary files a/extras/skybox/0004.png and /dev/null differ diff --git a/extras/skybox/0005.png b/extras/skybox/0005.png deleted file mode 100755 index 001162b..0000000 Binary files a/extras/skybox/0005.png and /dev/null differ diff --git a/extras/skybox/0006.png b/extras/skybox/0006.png deleted file mode 100755 index e7889d6..0000000 Binary files a/extras/skybox/0006.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0001.png b/extras/skybox/SkyboxBottom/0001.png deleted file mode 100755 index a6fe2a8..0000000 Binary files a/extras/skybox/SkyboxBottom/0001.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0002.png b/extras/skybox/SkyboxBottom/0002.png deleted file mode 100755 index 2b61565..0000000 Binary files a/extras/skybox/SkyboxBottom/0002.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0003.png b/extras/skybox/SkyboxBottom/0003.png deleted file mode 100755 index 591e379..0000000 Binary files a/extras/skybox/SkyboxBottom/0003.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0004.png b/extras/skybox/SkyboxBottom/0004.png deleted file mode 100755 index 04cbbf0..0000000 Binary files a/extras/skybox/SkyboxBottom/0004.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0005.png b/extras/skybox/SkyboxBottom/0005.png deleted file mode 100755 index 3bef146..0000000 Binary files a/extras/skybox/SkyboxBottom/0005.png and /dev/null differ diff --git a/extras/skybox/SkyboxBottom/0006.png b/extras/skybox/SkyboxBottom/0006.png deleted file mode 100755 index f3e4d9f..0000000 Binary files a/extras/skybox/SkyboxBottom/0006.png and /dev/null differ diff --git a/extras/skybox/description.txt b/extras/skybox/description.txt deleted file mode 100644 index 3b4bc85..0000000 --- a/extras/skybox/description.txt +++ /dev/null @@ -1 +0,0 @@ -Allows changing your sky to unimaginably epic scenes. diff --git a/extras/skybox/init.lua b/extras/skybox/init.lua deleted file mode 100644 index 9b3e391..0000000 --- a/extras/skybox/init.lua +++ /dev/null @@ -1,115 +0,0 @@ - ---[[ - -Copyright (C) 2015 - Auke Kok - -"crops" 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. - ---]] - --- --- Builtin sky box textures and color/shadings --- - -local skies = { - {"DarkStormy", "#1f2226", 0.5}, - {"CloudyLightRays", "#5f5f5e", 0.9}, - {"FullMoon", "#24292c", 0.2}, - {"SunSet", "#72624d", 0.4}, - {"ThickCloudsWater", "#a57850", 0.8}, - {"TropicalSunnyDay", "#f1f4ee", 1.0}, - {"test", "#72624d", 0.4}, -} - --- --- API --- - -skybox = {} - -skybox.set = function(player, number) - local sky = skies[number] - player:override_day_night_ratio(sky[3]) - player:set_sky(sky[2], "skybox", { - sky[1] .. "Up.jpg", - sky[1] .. "Down.jpg", - sky[1] .. "Front.jpg", - sky[1] .. "Back.jpg", - sky[1] .. "Left.jpg", - sky[1] .. "Right.jpg", - }) - player:set_attribute("skybox:skybox", sky[1]) -end - -skybox.add = function(def) - table.add(skies, def) -end - -skybox.clear = function(player) - player:override_day_night_ratio(nil) - player:set_sky("white", "regular") - player:set_attribute("skybox:skybox", "off") -end - --- --- registrations and load/save code --- - -minetest.register_on_joinplayer(function(player) - local sky = player:get_attribute("skybox:skybox") - print(dump(sky)) - if not sky or sky == "" then - skybox.clear(player) - else - print(dump(skies)) - for k, v in ipairs(skies) do - print(dump(v)) - if sky == v[1] then - skybox.set(player, k) - return - end - end - skybox.clear(player) - end -end) - -minetest.register_privilege("skybox", { - description = "Change sky box for yourself", -}) - -minetest.register_chatcommand("skybox", { - params = " or or \"off\" or empty to list skyboxes", - description = "Change your sky box set", - privs = "skybox", - func = function(name, param) - local player = minetest.get_player_by_name(name) - if not player then - return - end - if param == nil or param == "" then - minetest.chat_send_player(name, "Available sky boxes:") - for _, v in ipairs(skies) do - minetest.chat_send_player(name, - v[1]) - end - return - elseif tonumber(param) ~= nil and tonumber(param) >= 1 and tonumber(param) <= table.getn(skies) then - skybox.set(player, tonumber(param)) - return - elseif param == "off" then - skybox.clear(player) - return - end - for k, v in ipairs(skies) do - if v[1] == param then - skybox.set(player, k) - return - end - end - minetest.chat_send_player(name, - "Could not find that sky box.") - end -}) diff --git a/extras/skybox/mod.conf b/extras/skybox/mod.conf deleted file mode 100644 index 68b402f..0000000 --- a/extras/skybox/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = skybox diff --git a/extras/skybox/readme.md b/extras/skybox/readme.md deleted file mode 100644 index 3482937..0000000 --- a/extras/skybox/readme.md +++ /dev/null @@ -1,42 +0,0 @@ - -## skybox - a player skybox mod (and API!) - -### License of code and artwork - -Copyright (C) 2017 - Auke Kok - -Provides a basic API for modifying a player sky box in a coherent -fashion. - -SkyboxSet by Heiko Irrgang ( http://gamvas.com ) is licensed under -the Creative Commons Attribution-ShareAlike 3.0 Unported License. -Based on a work at http://93i.de. - -### Usage - -The `skybox` privilege allows players to change their own sky boxes. -The command allows listing, and changing skyboxes, or turning skybox -settings `off`. - -### API - -The `skybox` handle can be used to perform various actions: - -`skybox.clear(player)` - -- Reverts the player skybox setting to the default. - -`skybox.set(player, number)` - -- Sets the skybox to the `number` in the list of current skyboxes. - -`skybox.add(skyboxdef)` - -- Add a new skybox with skyboxdef to the list of available skyboxes. - - -``` -skyboxdef = { - [1] -- Base name of texture. The 6 textures you need to - -- provide need to start with this value, and then - -- have "Up", "Down", "Front", "Back", "Left" and - -- "Right", Followed by ".jpg" as the file name. - [2] -- Sky color (colorstring) - [3] -- Day/Night ratio value (float - [0.0, 1.0]) diff --git a/extras/skybox/textures/CloudyLightRaysBack.jpg b/extras/skybox/textures/CloudyLightRaysBack.jpg deleted file mode 100644 index 9cd6fc2..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/CloudyLightRaysDown.jpg b/extras/skybox/textures/CloudyLightRaysDown.jpg deleted file mode 100644 index 1b4783c..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/CloudyLightRaysFront.jpg b/extras/skybox/textures/CloudyLightRaysFront.jpg deleted file mode 100644 index aee4703..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/CloudyLightRaysLeft.jpg b/extras/skybox/textures/CloudyLightRaysLeft.jpg deleted file mode 100644 index c8221f1..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/CloudyLightRaysRight.jpg b/extras/skybox/textures/CloudyLightRaysRight.jpg deleted file mode 100644 index bed91bc..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/CloudyLightRaysUp.jpg b/extras/skybox/textures/CloudyLightRaysUp.jpg deleted file mode 100644 index e5b0c56..0000000 Binary files a/extras/skybox/textures/CloudyLightRaysUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyBack.jpg b/extras/skybox/textures/DarkStormyBack.jpg deleted file mode 100644 index b6c5eee..0000000 Binary files a/extras/skybox/textures/DarkStormyBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyDown.jpg b/extras/skybox/textures/DarkStormyDown.jpg deleted file mode 100644 index d6f3ed9..0000000 Binary files a/extras/skybox/textures/DarkStormyDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyFront.jpg b/extras/skybox/textures/DarkStormyFront.jpg deleted file mode 100644 index 6dde1b8..0000000 Binary files a/extras/skybox/textures/DarkStormyFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyLeft.jpg b/extras/skybox/textures/DarkStormyLeft.jpg deleted file mode 100644 index 7329077..0000000 Binary files a/extras/skybox/textures/DarkStormyLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyRight.jpg b/extras/skybox/textures/DarkStormyRight.jpg deleted file mode 100644 index 053e9bc..0000000 Binary files a/extras/skybox/textures/DarkStormyRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/DarkStormyUp.jpg b/extras/skybox/textures/DarkStormyUp.jpg deleted file mode 100644 index 07bdcec..0000000 Binary files a/extras/skybox/textures/DarkStormyUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonBack.jpg b/extras/skybox/textures/FullMoonBack.jpg deleted file mode 100644 index 66775da..0000000 Binary files a/extras/skybox/textures/FullMoonBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonBack2.jpg b/extras/skybox/textures/FullMoonBack2.jpg deleted file mode 100644 index fffce96..0000000 Binary files a/extras/skybox/textures/FullMoonBack2.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonDown.jpg b/extras/skybox/textures/FullMoonDown.jpg deleted file mode 100644 index 9f066e9..0000000 Binary files a/extras/skybox/textures/FullMoonDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonFront.jpg b/extras/skybox/textures/FullMoonFront.jpg deleted file mode 100644 index 69add8f..0000000 Binary files a/extras/skybox/textures/FullMoonFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonFront2.jpg b/extras/skybox/textures/FullMoonFront2.jpg deleted file mode 100644 index 32c4a7a..0000000 Binary files a/extras/skybox/textures/FullMoonFront2.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonLeft.jpg b/extras/skybox/textures/FullMoonLeft.jpg deleted file mode 100644 index da68f62..0000000 Binary files a/extras/skybox/textures/FullMoonLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonLeft2.jpg b/extras/skybox/textures/FullMoonLeft2.jpg deleted file mode 100644 index 85f3be0..0000000 Binary files a/extras/skybox/textures/FullMoonLeft2.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonRight.jpg b/extras/skybox/textures/FullMoonRight.jpg deleted file mode 100644 index a3e44f2..0000000 Binary files a/extras/skybox/textures/FullMoonRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonRight2.jpg b/extras/skybox/textures/FullMoonRight2.jpg deleted file mode 100644 index a8db55e..0000000 Binary files a/extras/skybox/textures/FullMoonRight2.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonUp.jpg b/extras/skybox/textures/FullMoonUp.jpg deleted file mode 100644 index bc023be..0000000 Binary files a/extras/skybox/textures/FullMoonUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/FullMoonUp2.jpg b/extras/skybox/textures/FullMoonUp2.jpg deleted file mode 100644 index f7b9cdb..0000000 Binary files a/extras/skybox/textures/FullMoonUp2.jpg and /dev/null differ diff --git a/extras/skybox/textures/LICENSE.txt b/extras/skybox/textures/LICENSE.txt deleted file mode 100644 index f06aa06..0000000 --- a/extras/skybox/textures/LICENSE.txt +++ /dev/null @@ -1,8 +0,0 @@ -SkyboxSet by Heiko Irrgang ( http://gamvas.com ) is licensed under -the Creative Commons Attribution-ShareAlike 3.0 Unported License. -Based on a work at http://93i.de. - -To view a copy of this license, visit -http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to -Creative Commons, 444 Castro Street, Suite 900, Mountain View, -California, 94041, USA. diff --git a/extras/skybox/textures/README.txt b/extras/skybox/textures/README.txt deleted file mode 100644 index 3f19342..0000000 --- a/extras/skybox/textures/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -You may use this textures for free in games, even commercial. - -See LICENSE.txt for details. - -Please also have a look on my other projects: - -Gamvas - a HTML5 game engine for the canvas element - -http://gamvas.com - -Brukkon - a puzzle game using the skybox textures - -http://93i.de/cms/products/games/brukkon - -Kind Regards, -Heiko Irrgang diff --git a/extras/skybox/textures/SunSetBack.jpg b/extras/skybox/textures/SunSetBack.jpg deleted file mode 100644 index 1e25dcb..0000000 Binary files a/extras/skybox/textures/SunSetBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/SunSetDown.jpg b/extras/skybox/textures/SunSetDown.jpg deleted file mode 100644 index b0f16ad..0000000 Binary files a/extras/skybox/textures/SunSetDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/SunSetFront.jpg b/extras/skybox/textures/SunSetFront.jpg deleted file mode 100644 index 675d039..0000000 Binary files a/extras/skybox/textures/SunSetFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/SunSetLeft.jpg b/extras/skybox/textures/SunSetLeft.jpg deleted file mode 100644 index 0dbe759..0000000 Binary files a/extras/skybox/textures/SunSetLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/SunSetRight.jpg b/extras/skybox/textures/SunSetRight.jpg deleted file mode 100644 index 5cd5a58..0000000 Binary files a/extras/skybox/textures/SunSetRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/SunSetUp.jpg b/extras/skybox/textures/SunSetUp.jpg deleted file mode 100644 index ac32168..0000000 Binary files a/extras/skybox/textures/SunSetUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterBack.jpg b/extras/skybox/textures/ThickCloudsWaterBack.jpg deleted file mode 100644 index eaf31c0..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterDown.jpg b/extras/skybox/textures/ThickCloudsWaterDown.jpg deleted file mode 100644 index 593b879..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterFront.jpg b/extras/skybox/textures/ThickCloudsWaterFront.jpg deleted file mode 100644 index 2ade37f..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterLeft.jpg b/extras/skybox/textures/ThickCloudsWaterLeft.jpg deleted file mode 100644 index 9b96687..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterRight.jpg b/extras/skybox/textures/ThickCloudsWaterRight.jpg deleted file mode 100644 index 71900ad..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/ThickCloudsWaterUp.jpg b/extras/skybox/textures/ThickCloudsWaterUp.jpg deleted file mode 100644 index e17635c..0000000 Binary files a/extras/skybox/textures/ThickCloudsWaterUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayBack.jpg b/extras/skybox/textures/TropicalSunnyDayBack.jpg deleted file mode 100644 index e883eb9..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayDown.jpg b/extras/skybox/textures/TropicalSunnyDayDown.jpg deleted file mode 100644 index 95bb109..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayFront.jpg b/extras/skybox/textures/TropicalSunnyDayFront.jpg deleted file mode 100644 index db75471..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayLeft.jpg b/extras/skybox/textures/TropicalSunnyDayLeft.jpg deleted file mode 100644 index 30a8b4d..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayRight.jpg b/extras/skybox/textures/TropicalSunnyDayRight.jpg deleted file mode 100644 index 57d191a..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/TropicalSunnyDayUp.jpg b/extras/skybox/textures/TropicalSunnyDayUp.jpg deleted file mode 100644 index a3b4eff..0000000 Binary files a/extras/skybox/textures/TropicalSunnyDayUp.jpg and /dev/null differ diff --git a/extras/skybox/textures/nebula_bottom.png b/extras/skybox/textures/nebula_bottom.png deleted file mode 100644 index a358b99..0000000 Binary files a/extras/skybox/textures/nebula_bottom.png and /dev/null differ diff --git a/extras/skybox/textures/nebula_east.png b/extras/skybox/textures/nebula_east.png deleted file mode 100644 index b6d7526..0000000 Binary files a/extras/skybox/textures/nebula_east.png and /dev/null differ diff --git a/extras/skybox/textures/nebula_north.png b/extras/skybox/textures/nebula_north.png deleted file mode 100644 index c4a2bb9..0000000 Binary files a/extras/skybox/textures/nebula_north.png and /dev/null differ diff --git a/extras/skybox/textures/nebula_south.png b/extras/skybox/textures/nebula_south.png deleted file mode 100644 index e033e9a..0000000 Binary files a/extras/skybox/textures/nebula_south.png and /dev/null differ diff --git a/extras/skybox/textures/nebula_west.png b/extras/skybox/textures/nebula_west.png deleted file mode 100644 index d441f51..0000000 Binary files a/extras/skybox/textures/nebula_west.png and /dev/null differ diff --git a/extras/skybox/textures/testBack.jpg b/extras/skybox/textures/testBack.jpg deleted file mode 100644 index 6e4956c..0000000 Binary files a/extras/skybox/textures/testBack.jpg and /dev/null differ diff --git a/extras/skybox/textures/testDown.jpg b/extras/skybox/textures/testDown.jpg deleted file mode 100644 index 69fabf1..0000000 Binary files a/extras/skybox/textures/testDown.jpg and /dev/null differ diff --git a/extras/skybox/textures/testFront.jpg b/extras/skybox/textures/testFront.jpg deleted file mode 100644 index ba36166..0000000 Binary files a/extras/skybox/textures/testFront.jpg and /dev/null differ diff --git a/extras/skybox/textures/testLeft.jpg b/extras/skybox/textures/testLeft.jpg deleted file mode 100644 index 58ecc6a..0000000 Binary files a/extras/skybox/textures/testLeft.jpg and /dev/null differ diff --git a/extras/skybox/textures/testRight.jpg b/extras/skybox/textures/testRight.jpg deleted file mode 100644 index f9de134..0000000 Binary files a/extras/skybox/textures/testRight.jpg and /dev/null differ diff --git a/extras/skybox/textures/testUp.jpg b/extras/skybox/textures/testUp.jpg deleted file mode 100644 index 5879277..0000000 Binary files a/extras/skybox/textures/testUp.jpg and /dev/null differ diff --git a/farming/README.txt b/farming/README.txt deleted file mode 100644 index 811a535..0000000 --- a/farming/README.txt +++ /dev/null @@ -1,153 +0,0 @@ -Farming Redo Mod -by TenPlus1 - -https://forum.minetest.net/viewtopic.php?id=9019 - -Farming Redo is a simplified version of the built-in farming mod in minetest and comes with wheat, cotton, carrot, cucumber, potato and tomato to start out with which spawn throughout the map... new foods need only be planted on tilled soil so no seeds are required, original wheat and cotton will require seeds which are found inside normal and jungle grass... - -This mod works by adding your new plant to the {growing=1} group and numbering the stages from _1 to as many stages as you like, but the underscore MUST be used only once in the node name to separate plant from stage number e.g. - -"farming:cotton_1" through to "farming:cotton_8" -"farming:wheat_1" through to "farming:wheat_8" -"farming:cucumber_4" through to "farming:cucumber_4" - -Changelog: - -1.23 - Huge code tweak and tidy done and added barley seeds to be found in dry grass, barley can make flour for bread also. -1.22 - Added grape bushes at high climates which can be cultivated into grape vines using trellis (9 sticks). -1.21 - Added auto-refill code for planting crops (thanks crabman77), also fixed a few bugs -1.20b- Tidied code, made api compatible with new 0.4.13 changes and changed to soil texture overlays -1.20 - NEW growing routine added that allows crops to grow while player is away doing other things (thanks prestidigitator) -1.14 - Added Green Beans from Crops mod (thanks sofar), little bushels in the wild but need to be grown using beanpoles crafted with 4 sticks (2 either side) -1.13 - Fixed seed double-placement glitch. Mapgen now uses 0.4.12+ for plant generation -1.12 - Player cannot place seeds in protected area, also growing speeds changed to match defaults -1.11 - Added Straw Bale, streamlined growing abm a little, fixed melon rotation bug with screwdriver -1.10 - Added Blueberry Bush and Blueberry Muffins, also Pumpkin/Melon easier to pick up, added check for unloaded map -1.09 - Corn now uses single nodes instead of 1 ontop of the other, Ethanol recipe is more expensive (requires 5 corn) and some code cleanup. -1.08 - Added Farming Plus compatibility, plus can be removed and no more missing nodes -1.07 - Added Rhubarb and Rhubarb Pie -1.06 - register_hoe and register_plant added for compatibility with default farming mod, although any plants registered will use farming redo to grow -1.05 - Added Raspberry Bushels and Raspberry Smoothie -1.04 - Added Donuts... normal, chocolate and apple... and a few code cleanups and now compatible with jungletree's from MoreTrees mod -1.03 - Bug fixes and more compatibility as drop-in replacement for built-in farming mod -1.02 - Added farming.mod string to help other mods identify which farming mod is running, if it returns "redo" then you're using this one, "" empty is built-in mod -1.01 - Crafting coffee or ethanol returns empty bucket/bottle, also Cocoa spawns a little rarer -1.0 - Added Cocoa which randomly grows on jungle tree's, pods give cocoa beans which can be used to farm more pods on a jungle trunk or make Cookies which have been added (or other treats) -0.9 - Added Pumpkin, Jack 'O Lantern, Pumpkin Slice and Sugar -(a huge thanks to painterly.net for allowing me to use their textures) -0.8 - Added Watermelon and Melon Slice -0.7 - Added Coffee, Coffee Beans, Drinking Cup, Cold and Hot Cup of Coffee -0.6 - Added Corn, Corn on the Cob... Also reworked Abm -0.5 - Added Carrot, Cucumber, Potato (and Baked Potato), Tomato -0.4 - Checks for Protection, also performance changes -0.3 - Added Diamond and Mese hoe -0.2 - Fixed check for wet soil -0.1 - Fixed growing bug -0.0 - Initial release - -Lucky Blocks: 10 (plus 3 for default farming items) - - -License of media (textures): ----------------------------- -Created by PilzAdam (License: WTFPL): - farming_bread.png - farming_soil.png - farming_soil_wet.png - farming_soil_wet_side.png - farming_string.png - -Created by Calinou (License: CC BY-SA): - farming_tool_bronzehoe.png - farming_tool_steelhoe.png - farming_tool_stonehoe.png - farming_tool_woodhoe.png - farming_tool_mesehoe.png - farming_tool_diamondhoe.png - -Created by VanessaE (License: WTFPL): - farming_cotton_seed.png - farming_wheat_seed.png - farming_flour.png - farming_wheat.png - farming_wheat_1.png - farming_wheat_2.png - farming_wheat_3.png - farming_wheat_4.png - farming_wheat_5.png - farming_wheat_5.png - farming_wheat_7.png - farming_wheat_8.png - farming_cotton_1.png - farming_cotton_2.png - farming_cotton_3.png - farming_cotton_4.png - farming_cotton_5.png - farming_cotton_6.png - farming_cotton_7.png - farming_cotton_8.png - -Created by Doc (License: WTFPL): - farming_cucumber.png - farming_cucumber_1.png - farming_cucumber_2.png - farming_cucumber_3.png - farming_cucumber_4.png - farming_potato.png - farming_potato_1.png - farming_potato_2.png - farming_potato_3.png - farming_potato_4.png - farming_raspberries.png - farming_raspberry_1.png - farming_raspberry_2.png - farming_raspberry_3.png - farming_raspberry_4.png - -Created by Gambit: - default_junglegrass.png - farming_carrot.png - farming_carrot_1.png - farming_carrot_2.png - farming_carrot_3.png - farming_carrot_4.png - farming_carrot_5.png - farming_carrot_6.png - farming_carrot_7.png - farming_carrot_8.png - -Created by JoseTheCrafter and edited by TenPlus1: - farming_tomato.png - farming_tomato_1.png - farming_tomato_2.png - farming_tomato_3.png - farming_tomato_4.png - farming_tomato_5.png - farming_tomato_6.png - farming_tomato_7.png - farming_tomato_8.png - -Created by GeMinecraft and edited by TenPlus1: - farming_corn.png - farming_corn_cob.png - farming_corn_1.png - farming_corn_2.png - farming_corn_3.png - farming_corn_4.png - farming_corn_5.png - farming_corn_6.png - farming_corn_7.png - farming_corn_8.png - -Created by TenPlus1 - farming_cocoa_1.png - farming_cocoa_2.png - farming_cocoa_3.png - farming_cocoa_beans.png - farming_cookie.png - farming_raspberry_smoothie.png - farming_rhubarb_1.png - farming_rhubarb_2.png - farming_rhubarb_3.png - farming_rhubarb.png - farming_rhubarb_pie.png \ No newline at end of file diff --git a/farming/barley.lua b/farming/barley.lua deleted file mode 100644 index 32772c4..0000000 --- a/farming/barley.lua +++ /dev/null @@ -1,100 +0,0 @@ - -local S = farming.intllib - --- barley seeds -minetest.register_node("farming:seed_barley", { - description = S("Barley Seed"), - tiles = {"farming_barley_seed.png"}, - inventory_image = "farming_barley_seed.png", - wield_image = "farming_barley_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1", true) - end, -}) - --- harvested barley -minetest.register_craftitem("farming:barley", { - description = S("Barley"), - inventory_image = "farming_barley.png", -}) - --- flour -minetest.register_craft({ - type = "shapeless", - output = "farming:flour", - recipe = {"farming:barley", "farming:barley", "farming:barley", "farming:barley"} -}) - --- barley definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_barley_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - waving = 1, - paramtype2 = "meshoptions", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:barley_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_barley_2.png"} -minetest.register_node("farming:barley_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_barley_3.png"} -minetest.register_node("farming:barley_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_barley_4.png"} -minetest.register_node("farming:barley_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_barley_5.png"} -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 2}, - {items = {'farming:seed_barley'}, rarity = 2}, - } -} -minetest.register_node("farming:barley_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_barley_6.png"} -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 2}, - {items = {'farming:seed_barley'}, rarity = 1}, - } -} -minetest.register_node("farming:barley_6", table.copy(crop_def)) - --- stage 7 (final) -crop_def.tiles = {"farming_barley_7.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 1}, - {items = {'farming:barley'}, rarity = 3}, - {items = {'farming:seed_barley'}, rarity = 1}, - {items = {'farming:seed_barley'}, rarity = 3}, - } -} -minetest.register_node("farming:barley_7", table.copy(crop_def)) diff --git a/farming/beanpole.lua b/farming/beanpole.lua deleted file mode 100644 index 0d170b9..0000000 --- a/farming/beanpole.lua +++ /dev/null @@ -1,199 +0,0 @@ ---[[ - All textures by - (C) Auke Kok - CC-BY-SA-3.0 -]] - -local S = farming.intllib - --- beans -minetest.register_craftitem("farming:beans", { - description = S("Green Beans"), - inventory_image = "farming_beans.png", - on_use = minetest.item_eat(1), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if nodename == "farming:beanpole" then - minetest.set_node(pointed_thing.under, {name = "farming:beanpole_1", param2=mcore.options("croplike", false, false, false)}) - - --minetest.sound_play("default_place_node", {pos = pointed_thing.above, gain = 1.0}) - else - return - end - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:beans", - placer:get_wield_index() - ) - end - end - - return itemstack - end -}) - --- beans can be used for green dye -minetest.register_craft({ - output = "dye:green", - recipe = { - {'farming:beans'}, - } -}) - --- beanpole -minetest.register_node("farming:beanpole", { - description = S("Bean Pole (place on soil before planting beans)"), - drawtype = "plantlike", - paramtype2 = "meshoptions", - tiles = {"farming_beanpole.png"}, - inventory_image = "farming_beanpole.png", - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = "farming:beanpole", - selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = mcore.sound_plants, - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if minetest.get_item_group(nodename, "soil") < 2 then - return - end - - local top = { - x = pointed_thing.above.x, - y = pointed_thing.above.y + 1, - z = pointed_thing.above.z - } - - nodename = minetest.get_node(top).name - - if nodename ~= "air" then - return - end - - minetest.set_node(pointed_thing.above, {name = "farming:beanpole", param2=mcore.options("croplike", false, false, false)}) - - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - - return itemstack - end -}) - -minetest.register_craft({ - output = "farming:beanpole", - recipe = { - {'', '', ''}, - {'core:stick', '', 'core:stick'}, - {'core:stick', '', 'core:stick'}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:beanpole", - burntime = 10, -}) - --- green bean definition -local crop_def = { - drawtype = "plantlike", - paramtype2 = "meshoptions", - tiles = {"farming_beanpole_1.png"}, - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:beanpole'}, rarity = 1}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, - attached_node = 1, growing = 1 - }, - --sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:beanpole_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_beanpole_2.png"} -minetest.register_node("farming:beanpole_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_beanpole_3.png"} -minetest.register_node("farming:beanpole_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_beanpole_4.png"} -minetest.register_node("farming:beanpole_4", table.copy(crop_def)) - --- stage 5 (final) -crop_def.tiles = {"farming_beanpole_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:beanpole'}, rarity = 1}, - {items = {'farming:beans 3'}, rarity = 1}, - {items = {'farming:beans 2'}, rarity = 2}, - {items = {'farming:beans 2'}, rarity = 3}, - } -} -minetest.register_node("farming:beanpole_5", table.copy(crop_def)) - --- wild green bean bush (this is what you find on the map) -minetest.register_node("farming:beanbush", { - drawtype = "plantlike", - tiles = {"farming_beanbush.png"}, - paramtype = "light", - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:beans 1'}, rarity = 1}, - {items = {'farming:beans 1'}, rarity = 2}, - {items = {'farming:beans 1'}, rarity = 3}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 - }, - sounds = mcore.sound_plants, -}) diff --git a/farming/blueberry.lua b/farming/blueberry.lua deleted file mode 100644 index 13644ee..0000000 --- a/farming/blueberry.lua +++ /dev/null @@ -1,69 +0,0 @@ - -local S = farming.intllib - --- blueberries -minetest.register_craftitem("farming:blueberries", { - description = S("Blueberries"), - inventory_image = "farming_blueberries.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1", true) - end, - on_use = minetest.item_eat(1), -}) - --- blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image) - -minetest.register_craftitem("farming:muffin_blueberry", { - description = S("Blueberry Muffin"), - inventory_image = "farming_blueberry_muffin.png", - on_use = minetest.item_eat(3), -}) - -minetest.register_craft({ - output = "farming:muffin_blueberry 2", - recipe = { - {"farming:blueberries", "farming:bread", "farming:blueberries"}, - } -}) - --- blueberry definition -local crop_def = { - drawtype = "plantlike", - waving = 1, - paramtype2 = "meshoptions", - tiles = {"farming_blueberry_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:blueberry_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_blueberry_2.png"} -minetest.register_node("farming:blueberry_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_blueberry_3.png"} -minetest.register_node("farming:blueberry_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_blueberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:blueberries 2'}, rarity = 1}, - {items = {'farming:blueberries'}, rarity = 2}, - {items = {'farming:blueberries'}, rarity = 3}, - } -} -minetest.register_node("farming:blueberry_4", table.copy(crop_def)) diff --git a/farming/carrot.lua b/farming/carrot.lua deleted file mode 100644 index d87e4bc..0000000 --- a/farming/carrot.lua +++ /dev/null @@ -1,97 +0,0 @@ - ---[[ - Original textures from PixelBox texture pack - https://forum.minetest.net/viewtopic.php?id=4990 -]] - -local S = farming.intllib - --- carrot -minetest.register_craftitem("farming:carrot", { - description = S("Carrot"), - inventory_image = "farming_carrot.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1", true) - end, - on_use = minetest.item_eat(2), -}) - --- golden carrot -minetest.register_craftitem("farming:carrot_gold", { - description = S("Golden Carrot"), - inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:carrot_gold", - recipe = { - {"", "core:gold_ingot", ""}, - {"core:gold_ingot", "farming:carrot", "core:gold_ingot"}, - {"", "core:gold_ingot", ""}, - } -}) - --- carrot definition -local crop_def = { - drawtype = "plantlike", - waving = 1, - paramtype2 = "meshoptions", - tiles = {"farming_carrot_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - - --- stage 1 -minetest.register_node("farming:carrot_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_carrot_2.png"} -minetest.register_node("farming:carrot_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_carrot_3.png"} -minetest.register_node("farming:carrot_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_carrot_4.png"} -minetest.register_node("farming:carrot_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_carrot_5.png"} -minetest.register_node("farming:carrot_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_carrot_6.png"} -minetest.register_node("farming:carrot_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_carrot_7.png"} -crop_def.drop = { - items = { - {items = {'farming:carrot'}, rarity = 1}, - {items = {'farming:carrot 2'}, rarity = 3}, - } -} -minetest.register_node("farming:carrot_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_carrot_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:carrot 2'}, rarity = 1}, - {items = {'farming:carrot 3'}, rarity = 2}, - } -} -minetest.register_node("farming:carrot_8", table.copy(crop_def)) diff --git a/farming/cocoa.lua b/farming/cocoa.lua deleted file mode 100644 index c0cabd9..0000000 --- a/farming/cocoa.lua +++ /dev/null @@ -1,191 +0,0 @@ - -local S = farming.intllib - --- place cocoa -function place_cocoa(itemstack, placer, pointed_thing, plantname) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - - -- return if any of the nodes are not registered - if not minetest.registered_nodes[under.name] then - return - end - - -- am I right-clicking on something that has a custom on_place set? - -- thanks to Krock for helping with this issue :) - local def = minetest.registered_nodes[under.name] - if def and def.on_rightclick then - return def.on_rightclick(pt.under, under, placer, itemstack) - end - - -- check if pointing at jungletree - if under.name ~= "default:jungletree" - or minetest.get_node(pt.above).name ~= "air" then - return - end - - -- add the node and remove 1 item from the itemstack - minetest.set_node(pt.above, {name = plantname}) - - minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}) - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:cocoa_beans", - placer:get_wield_index() - ) - end - end - - return itemstack -end - --- cocoa beans -minetest.register_craftitem("farming:cocoa_beans", { - description = S("Cocoa Beans"), - inventory_image = "farming_cocoa_beans.png", - on_place = function(itemstack, placer, pointed_thing) - return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") - end, -}) - -minetest.register_craft( { - output = "dye:brown 2", - recipe = { - { "farming:cocoa_beans" }, - } -}) - --- chocolate cookie -minetest.register_craftitem("farming:cookie", { - description = S("Cookie"), - inventory_image = "farming_cookie.png", - on_use = minetest.item_eat(2), -}) - -minetest.register_craft( { - output = "farming:cookie 8", - recipe = { - { "farming:wheat", "farming:cocoa_beans", "farming:wheat" }, - } -}) - --- bar of dark chocolate (thanks to Ice Pandora for her deviantart.com chocolate tutorial) -minetest.register_craftitem("farming:chocolate_dark", { - description = S("Bar of Dark Chocolate"), - inventory_image = "farming_chocolate_dark.png", - on_use = minetest.item_eat(1), -}) - -minetest.register_craft( { - output = "farming:chocolate_dark", - recipe = { - { "farming:cocoa_beans", "farming:cocoa_beans", "farming:cocoa_beans" }, - } -}) - --- cocoa definition -local crop_def = { - drawtype = "mesh", - mesh = "farming_cocoa_1.b3d", - tiles = {"farming_cocoa_1.png"}, - paramtype = "light", - walkable = true, - drop = { - items = { - {items = {'farming:cocoa_beans 1'}, rarity = 2}, - } - }, - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} - }, - groups = { - snappy = 3, flammable = 2, plant = 1, growing = 1, - not_in_creative_inventory=1, leafdecay = 1, leafdecay_drop = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:cocoa_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_cocoa_2.png"} -crop_def.mesh = "farming_cocoa_2.b3d" -crop_def.drop = { - items = { - {items = {'farming:cocoa_beans 1'}, rarity = 1}, - } -} -minetest.register_node("farming:cocoa_2", table.copy(crop_def)) - --- stage 3 (final) -crop_def.tiles = {"farming_cocoa_3.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:cocoa_beans 2'}, rarity = 1}, - {items = {'farming:cocoa_beans 1'}, rarity = 2}, - } -} -minetest.register_node("farming:cocoa_3", table.copy(crop_def)) - --- add random cocoa pods to jungle tree's -minetest.register_on_generated(function(minp, maxp) - - if maxp.y < 0 then - return - end - - local pos, dir - local cocoa = minetest.find_nodes_in_area(minp, maxp, "default:jungletree") - - for n = 1, #cocoa do - - pos = cocoa[n] - - if minetest.find_node_near(pos, 1, - {"default:jungleleaves", "moretrees:jungletree_leaves_green"}) then - - dir = math.random(1, 80) - - if dir == 1 then - pos.x = pos.x + 1 - elseif dir == 2 then - pos.x = pos.x - 1 - elseif dir == 3 then - pos.z = pos.z + 1 - elseif dir == 4 then - pos.z = pos.z -1 - end - - if dir < 5 - and minetest.get_node(pos).name == "air" - and minetest.get_node_light(pos) > 12 then - - --print ("Cocoa Pod added at " .. minetest.pos_to_string(pos)) - - minetest.swap_node(pos, { - name = "farming:cocoa_" .. tostring(math.random(1, 3)) - }) - end - - end - end -end) diff --git a/farming/coffee.lua b/farming/coffee.lua deleted file mode 100644 index d769127..0000000 --- a/farming/coffee.lua +++ /dev/null @@ -1,134 +0,0 @@ - -local S = farming.intllib - --- coffee -minetest.register_craftitem("farming:coffee_beans", { - description = S("Coffee Beans"), - inventory_image = "farming_coffee_beans.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:coffee_1", true) - end, -}) - - --- drinking cup -minetest.register_node("farming:drinking_cup", { - description = S("Drinking Cup (empty)"), - drawtype = "plantlike", - tiles = {"vessels_drinking_cup.png"}, - inventory_image = "vessels_drinking_cup.png", - wield_image = "vessels_drinking_cup.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = mcore.sound_plants, -}) - -minetest.register_craft( { - output = "farming:drinking_cup 5", - recipe = { - { "default:glass", "", "default:glass" }, - {"", "default:glass",""}, - } -}) - --- cold cup of coffee -minetest.register_node("farming:coffee_cup", { - description = S("Cold Cup of Coffee"), - drawtype = "plantlike", - tiles = {"farming_coffee_cup.png"}, - inventory_image = "farming_coffee_cup.png", - wield_image = "farming_coffee_cup.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - on_use = minetest.item_eat(2, "farming:drinking_cup"), - sounds = mcore.sound_plants, -}) - -minetest.register_craft( { - output = "farming:coffee_cup", - recipe = { - {"farming:drinking_cup", "farming:coffee_beans","bucket:bucket_water"}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 5, - output = "farming:coffee_cup_hot", - recipe = "farming:coffee_cup" -}) - --- hot cup of coffee -minetest.register_node("farming:coffee_cup_hot", { - description = S("Hot Cup of Coffee"), - drawtype = "plantlike", - tiles = {"farming_coffee_cup_hot.png"}, - inventory_image = "farming_coffee_cup_hot.png", - wield_image = "farming_coffee_cup_hot.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - on_use = minetest.item_eat(3, "farming:drinking_cup"), - sounds = mcore.sound_plants, -}) - --- coffee definition -local crop_def = { - drawtype = "plantlike", - waving = 1, - paramtype2 = "meshoptions", - tiles = {"farming_coffee_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:coffee_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_coffee_2.png"} -minetest.register_node("farming:coffee_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_coffee_3.png"} -minetest.register_node("farming:coffee_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_coffee_4.png"} -minetest.register_node("farming:coffee_4", table.copy(crop_def)) - --- stage 5 (final) -crop_def.tiles = {"farming_coffee_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:coffee_beans 2'}, rarity = 1}, - {items = {'farming:coffee_beans 2'}, rarity = 2}, - {items = {'farming:coffee_beans 2'}, rarity = 3}, - } -} -minetest.register_node("farming:coffee_5", table.copy(crop_def)) diff --git a/farming/corn.lua b/farming/corn.lua deleted file mode 100644 index b17fd9f..0000000 --- a/farming/corn.lua +++ /dev/null @@ -1,118 +0,0 @@ - ---[[ - Original textures from GeMinecraft - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1440575-1-2-5-generation-minecraft-beta-1-2-farming-and -]] - -local S = farming.intllib - --- corn -minetest.register_craftitem("farming:corn", { - description = S("Corn"), - inventory_image = "farming_corn.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1", true) - end, - on_use = minetest.item_eat(2), -}) - --- corn on the cob (texture by TenPlus1) -minetest.register_craftitem("farming:corn_cob", { - description = S("Corn on the Cob"), - inventory_image = "farming_corn_cob.png", - on_use = minetest.item_eat(4), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:corn_cob", - recipe = "farming:corn" -}) - --- ethanol (thanks to JKMurray for this idea) -minetest.register_craftitem("farming:bottle_ethanol", { - description = S("Bottle of Ethanol"), - inventory_image = "farming_bottle_ethanol.png", -}) - -minetest.register_craft( { - output = "farming:bottle_ethanol", - recipe = { - { "vessels:glass_bottle", "farming:corn", "farming:corn"}, - { "farming:corn", "farming:corn", "farming:corn"}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:bottle_ethanol", - burntime = 240, - replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}} -}) - --- corn definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_corn_1.png"}, - waving = 1, - paramtype2 = "meshoptions", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:corn_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_corn_2.png"} -minetest.register_node("farming:corn_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_corn_3.png"} -minetest.register_node("farming:corn_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_corn_4.png"} -minetest.register_node("farming:corn_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_corn_5.png"} -minetest.register_node("farming:corn_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_corn_6.png"} -crop_def.visual_scale = 1.45 -minetest.register_node("farming:corn_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_corn_7.png"} -crop_def.drop = { - items = { - {items = {'farming:corn'}, rarity = 1}, - {items = {'farming:corn'}, rarity = 2}, - {items = {'farming:corn'}, rarity = 3}, - } -} -minetest.register_node("farming:corn_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_corn_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:corn 2'}, rarity = 1}, - {items = {'farming:corn 2'}, rarity = 2}, - {items = {'farming:corn 2'}, rarity = 2}, - } -} -minetest.register_node("farming:corn_8", table.copy(crop_def)) diff --git a/farming/cotton.lua b/farming/cotton.lua deleted file mode 100644 index 4eb5e5a..0000000 --- a/farming/cotton.lua +++ /dev/null @@ -1,125 +0,0 @@ - -local S = farming.intllib - --- cotton seeds -minetest.register_node("farming:seed_cotton", { - description = S("Cotton Seed"), - tiles = {"farming_cotton_seed.png"}, - inventory_image = "farming_cotton_seed.png", - wield_image = "farming_cotton_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1", true) - end, -}) - --- cotton / string - -minetest.register_craftitem("farming:cotton", { - description = S("Cotton"), - inventory_image = "farming_cotton.png", -}) - -minetest.register_alias("farming:string", "farming:cotton") - --- cotton to wool -minetest.register_craft({ - output = "wool:white", - recipe = { - {"farming:string", "farming:string"}, - {"farming:string", "farming:string"}, - } -}) - --- cotton definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_cotton_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:cotton_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_cotton_2.png"} -minetest.register_node("farming:cotton_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_cotton_3.png"} -minetest.register_node("farming:cotton_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_cotton_4.png"} -minetest.register_node("farming:cotton_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_cotton_5.png"} -crop_def.drop = { - items = { - {items = {"farming:seed_cotton"}, rarity = 1}, - } -} -minetest.register_node("farming:cotton_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_cotton_6.png"} -crop_def.drop = { - items = { - {items = {"farming:cotton"}, rarity = 1}, - {items = {"farming:cotton"}, rarity = 2}, - } -} -minetest.register_node("farming:cotton_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_cotton_7.png"} -crop_def.drop = { - items = { - {items = {"farming:cotton"}, rarity = 1}, - {items = {"farming:cotton"}, rarity = 2}, - {items = {"farming:seed_cotton"}, rarity = 1}, - {items = {"farming:seed_cotton"}, rarity = 2}, - } -} -minetest.register_node("farming:cotton_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_cotton_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {"farming:string"}, rarity = 1}, - {items = {"farming:string"}, rarity = 2}, - {items = {"farming:string"}, rarity = 3}, - {items = {"farming:seed_cotton"}, rarity = 1}, - {items = {"farming:seed_cotton"}, rarity = 2}, - {items = {"farming:seed_cotton"}, rarity = 3}, - } -} -minetest.register_node("farming:cotton_8", table.copy(crop_def)) - ---[[ Cotton (example, is already registered in cotton.lua) -farming.register_plant("farming:cotton", { - description = "Cotton seed", - inventory_image = "farming_cotton_seed.png", - steps = 8, -})]] diff --git a/farming/cucumber.lua b/farming/cucumber.lua deleted file mode 100644 index ede15d7..0000000 --- a/farming/cucumber.lua +++ /dev/null @@ -1,57 +0,0 @@ - ---[[ - Original textures from DocFarming mod - https://forum.minetest.net/viewtopic.php?id=3948 -]] - -local S = farming.intllib - --- cucumber -minetest.register_craftitem("farming:cucumber", { - description = S("Cucumber"), - inventory_image = "farming_cucumber.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1", true) - end, - on_use = minetest.item_eat(2), -}) - --- cucumber definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_cucumber_1.png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - waving = 1, - paramtype2 = "meshoptions", - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:cucumber_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_cucumber_2.png"} -minetest.register_node("farming:cucumber_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_cucumber_3.png"} -minetest.register_node("farming:cucumber_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_cucumber_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:cucumber'}, rarity = 1}, - {items = {'farming:cucumber 2'}, rarity = 2}, - } -} -minetest.register_node("farming:cucumber_4", table.copy(crop_def)) diff --git a/farming/depends.txt b/farming/depends.txt deleted file mode 100644 index f5bd37c..0000000 --- a/farming/depends.txt +++ /dev/null @@ -1 +0,0 @@ -core diff --git a/farming/description.txt b/farming/description.txt deleted file mode 100644 index 58bdc81..0000000 --- a/farming/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds many plants and food to Minetest \ No newline at end of file diff --git a/farming/donut.lua b/farming/donut.lua deleted file mode 100644 index 68aeb8e..0000000 --- a/farming/donut.lua +++ /dev/null @@ -1,48 +0,0 @@ - -local S = farming.intllib - --- Donut (thanks to Bockwurst for making the donut images) -minetest.register_craftitem("farming:donut", { - description = S("Donut"), - inventory_image = "farming_donut.png", - on_use = minetest.item_eat(4), -}) - -minetest.register_craft({ - output = "farming:donut 3", - recipe = { - {'', 'farming:wheat', ''}, - {'farming:wheat', '', 'farming:wheat'}, - {'', 'farming:wheat', ''}, - } -}) - --- Chocolate Donut -minetest.register_craftitem("farming:donut_chocolate", { - description = S("Chocolate Donut"), - inventory_image = "farming_donut_chocolate.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:donut_chocolate", - recipe = { - {'farming:cocoa_beans'}, - {'farming:donut'}, - } -}) - --- Apple Donut -minetest.register_craftitem("farming:donut_apple", { - description = S("Apple Donut"), - inventory_image = "farming_donut_apple.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:donut_apple", - recipe = { - {'default:apple'}, - {'farming:donut'}, - } -}) diff --git a/farming/grapes.lua b/farming/grapes.lua deleted file mode 100644 index c868554..0000000 --- a/farming/grapes.lua +++ /dev/null @@ -1,206 +0,0 @@ - -local S = farming.intllib - --- grapes -minetest.register_craftitem("farming:grapes", { - description = S("Grapes"), - inventory_image = "farming_grapes.png", - on_use = minetest.item_eat(1), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if nodename == "farming:trellis" then - minetest.set_node(pointed_thing.under, {name = "farming:grapes_1", param2=mcore.options("croplike", false, false, false)}) - - minetest.sound_play("default_place_node", {pos = pointed_thing.above, gain = 1.0}) - else - return - end - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:grapes", - placer:get_wield_index() - ) - end - end - - return itemstack - end -}) - --- grapes can be used for violet dye -minetest.register_craft({ - output = "dye:violet", - recipe = { - {'farming:grapes'}, - } -}) - --- trellis -minetest.register_node("farming:trellis", { - description = S("Trellis (place on soil before planting grapes)"), - drawtype = "plantlike", - tiles = {"farming_trellis.png"}, - inventory_image = "farming_trellis.png", - visual_scale = 1.45, - paramtype = "light", - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = "farming:trellis", - selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = mcore.sound_plants, - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if minetest.get_item_group(nodename, "soil") < 2 then - return - end - - local top = { - x = pointed_thing.above.x, - y = pointed_thing.above.y + 1, - z = pointed_thing.above.z - } - - nodename = minetest.get_node(top).name - - if nodename ~= "air" then - return - end - - minetest.set_node(pointed_thing.above, {name = "farming:trellis", param2 = mcore.options("croplike", false, false, false) } ) - - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - - return itemstack - end -}) - -minetest.register_craft({ - output = "farming:trellis", - recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:trellis", - burntime = 15, -}) - --- grapes definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_grapes_1.png"}, - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - paramtype2 = "meshoptions", - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:trellis'}, rarity = 1}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, - attached_node = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:grapes_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_grapes_2.png"} -minetest.register_node("farming:grapes_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_grapes_3.png"} -minetest.register_node("farming:grapes_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_grapes_4.png"} -minetest.register_node("farming:grapes_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_grapes_5.png"} -minetest.register_node("farming:grapes_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_grapes_6.png"} -minetest.register_node("farming:grapes_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_grapes_7.png"} -minetest.register_node("farming:grapes_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_grapes_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:trellis'}, rarity = 1}, - {items = {'farming:grapes 3'}, rarity = 1}, - {items = {'farming:grapes 1'}, rarity = 2}, - {items = {'farming:grapes 1'}, rarity = 3}, - } -} -minetest.register_node("farming:grapes_8", table.copy(crop_def)) - --- wild grape vine (this is what you find on the map) -minetest.register_node("farming:grapebush", { - drawtype = "plantlike", - tiles = {"farming_grapebush.png"}, - paramtype = "light", - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:grapes 1'}, rarity = 1}, - {items = {'farming:grapes 1'}, rarity = 2}, - {items = {'farming:grapes 1'}, rarity = 3}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 - }, - sounds = mcore.sound_plants, -}) diff --git a/farming/grass.lua b/farming/grass.lua deleted file mode 100644 index 1e44ce1..0000000 --- a/farming/grass.lua +++ /dev/null @@ -1,17 +0,0 @@ - -for i = 1, 3 do - - -- Override default grass and have it drop Wheat Seeds - - minetest.override_item("core:grass_" .. i, { - drop = { - max_items = 1, - items = { - {items = {'farming:seed_wheat'}, rarity = 5}, - {items = {'farming:seed_barley'}, rarity = 6}, - {items = {'farming:seed_cotton'}, rarity = 8}, - {items = {'core:grass_1'}}, - } - }, - }) -end \ No newline at end of file diff --git a/farming/hoes.lua b/farming/hoes.lua deleted file mode 100644 index 05a1dd4..0000000 --- a/farming/hoes.lua +++ /dev/null @@ -1,153 +0,0 @@ - -local S = farming.intllib - --- Hoe registration function - -farming.register_hoe = function(name, def) - - -- Check for : prefix (register new hoes in your mod's namespace) - if name:sub(1,1) ~= ":" then - name = ":" .. name - end - - -- Check def table - if def.description == nil then - def.description = "Hoe" - end - - if def.inventory_image == nil then - def.inventory_image = "unknown_item.png" - end - - if def.recipe == nil then - def.recipe = { - {"air","air",""}, - {"","group:stick",""}, - {"","group:stick",""} - } - end - - if def.max_uses == nil then - def.max_uses = 30 - end - - -- Register the tool - minetest.register_tool(name, { - description = def.description, - inventory_image = def.inventory_image, - on_use = function(itemstack, user, pointed_thing) - return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses) - end - }) - - -- Register its recipe - if def.material == nil then - minetest.register_craft({ - output = name:sub(2), - recipe = def.recipe - }) - else - minetest.register_craft({ - output = name:sub(2), - recipe = { - {def.material, def.material, ""}, - {"", "group:stick", ""}, - {"", "group:stick", ""} - } - }) - end -end - --- Turns dirt with group soil=1 into soil - -function farming.hoe_on_use(itemstack, user, pointed_thing, uses) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local upos = pointed_thing.under - - if minetest.is_protected(upos, user:get_player_name()) then - minetest.record_protection_violation(upos, user:get_player_name()) - return - end - - local p = {x = pt.under.x, y = pt.under.y + 1, z = pt.under.z} - local above = minetest.get_node(p) - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- check if the node above the pointed thing is air - if above.name ~= "air" then - return - end - - -- check if pointing at dirt - if minetest.get_item_group(under.name, "soil") ~= 1 then - return - end - - -- turn the node into soil, wear out item and play sound - minetest.set_node(pt.under, {name = "farming:soil"}) - - minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}) - - if not minetest.setting_getbool("creative_mode") then - itemstack:add_wear(65535/(uses-1)) - end - - return itemstack -end - --- Define Hoes - -farming.register_hoe(":farming:hoe_wood", { - description = S("Wooden Hoe"), - inventory_image = "farming_tool_woodhoe.png", - max_uses = 500, - material = "group:planks" -}) - -farming.register_hoe(":farming:hoe_stone", { - description = S("Stone Hoe"), - inventory_image = "farming_tool_stonehoe.png", - max_uses = 1000, - material = "group:stone" -}) - -farming.register_hoe(":farming:hoe_steel", { - description = S("Steel Hoe"), - inventory_image = "farming_tool_steelhoe.png", - max_uses = 2000, - material = "core:iron_ingot" -}) - -farming.register_hoe(":farming:hoe_ironze", { - description = S("Ironze Hoe"), - inventory_image = "farming_tool_bronzehoe.png", - max_uses = 2500, - material = "core:ironze_ingot" -}) - -farming.register_hoe(":farming:hoe_mese", { - description = S("MESE Hoe"), - inventory_image = "farming_tool_mesehoe.png", - max_uses = 5000, - material = "core:mese_crystal" -}) - -farming.register_hoe(":farming:hoe_diamond", { - description = S("Diamond Hoe"), - inventory_image = "farming_tool_diamondhoe.png", - max_uses = 10000, - material = "core:diamond" -}) diff --git a/farming/init.lua b/farming/init.lua deleted file mode 100644 index 22b09be..0000000 --- a/farming/init.lua +++ /dev/null @@ -1,724 +0,0 @@ ---[[ - Minetest Farming Redo Mod 1.23 (12th November 2016) - by TenPlus1 - NEW growing routine by prestidigitator - auto-refill by crabman77 -]] - -farming = {} -farming.mod = "redo" -farming.path = minetest.get_modpath("farming") ---farming.hoe_on_use = default.hoe_on_use -farming.select = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} -} - -farming.DEBUG = false --- farming.DEBUG = {} -- Uncomment to turn on profiling code/functions - -local DEBUG_abm_runs = 0 -local DEBUG_abm_time = 0 -local DEBUG_timer_runs = 0 -local DEBUG_timer_time = 0 - -if farming.DEBUG then - - function farming.DEBUG.reset_times() - DEBUG_abm_runs = 0 - DEBUG_abm_time = 0 - DEBUG_timer_runs = 0 - DEBUG_timer_time = 0 - end - - function farming.DEBUG.report_times() - - local abm_n = DEBUG_abm_runs - local abm_dt = DEBUG_abm_time - local abm_avg = (abm_n > 0 and abm_dt / abm_n) or 0 - local timer_n = DEBUG_timer_runs - local timer_dt = DEBUG_timer_time - local timer_avg = (timer_n > 0 and timer_dt / timer_n) or 0 - local dt = abm_dt + timer_dt - - print("ABM ran for "..abm_dt.."µs over "..abm_n.." runs: "..abm_avg.."µs/run") - print("Timer ran for "..timer_dt.."µs over "..timer_n.." runs: "..timer_avg.."µs/run") - print("Total farming time: "..dt.."µs") - end -end - -local statistics = dofile(farming.path.."/statistics.lua") - --- Intllib - -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s) return s end -end -farming.intllib = S - --- Utility Functions - -local time_speed = tonumber(minetest.setting_get("time_speed")) or 72 -local SECS_PER_CYCLE = (time_speed > 0 and 24 * 60 * 60 / time_speed) or 0 - -local function clamp(x, min, max) - return (x < min and min) or (x > max and max) or x -end - -local function in_range(x, min, max) - return min <= x and x <= max -end - ---- Tests the amount of day or night time between two times. - -- - -- @param t_game - -- The current time, as reported by mintest.get_gametime(). - -- @param t_day - -- The current time, as reported by mintest.get_timeofday(). - -- @param dt - -- The amount of elapsed time. - -- @param count_day - -- If true, count elapsed day time. Otherwise, count elapsed night time. - -- @return - -- The amount of day or night time that has elapsed. - -local function day_or_night_time(t_game, t_day, dt, count_day) - - local t1_day = t_day - dt / SECS_PER_CYCLE - local t1_c, t2_c -- t1_c < t2_c and t2_c always in [0, 1) - - if count_day then - - if t_day < 0.25 then - t1_c = t1_day + 0.75 -- Relative to sunup, yesterday - t2_c = t_day + 0.75 - else - t1_c = t1_day - 0.25 -- Relative to sunup, today - t2_c = t_day - 0.25 - end - else - if t_day < 0.75 then - t1_c = t1_day + 0.25 -- Relative to sundown, yesterday - t2_c = t_day + 0.25 - else - t1_c = t1_day - 0.75 -- Relative to sundown, today - t2_c = t_day - 0.75 - end - end - - local dt_c = clamp(t2_c, 0, 0.5) - clamp(t1_c, 0, 0.5) -- this cycle - - if t1_c < -0.5 then - local nc = math.floor(-t1_c) - t1_c = t1_c + nc - dt_c = dt_c + 0.5 * nc + clamp(-t1_c - 0.5, 0, 0.5) - end - - return dt_c * SECS_PER_CYCLE -end - ---- Tests the amount of elapsed day time. - -- - -- @param dt - -- The amount of elapsed time. - -- @return - -- The amount of day time that has elapsed. - -- -local function day_time(dt) - return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, true) -end - ---- Tests the amount of elapsed night time. - -- - -- @param dt - -- The amount of elapsed time. - -- @return - -- The amount of night time that has elapsed. - -- -local function night_time(time_game, time_day, dt, count_day) - return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, false) -end - - --- Growth Logic - -local STAGE_LENGTH_AVG = 160.0 -local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 -local MIN_LIGHT = 13 -local MAX_LIGHT = 1000 - ---- Determines plant name and stage from node. - -- - -- Separates node name on the last underscore (_). - -- - -- @param node - -- Node or position table, or node name. - -- @return - -- List (plant_name, stage), or nothing (nil) if node isn't loaded - -local function plant_name_stage(node) - - local name - - if type(node) == 'table' then - - if node.name then - name = node.name - elseif node.x and node.y and node.z then - node = minetest.get_node_or_nil(node) - name = node and node.name - end - else - name = tostring(node) - end - - if not name or name == "ignore" then - return nil - end - - local sep_pos = name:find("_[^_]+$") - - if sep_pos and sep_pos > 1 then - - local stage = tonumber(name:sub(sep_pos + 1)) - - if stage and stage >= 0 then - return name:sub(1, sep_pos - 1), stage - end - end - - return name, 0 -end - --- Map from node name to --- { plant_name = ..., name = ..., stage = n, stages_left = { node_name, ... } } - -local plant_stages = {} - -farming.plant_stages = plant_stages - ---- Registers the stages of growth of a (possible plant) node. - -- - -- @param node - -- Node or position table, or node name. - -- @return - -- The (possibly zero) number of stages of growth the plant will go through - -- before being fully grown, or nil if not a plant. - -local register_plant_node - --- Recursive helper -local function reg_plant_stages(plant_name, stage, force_last) - - local node_name = plant_name and plant_name .. "_" .. stage - local node_def = node_name and minetest.registered_nodes[node_name] - - if not node_def then - return nil - end - - local stages = plant_stages[node_name] - - if stages then - return stages - end - - if minetest.get_item_group(node_name, "growing") > 0 then - - local ns = reg_plant_stages(plant_name, stage + 1, true) - local stages_left = (ns and { ns.name, unpack(ns.stages_left) }) or {} - - stages = { - plant_name = plant_name, - name = node_name, - stage = stage, - stages_left = stages_left - } - - if #stages_left > 0 then - - local old_constr = node_def.on_construct - local old_destr = node_def.on_destruct - - minetest.override_item(node_name, - { - on_construct = function(pos) - - if old_constr then - old_constr(pos) - end - - farming.handle_growth(pos) - end, - - on_destruct = function(pos) - - minetest.get_node_timer(pos):stop() - - if old_destr then - old_destr(pos) - end - end, - - on_timer = function(pos, elapsed) - return farming.plant_growth_timer(pos, elapsed, node_name) - end, - }) - end - - elseif force_last then - - stages = { - plant_name = plant_name, - name = node_name, - stage = stage, - stages_left = {} - } - else - return nil - end - - plant_stages[node_name] = stages - - return stages -end - -register_plant_node = function(node) - - local plant_name, stage = plant_name_stage(node) - - if plant_name then - - local stages = reg_plant_stages(plant_name, stage, false) - return stages and #stages.stages_left - else - return nil - end -end - -local function set_growing(pos, stages_left) - - if not stages_left then - return - end - - local timer = minetest.get_node_timer(pos) - - if stages_left > 0 then - - if not timer:is_started() then - - local stage_length = statistics.normal(STAGE_LENGTH_AVG, STAGE_LENGTH_DEV) - - stage_length = clamp(stage_length, 0.5 * STAGE_LENGTH_AVG, 3.0 * STAGE_LENGTH_AVG) - - timer:set(stage_length, -0.5 * math.random() * STAGE_LENGTH_AVG) - end - - elseif timer:is_started() then - timer:stop() - end -end - --- Detects a plant type node at the given position, starting --- or stopping the plant growth timer as appopriate - --- @param pos --- The node's position. --- @param node --- The cached node table if available, or nil. - -function farming.handle_growth(pos, node) - - if not pos then - return - end - - local stages_left = register_plant_node(node or pos) - - if stages_left then - set_growing(pos, stages_left) - end -end - -minetest.after(0, function() - - for _, node_def in pairs(minetest.registered_nodes) do - register_plant_node(node_def) - end -end) - -local abm_func = farming.handle_growth - -if farming.DEBUG then - - local normal_abm_func = abm_func - - abm_func = function(...) - - local t0 = minetest.get_us_time() - local r = { normal_abm_func(...) } - local t1 = minetest.get_us_time() - - DEBUG_abm_runs = DEBUG_abm_runs + 1 - DEBUG_abm_time = DEBUG_abm_time + (t1 - t0) - - return unpack(r) - end -end - --- Just in case a growing type or added node is missed (also catches existing --- nodes added to map before timers were incorporated). - -minetest.register_abm({ - nodenames = { "group:growing" }, - interval = 300, - chance = 1, - action = abm_func -}) - --- Plant timer function. --- Grows plants under the right conditions. - -function farming.plant_growth_timer(pos, elapsed, node_name) - - local stages = plant_stages[node_name] - - if not stages then - return false - end - - local max_growth = #stages.stages_left - - if max_growth <= 0 then - return false - end - - if stages.plant_name == "farming:cocoa" then - - if not minetest.find_node_near(pos, 1, - {"default:jungletree", "moretrees:jungletree_leaves_green"}) then - - return true - end - else - local under = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) - - if minetest.get_item_group(under.name, "soil") < 3 then - return true - end - end - - local growth - local light_pos = {x = pos.x, y = pos.y + 1, z = pos.z} - local lambda = elapsed / STAGE_LENGTH_AVG - - if lambda < 0.1 then - return true - end - - if max_growth == 1 or lambda < 2.0 then - - local light = (minetest.get_node_light(light_pos) or 0) - --print ("light level:", light) - - if not in_range(light, MIN_LIGHT, MAX_LIGHT) then - return true - end - - growth = 1 - else - local night_light = (minetest.get_node_light(light_pos, 0) or 0) - local day_light = (minetest.get_node_light(light_pos, 0.5) or 0) - local night_growth = in_range(night_light, MIN_LIGHT, MAX_LIGHT) - local day_growth = in_range(day_light, MIN_LIGHT, MAX_LIGHT) - - if not night_growth then - - if not day_growth then - return true - end - - lambda = day_time(elapsed) / STAGE_LENGTH_AVG - - elseif not day_growth then - - lambda = night_time(elapsed) / STAGE_LENGTH_AVG - end - - growth = statistics.poisson(lambda, max_growth) - - if growth < 1 then - return true - end - end - - if minetest.registered_nodes[stages.stages_left[growth]] then - local parm2 = minetest.get_node(pos).param2 - minetest.set_node(pos, {name = stages.stages_left[growth], param2 = parm2}) - else - return true - end - - return growth ~= max_growth -end - -if farming.DEBUG then - - local timer_func = farming.plant_growth_timer; - - farming.plant_growth_timer = function(pos, elapsed, node_name) - - local t0 = minetest.get_us_time() - local r = { timer_func(pos, elapsed, node_name) } - local t1 = minetest.get_us_time() - - DEBUG_timer_runs = DEBUG_timer_runs + 1 - DEBUG_timer_time = DEBUG_timer_time + (t1 - t0) - - return unpack(r) - end -end - --- refill placed plant by crabman (26/08/2015) -local can_refill_plant = { - ["farming:blueberry_1"] = "farming:blueberries", - ["farming:carrot_1"] = "farming:carrot", - ["farming:coffee_1"] = "farming:coffee_beans", - ["farming:corn_1"] = "farming:corn", - ["farming:cotton_1"] = "farming:seed_cotton", - ["farming:cucumber_1"] = "farming:cucumber", - ["farming:melon_1"] = "farming:melon_slice", - ["farming:potato_1"] = "farming:potato", - ["farming:pumpkin_1"] = "farming:pumpkin_slice", - ["farming:raspberry_1"] = "farming:raspberries", - ["farming:rhubarb_1"] = "farming:rhubarb", - ["farming:tomato_1"] = "farming:tomato", - ["farming:wheat_1"] = "farming:seed_wheat", - ["farming:grapes_1"] = "farming:grapes", - ["farming:beans_1"] = "farming:beans", - ["farming:rhubarb_1"] = "farming:rhubarb", - ["farming:cocoa_1"] = "farming:cocoa_beans", - ["farming:barley_1"] = "farming:seed_barley", -} - -function farming.refill_plant(player, plantname, index) - - local inv = player:get_inventory() - local old_stack = inv:get_stack("main", index) - - if old_stack:get_name() ~= "" then - return - end - - for i, stack in pairs(inv:get_list("main")) do - - if stack:get_name() == plantname and i ~= index then - - inv:set_stack("main", index, stack) - stack:clear() - inv:set_stack("main", i, stack) - --minetest.log("action", "farming: refilled stack("..plantname..") of " .. player:get_player_name() ) - return - end - end -end - --- Place Seeds on Soil - --- notes: croplike is ALWAYS mcore.options("croplike", false, false, false) - -function farming.place_seed(itemstack, placer, pointed_thing, plantname, croplike) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - - -- am I right-clicking on something that has a custom on_place set? - -- thanks to Krock for helping with this issue :) - local def = minetest.registered_nodes[under.name] - if def and def.on_rightclick then - return def.on_rightclick(pt.under, under, placer, itemstack) - end - - local above = minetest.get_node(pt.above) - - -- check if pointing at the top of the node - if pt.above.y ~= pt.under.y + 1 then - return - end - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- can I replace above node, and am I pointing at soil - if not minetest.registered_nodes[above.name].buildable_to - or minetest.get_item_group(under.name, "soil") < 2 - -- avoid multiple seed placement bug - or minetest.get_item_group(above.name, "plant") ~= 0 then - return - end - - -- if not protected then add node and remove 1 item from the itemstack - if not minetest.is_protected(pt.above, placer:get_player_name()) then - - if croplike == true then - - minetest.set_node(pt.above, {name = plantname, param2 = mcore.options("croplike", false, false, false)}) - - else - - minetest.set_node(pt.above, {name = plantname, param2 = 1}) - - end - - minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}) - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 - and can_refill_plant[plantname] then - - minetest.after(0.10, - farming.refill_plant, - placer, - can_refill_plant[plantname], - placer:get_wield_index() - ) - end - end - - return itemstack - end -end - --- Function to register plants (for compatibility) - -farming.register_plant = function(name, def) - - local mname = name:split(":")[1] - local pname = name:split(":")[2] - - -- Check def table - if not def.description then - def.description = S("Seed") - end - - if not def.inventory_image then - def.inventory_image = "unknown_item.png" - end - - if not def.steps then - return nil - end - - -- Register seed - minetest.register_node(":" .. mname .. ":seed_" .. pname, { - - description = def.description, - tiles = {def.inventory_image}, - inventory_image = def.inventory_image, - wield_image = def.inventory_image, - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, - pointed_thing, mname .. ":" .. pname .. "_1") - end, - }) - - -- Register harvest - minetest.register_craftitem(":" .. mname .. ":" .. pname, { - description = pname:gsub("^%l", string.upper), - inventory_image = mname .. "_" .. pname .. ".png", - }) - - -- Register growing steps - for i = 1, def.steps do - - local drop = { - items = { - {items = {mname .. ":" .. pname}, rarity = 9 - i}, - {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, - {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, - {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, - } - } - - local g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, growing = 1} - - -- Last step doesn't need growing=1 so Abm never has to check these - if i == def.steps then - g.growing = 0 - end - - local node_name = mname .. ":" .. pname .. "_" .. i - - minetest.register_node(node_name, { - drawtype = "plantlike", - waving = 1, - tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - drop = drop, - selection_box = farming.select, - groups = g, - sounds = default.node_sound_leaves_defaults(), - }) - --- register_plant_node(node_name) - end - - -- Return info - local r = {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} - return r -end - --- load crops - -dofile(farming.path.."/soil.lua") -dofile(farming.path.."/hoes.lua") -dofile(farming.path.."/grass.lua") -dofile(farming.path.."/wheat.lua") -dofile(farming.path.."/cotton.lua") -dofile(farming.path.."/carrot.lua") -dofile(farming.path.."/potato.lua") -dofile(farming.path.."/tomato.lua") -dofile(farming.path.."/cucumber.lua") -dofile(farming.path.."/corn.lua") -dofile(farming.path.."/coffee.lua") -dofile(farming.path.."/melon.lua") -dofile(farming.path.."/sugar.lua") -dofile(farming.path.."/pumpkin.lua") -dofile(farming.path.."/cocoa.lua") -dofile(farming.path.."/raspberry.lua") -dofile(farming.path.."/blueberry.lua") -dofile(farming.path.."/rhubarb.lua") -dofile(farming.path.."/beanpole.lua") -dofile(farming.path.."/grapes.lua") -dofile(farming.path.."/barley.lua") -dofile(farming.path.."/donut.lua") -dofile(farming.path.."/mapgen.lua") ---dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility ---dofile(farming.path.."/lucky_block.lua") diff --git a/farming/init.lua_orig b/farming/init.lua_orig deleted file mode 100644 index aee9976..0000000 --- a/farming/init.lua_orig +++ /dev/null @@ -1,192 +0,0 @@ ---[[ - Minetest Farming Redo Mod 1.14 (11th May 2015) - by TenPlus1 -]] - -farming = {} -farming.mod = "redo" -farming.path = minetest.get_modpath("farming") -farming.hoe_on_use = default.hoe_on_use - -dofile(farming.path.."/soil.lua") -dofile(farming.path.."/hoes.lua") -dofile(farming.path.."/grass.lua") -dofile(farming.path.."/wheat.lua") -dofile(farming.path.."/cotton.lua") -dofile(farming.path.."/carrot.lua") -dofile(farming.path.."/potato.lua") -dofile(farming.path.."/tomato.lua") -dofile(farming.path.."/cucumber.lua") -dofile(farming.path.."/corn.lua") -dofile(farming.path.."/coffee.lua") -dofile(farming.path.."/melon.lua") -dofile(farming.path.."/sugar.lua") -dofile(farming.path.."/pumpkin.lua") -dofile(farming.path.."/cocoa.lua") -dofile(farming.path.."/raspberry.lua") -dofile(farming.path.."/blueberry.lua") -dofile(farming.path.."/rhubarb.lua") -dofile(farming.path.."/beanpole.lua") -dofile(farming.path.."/donut.lua") -dofile(farming.path.."/mapgen.lua") -dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility - --- Place Seeds on Soil - -function farming.place_seed(itemstack, placer, pointed_thing, plantname) - local pt = pointed_thing - - -- check if pointing at a node - if not pt and pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local above = minetest.get_node(pt.above) - - -- check if pointing at the top of the node - if pt.above.y ~= pt.under.y+1 then - return - end - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- can I replace above node, and am I pointing at soil - if not minetest.registered_nodes[above.name].buildable_to - or minetest.get_item_group(under.name, "soil") < 2 - or minetest.get_item_group(above.name, "plant") ~= 0 then -- ADDED this line for multiple seed placement bug - return - end - - -- add the node and remove 1 item from the itemstack - if not minetest.is_protected(pt.above, placer:get_player_name()) then - minetest.add_node(pt.above, {name=plantname}) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end -end - --- Single ABM Handles Growing of All Plants - -minetest.register_abm({ - nodenames = {"group:growing"}, - neighbors = {"farming:soil_wet", "default:jungletree"}, - interval = 80, - chance = 2, - - action = function(pos, node) - - -- split plant name (e.g. farming:wheat_1) - local plant = node.name:split("_")[1].."_" - local numb = node.name:split("_")[2] - - -- fully grown ? - if not minetest.registered_nodes[plant..(numb + 1)] then return end - - -- cocoa pod on jungle tree ? - if plant ~= "farming:cocoa_" then - - -- growing on wet soil ? - if minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name ~= "farming:soil_wet" then return end - end - - -- enough light ? - if minetest.get_node_light(pos) < 13 then return end - - -- grow - minetest.set_node(pos, {name=plant..(numb + 1)}) - - end -}) - --- Function to register plants (for compatibility) - -farming.register_plant = function(name, def) - local mname = name:split(":")[1] - local pname = name:split(":")[2] - - -- Check def table - if not def.description then - def.description = "Seed" - end - if not def.inventory_image then - def.inventory_image = "unknown_item.png" - end - if not def.steps then - return nil - end - - -- Register seed - minetest.register_node(":" .. mname .. ":seed_" .. pname, { - description = def.description, - tiles = {def.inventory_image}, - inventory_image = def.inventory_image, - wield_image = def.inventory_image, - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":"..pname.."_1") - end - }) - - -- Register harvest - minetest.register_craftitem(":" .. mname .. ":" .. pname, { - description = pname:gsub("^%l", string.upper), - inventory_image = mname .. "_" .. pname .. ".png", - }) - - -- Register growing steps - for i=1,def.steps do - local drop = { - items = { - {items = {mname .. ":" .. pname}, rarity = 9 - i}, - {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, - {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, - {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, - } - } - - local g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, growing = 1} - -- Last step doesn't need growing=1 so Abm never has to check these - if i == def.steps then - g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} - end - - minetest.register_node(mname .. ":" .. pname .. "_" .. i, { - drawtype = "plantlike", - waving = 1, - tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - is_ground_content = true, - drop = drop, - selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, - groups = g, - sounds = default.node_sound_leaves_defaults(), - }) - end - - -- Return info - local r = {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} - return r -end - ---[[ Cotton (example, is already registered in cotton.lua) -farming.register_plant("farming:cotton", { - description = "Cotton seed", - inventory_image = "farming_cotton_seed.png", - steps = 8, -}) ---]] diff --git a/farming/license.txt b/farming/license.txt deleted file mode 100644 index fec6f6a..0000000 --- a/farming/license.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 TenPlus1 - -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. diff --git a/farming/locale/de.txt b/farming/locale/de.txt deleted file mode 100644 index 82cee4f..0000000 --- a/farming/locale/de.txt +++ /dev/null @@ -1,104 +0,0 @@ -# German Translation for farming mod -# Deutsche Übersetzung der farming Mod -# last update: 2016/March/31 -# Author: Xanthin - -#init.lua -Seed = Saatgut - -#barley.lua -Barley Seed = Gerstenkörner -Barley = Gerste - -#beanpole.lua -Green Beans = Grüne Bohnen -Bean Pole (place on soil before planting beans) = Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen) - -#blueberry.lua -Blueberries = Blaubeeren -Blueberry Muffin = Blaubeermuffin - -#carrot.lua -Carrot = Möhre -Golden Carrot = Goldene Möhre - -#cocoa.lua -Cocoa Beans = Kakaobohne -Cookie = Keks -Bar of Dark Chocolate = Tafel Zartbitterschokolade - -#coffee.lua -Coffee Beans = Kaffeebohnen -Drinking Cup (empty) = Tasse (leer) -Cold Cup of Coffee = Kalte Tasse Kaffee -Hot Cup of Coffee = Heiße Tasse Kaffee - -#corn.lua -Corn = Mais -Corn on the Cob = Maiskolben -Bottle of Ethanol = Flasche Ethanol - -#cotton.lua -Cotton Seed = Baumwollsamen -Cotton = Baumwolle - -#cucumber.lua -Cucumber = Gurke - -#donut.lua -Donut = Donut -Chocolate Donut = Schokodonut -Apple Donut = Apfeldonut - -#grapes.lua -Grapes = Weintrauben -Trellis (place on soil before planting grapes) = Spalier (vor dem Pflanzen der Weintrauben auf den\nAckerboden stellen) - -#hoes.lua -Hoe = Hacke -Wooden Hoe = Holzhacke -Stone Hoe = Steinhacke -Steel Hoe = Stahlhacke -Bronze Hoe = Bronzehacke -Mese Hoe = Mesehacke -Diamond Hoe = Diamanthacke - -#melon.lua -Melon Slice = Melonenscheibe -Melon = Melone - -#potato.lua -Potato = Kartoffel -Baked Potato = Ofenkartoffel - -#pumpkin.lua -Pumpkin = Kürbis -Pumpkin Slice = Kürbisscheibe -Jack 'O Lantern = Kürbislaterne -Pumpkin Bread = Kürbisbrot -Pumpkin Dough = Kürbisteig - -#rasperry.lua -Raspberries = Himbeeren -Raspberry Smoothie = Himbeersmoothie - -#rhubarb.lua -Rhubarb = Rhabarber -Rhubarb Pie = Rhabarberkuchen - -#soil.lua -Soil = Ackerboden -Wet Soil = Bewässerter Ackerboden - -#sugar.lua -Sugar = Zucker - -#tomato.lua -Tomato = Tomate - -#wheat.lua -Wheat Seed = Weizenkörner -Wheat = Weizen -Straw = Stroh -Flour = Mehl -Bread = Brot \ No newline at end of file diff --git a/farming/locale/template.txt b/farming/locale/template.txt deleted file mode 100644 index 6d067f5..0000000 --- a/farming/locale/template.txt +++ /dev/null @@ -1,102 +0,0 @@ -# Template for translations of farming mod -# last update: 2016/March/31 - -#init.lua -Seed = - -#barley.lua -Barley Seed = -Barley = - -#beanpole.lua -Green Beans = -Bean Pole (place on soil before planting beans) = - -#blueberry.lua -Blueberries = -Blueberry Muffin = - -#carrot.lua -Carrot = -Golden Carrot = - -#cocoa.lua -Cocoa Beans = -Cookie = -Bar of Dark Chocolate = - -#coffee.lua -Coffee Beans = -Drinking Cup (empty) = -Cold Cup of Coffee = -Hot Cup of Coffee = - -#corn.lua -Corn = -Corn on the Cob = -Bottle of Ethanol = - -#cotton.lua -Cotton Seed = -Cotton = - -#cucumber.lua -Cucumber = - -#donut.lua -Donut = -Chocolate Donut = -Apple Donut = - -#grapes.lua -Grapes = -Trellis (place on soil before planting grapes) = - -#hoes.lua -Hoe = -Wooden Hoe = -Stone Hoe = -Steel Hoe = -Bronze Hoe = -Mese Hoe = -Diamond Hoe = - -#melon.lua -Melon Slice = -Melon = - -#potato.lua -Potato = -Baked Potato = - -#pumpkin.lua -Pumpkin = -Pumpkin Slice = -Jack 'O Lantern = -Pumpkin Bread = -Pumpkin Dough = - -#rasperry.lua -Raspberries = -Raspberry Smoothie = - -#rhubarb.lua -Rhubarb = -Rhubarb Pie = - -#soil.lua -Soil = -Wet Soil = - -#sugar.lua -Sugar = - -#tomato.lua -Tomato = - -#wheat.lua -Wheat Seed = -Wheat = -Straw = -Flour = -Bread = \ No newline at end of file diff --git a/farming/mapgen.lua b/farming/mapgen.lua deleted file mode 100644 index 91306c7..0000000 --- a/farming/mapgen.lua +++ /dev/null @@ -1,66 +0,0 @@ --- decoration function -local function register_plant(name, min, max, spawnby, num) - minetest.register_decoration({ - deco_type = "simple", - place_on = {"core:grass"}, - param2=mcore.options("croplike", true, true, false), - sidelen = 80, - noise_params = { - offset = 0, - scale = 0.006, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_min = min, - y_max = max, - decoration = "farming:" .. name, - spawn_by = spawnby, - num_spawn_by = num, - }) -end - -function farming.register_mgv6_decorations() - register_plant("potato_3", 15, 40, "", -1) - register_plant("tomato_7", 5, 20, "", -1) - register_plant("carrot_8", 1, 30, "group:water", 1) - register_plant("cucumber_4", 1, 20, "group:water", 1) - register_plant("corn_7", 12, 22, "", -1) - register_plant("corn_8", 10, 20, "", -1) - register_plant("coffee_5", 20, 45, "", -1) - register_plant("melon_8", 1, 20, "group:water", 1) - register_plant("pumpkin", 1, 20, "group:water", 1) - register_plant("raspberry_4", 3, 10, "", -1) - register_plant("rhubarb_3", 3, 15, "", -1) - register_plant("blueberry_4", 3, 10, "", -1) - register_plant("beanbush", 18, 35, "", -1) - register_plant("grapebush", 25, 45, "", -1) -end - --- v7 maps have a beach so plants growing near water is limited to 6 high -function farming.register_mgv7_decorations() - register_plant("potato_3", 15, 40, "", -1) - register_plant("tomato_7", 5, 20, "", -1) - register_plant("carrot_8", 1, 30, "core:water_source", 1) - register_plant("cucumber_4", 1, 20, "core:water_source", 1) - register_plant("corn_7", 12, 22, "", -1) - register_plant("corn_8", 10, 20, "", -1) - register_plant("coffee_5", 20, 45, "", -1) - register_plant("melon_8", 1, 20, "core:water_source", 1) - register_plant("pumpkin", 1, 20, "core:water_source", 1) - register_plant("raspberry_4", 3, 10, "", -1) - register_plant("rhubarb_3", 3, 15, "", -1) - register_plant("blueberry_4", 3, 10, "", -1) - register_plant("beanbush", 18, 35, "", -1) - register_plant("grapebush", 25, 45, "", -1) -end - --- detect mapgen -local mg_name = minetest.get_mapgen_params().mgname - -if mg_name == "v6" then - farming.register_mgv6_decorations() -else - farming.register_mgv7_decorations() -end diff --git a/farming/melon.lua b/farming/melon.lua deleted file mode 100644 index e7894d8..0000000 --- a/farming/melon.lua +++ /dev/null @@ -1,82 +0,0 @@ - -local S = farming.intllib - --- melon -minetest.register_craftitem("farming:melon_slice", { - description = S("Melon Slice"), - inventory_image = "farming_melon_slice.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1", false) - end, - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = "farming:melon_8", - recipe = { - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - } -}) - -minetest.register_craft({ - output = "farming:melon_slice 9", - recipe = { - {"", "farming:melon_8", ""}, - } -}) - --- melon definition -local crop_def = { - drawtype = "mesh", - mesh = "farming_melon_1.b3d", - tiles = {"farming_melon.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 - -minetest.register_node("farming:melon_1", table.copy(crop_def)) - --- stage 2 -crop_def.mesh = "farming_melon_2.b3d" -minetest.register_node("farming:melon_2", table.copy(crop_def)) - --- stage 3 -crop_def.mesh = "farming_melon_3.b3d" -minetest.register_node("farming:melon_3", table.copy(crop_def)) - --- stage 4 -crop_def.mesh = "farming_melon_4.b3d" -minetest.register_node("farming:melon_4", table.copy(crop_def)) - --- stage 5 -crop_def.mesh = "farming_melon_5.b3d" -minetest.register_node("farming:melon_5", table.copy(crop_def)) - --- stage 6 -crop_def.mesh = "farming_melon_6.b3d" -minetest.register_node("farming:melon_6", table.copy(crop_def)) - --- stage 7 -crop_def.mesh = "farming_melon_7.b3d" -minetest.register_node("farming:melon_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.mesh = "farming_melon_8.b3d" -crop_def.walkable = true -crop_def.groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 2, plant = 1} -crop_def.drop = "farming:melon_slice 9" -minetest.register_node("farming:melon_8", table.copy(crop_def)) diff --git a/farming/mod.conf b/farming/mod.conf deleted file mode 100644 index 80ab8b0..0000000 --- a/farming/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = farming \ No newline at end of file diff --git a/farming/potato.lua b/farming/potato.lua deleted file mode 100644 index b67ef4e..0000000 --- a/farming/potato.lua +++ /dev/null @@ -1,78 +0,0 @@ - ---[[ - Original textures from DocFarming mod - https://forum.minetest.net/viewtopic.php?id=3948 -]] - -local S = farming.intllib - --- potato -minetest.register_craftitem("farming:potato", { - description = S("Potato"), - inventory_image = "farming_potato.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1", true) - end, - on_use = minetest.item_eat(1), -}) - --- baked potato -minetest.register_craftitem("farming:baked_potato", { - description = S("Baked Potato"), - inventory_image = "farming_baked_potato.png", - on_use = minetest.item_eat(4), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:baked_potato", - recipe = "farming:potato" -}) - --- potato definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_potato_1.png"}, - paramtype = "light", - paramtype2 = "meshoptions", - sunlight_propagates = true, - waving = 1, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:potato_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_potato_2.png"} -minetest.register_node("farming:potato_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_potato_3.png"} -crop_def.drop = { - items = { - {items = {'farming:potato'}, rarity = 1}, - {items = {'farming:potato'}, rarity = 3}, - } -} -minetest.register_node("farming:potato_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_potato_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:potato 2'}, rarity = 1}, - {items = {'farming:potato 3'}, rarity = 2}, - } -} -minetest.register_node("farming:potato_4", table.copy(crop_def)) diff --git a/farming/pumpkin.lua b/farming/pumpkin.lua deleted file mode 100644 index 311b852..0000000 --- a/farming/pumpkin.lua +++ /dev/null @@ -1,205 +0,0 @@ - ---[[ - Big thanks to PainterlyPack.net for allowing me to use these textures -]] - -local S = farming.intllib - --- pumpkin -minetest.register_node("farming:pumpkin", { - description = S("Pumpkin"), - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png" - }, - groups = { - choppy = 1, oddly_breakable_by_hand = 1, - flammable = 2, plant = 1 - }, - drop = { - items = { - {items = {'farming:pumpkin_slice 9'}, rarity = 1}, - } - }, - sounds = mcore.sound_wood, -}) - --- pumpkin slice -minetest.register_craftitem("farming:pumpkin_slice", { - description = S("Pumpkin Slice"), - inventory_image = "farming_pumpkin_slice.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1", true) - end, - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = "farming:pumpkin", - recipe = { - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - } -}) - -minetest.register_craft({ - output = "farming:pumpkin_slice 9", - recipe = { - {"", "farming:pumpkin", ""}, - } -}) - --- jack 'o lantern -minetest.register_node("farming:jackolantern", { - description = S("Jack 'O Lantern"), - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_off.png" - }, - paramtype2 = "facedir", - groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, - sounds = mcore.sound_wood, - on_punch = function(pos, node, puncher) - node.name = "farming:jackolantern_on" - minetest.swap_node(pos, node) - end, -}) - -minetest.register_node("farming:jackolantern_on", { - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_on.png" - }, - light_source = 14, - paramtype2 = "facedir", - groups = { - choppy = 1, oddly_breakable_by_hand = 1, flammable = 2, - not_in_creative_inventory = 1 - }, - sounds = mcore.sound_wood, - drop = "farming:jackolantern", - on_punch = function(pos, node, puncher) - node.name = "farming:jackolantern" - minetest.swap_node(pos, node) - end, -}) - -minetest.register_craft({ - output = "farming:jackolantern", - recipe = { - {"", "", ""}, - {"", "core:torch", ""}, - {"", "farming:pumpkin", ""}, - } -}) - --- pumpkin bread -minetest.register_craftitem("farming:pumpkin_bread", { - description = S("Pumpkin Bread"), - inventory_image = "farming_pumpkin_bread.png", - on_use = minetest.item_eat(8) -}) - -minetest.register_craftitem("farming:pumpkin_dough", { - description = S("Pumpkin Dough"), - inventory_image = "farming_pumpkin_dough.png", -}) - -minetest.register_craft({ - output = "farming:pumpkin_dough", - type = "shapeless", - recipe = {"farming:flour", "farming:pumpkin_slice", "farming:pumpkin_slice"} -}) - -minetest.register_craft({ - type = "cooking", - output = "farming:pumpkin_bread", - recipe = "farming:pumpkin_dough", - cooktime = 10 -}) - --- pumpkin definition -local crop_def = { - drawtype = "mesh", - mesh = "farming_melon_2.b3d", - tiles = {"farming_pumpkin_tiny.png^[colorize:#265c42aa"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:pumpkin_1", table.copy(crop_def)) - --- stage 2 -crop_def.mesh = "farming_melon_3.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4288"} -minetest.register_node("farming:pumpkin_2", table.copy(crop_def)) - --- stage 3 -crop_def.mesh = "farming_melon_4.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4277"} -minetest.register_node("farming:pumpkin_3", table.copy(crop_def)) - --- stage 4 -crop_def.mesh = "farming_melon_5.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4266"} -minetest.register_node("farming:pumpkin_4", table.copy(crop_def)) - --- stage 5 -crop_def.mesh = "farming_melon_6.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4255"} -minetest.register_node("farming:pumpkin_5", table.copy(crop_def)) - --- stage 6 -crop_def.mesh = "farming_melon_7.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4244"} -minetest.register_node("farming:pumpkin_6", table.copy(crop_def)) - --- stage 7 -crop_def.mesh = "farming_melon_8.b3d" -crop_def.tiles = {"farming_pumpkin_tiny.png^[colorize:#265c4233"} -minetest.register_node("farming:pumpkin_7", table.copy(crop_def)) - --- stage 8 (final) - -minetest.register_node("farming:pumpkin_8", { - description = S("Pumpkin"), - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png" - }, - groups = { - choppy = 1, oddly_breakable_by_hand = 1, - flammable = 2, plant = 1 - }, - drop = { - items = { - {items = {'farming:pumpkin_slice 9'}, rarity = 1}, - } - }, - sounds = mcore.sound_wood, -}) - -minetest.register_alias("farming:pumpkin", "farming:pumpkin_8") \ No newline at end of file diff --git a/farming/raspberry.lua b/farming/raspberry.lua deleted file mode 100644 index 6d203b9..0000000 --- a/farming/raspberry.lua +++ /dev/null @@ -1,70 +0,0 @@ - -local S = farming.intllib - --- raspberries -minetest.register_craftitem("farming:raspberries", { - description = S("Raspberries"), - inventory_image = "farming_raspberries.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1", true) - end, - on_use = minetest.item_eat(1), -}) - --- raspberry smoothie -minetest.register_craftitem("farming:smoothie_raspberry", { - description = S("Raspberry Smoothie"), - inventory_image = "farming_raspberry_smoothie.png", - on_use = minetest.item_eat(2, "vessels:drinking_glass"), -}) - -minetest.register_craft({ - output = "farming:smoothie_raspberry", - recipe = { - {"default:snow"}, - {"farming:raspberries"}, - {"vessels:drinking_glass"}, - } -}) - --- raspberries definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_raspberry_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:raspberry_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_raspberry_2.png"} -minetest.register_node("farming:raspberry_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_raspberry_3.png"} -minetest.register_node("farming:raspberry_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_raspberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:raspberries 2'}, rarity = 1}, - {items = {'farming:raspberries'}, rarity = 2}, - {items = {'farming:raspberries'}, rarity = 3}, - } -} -minetest.register_node("farming:raspberry_4", table.copy(crop_def)) diff --git a/farming/rhubarb.lua b/farming/rhubarb.lua deleted file mode 100644 index 04d30fe..0000000 --- a/farming/rhubarb.lua +++ /dev/null @@ -1,66 +0,0 @@ - -local S = farming.intllib - --- rhubarb -minetest.register_craftitem("farming:rhubarb", { - description = S("Rhubarb"), - inventory_image = "farming_rhubarb.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1", true) - end, - on_use = minetest.item_eat(1), -}) - --- rhubarb pie -minetest.register_craftitem("farming:rhubarb_pie", { - description = S("Rhubarb Pie"), - inventory_image = "farming_rhubarb_pie.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:rhubarb_pie", - recipe = { - {"", "farming:sugar", ""}, - {"farming:rhubarb", "farming:rhubarb", "farming:rhubarb"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - } -}) - --- rhubarb definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_rhubarb_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - paramtype2 = "meshoptions", - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:rhubarb_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_rhubarb_2.png"} -minetest.register_node("farming:rhubarb_2", table.copy(crop_def)) - --- stage 3 (final) -crop_def.tiles = {"farming_rhubarb_3.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:rhubarb 2'}, rarity = 1}, - {items = {'farming:rhubarb'}, rarity = 2}, - {items = {'farming:rhubarb'}, rarity = 3}, - } -} -minetest.register_node("farming:rhubarb_3", table.copy(crop_def)) diff --git a/farming/screenshot.png b/farming/screenshot.png deleted file mode 100644 index aba30f0..0000000 Binary files a/farming/screenshot.png and /dev/null differ diff --git a/farming/soil.lua b/farming/soil.lua deleted file mode 100644 index b6f53de..0000000 --- a/farming/soil.lua +++ /dev/null @@ -1,63 +0,0 @@ - -local S = farming.intllib - --- normal soil -minetest.register_node("farming:soil", { - description = S("Soil"), - tiles = {"core_dirt.png^farming_soil.png", "core_dirt.png"}, - drop = "core:dirt", - groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 2}, - sounds = mcore.sound_dirt, -}) - --- wet soil -minetest.register_node("farming:soil_wet", { - description = S("Wet Soil"), - tiles = {"core_dirt.png^farming_soil_wet.png", "core_dirt.png^farming_soil_wet_side.png"}, - drop = "core:dirt", - groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 3}, - sounds = mcore.sound_dirt, -}) - --- if water near soil then change to wet soil -minetest.register_abm({ - nodenames = {"farming:soil", "farming:soil_wet"}, - interval = 15, - chance = 4, - catch_up = false, - - action = function(pos, node) - - pos.y = pos.y + 1 - local nn = minetest.get_node_or_nil(pos) - pos.y = pos.y - 1 - - if nn then nn = nn.name else return end - - -- what's on top of soil, if solid/not plant change soil to dirt - if minetest.registered_nodes[nn] - and minetest.registered_nodes[nn].walkable - and minetest.get_item_group(nn, "plant") == 0 then - minetest.set_node(pos, {name = "core:dirt"}) - return - end - - -- if map around soil not loaded then skip until loaded - if minetest.find_node_near(pos, 3, {"ignore"}) then - return - end - - -- check if there is water nearby and change soil accordingly - if minetest.find_node_near(pos, 3, {"group:water"}) then - if node.name == "farming:soil" then - minetest.set_node(pos, {name = "farming:soil_wet"}) - end - - elseif node.name == "farming:soil_wet" then - minetest.set_node(pos, {name = "farming:soil"}) - - elseif node.name == "farming:soil" then - minetest.set_node(pos, {name = "core:dirt"}) - end - end, -}) \ No newline at end of file diff --git a/farming/statistics.lua b/farming/statistics.lua deleted file mode 100644 index c8defa2..0000000 --- a/farming/statistics.lua +++ /dev/null @@ -1,174 +0,0 @@ -local statistics = {} -local ROOT_2 = math.sqrt(2.0) - --- Approximations for erf(x) and erfInv(x) from --- https://en.wikipedia.org/wiki/Error_function - -local erf -local erf_inv - -local A = 8 * (math.pi - 3.0)/(3.0 * math.pi * (4.0 - math.pi)) -local B = 4.0 / math.pi -local C = 2.0/(math.pi * A) -local D = 1.0 / A - -erf = function(x) - - if x == 0 then return 0; end - - local xSq = x * x - local aXSq = A * xSq - local v = math.sqrt(1.0 - math.exp(-xSq * (B + aXSq) / (1.0 + aXSq))) - - return (x > 0 and v) or -v -end - -erf_inv = function(x) - - if x == 0 then return 0; end - - if x <= -1 or x >= 1 then return nil; end - - local y = math.log(1 - x * x) - local u = C + 0.5 * y - local v = math.sqrt(math.sqrt(u * u - D * y) - u) - - return (x > 0 and v) or -v -end - -local function std_normal(u) - return ROOT_2 * erf_inv(2.0 * u - 1.0) -end - -local poisson -local cdf_table = {} - -local function generate_cdf(lambda_index, lambda) - - local max = math.ceil(4 * lambda) - local pdf = math.exp(-lambda) - local cdf = pdf - local t = { [0] = pdf } - - for i = 1, max - 1 do - pdf = pdf * lambda / i - cdf = cdf + pdf - t[i] = cdf - end - - return t -end - -for li = 1, 100 do - cdf_table[li] = generate_cdf(li, 0.25 * li) -end - -poisson = function(lambda, max) - - if max < 2 then - return (math.random() < math.exp(-lambda) and 0) or 1 - elseif lambda >= 2 * max then - return max - end - - local u = math.random() - local lambda_index = math.floor(4 * lambda + 0.5) - local cdfs = cdf_table[lambda_index] - - if cdfs then - - lambda = 0.25 * lambda_index - - if u < cdfs[0] then return 0; end - if max > #cdfs then max = #cdfs + 1 else max = math.floor(max); end - if u >= cdfs[max - 1] then return max; end - - if max > 4 then -- Binary search - - local s = 0 - - while s + 1 < max do - - local m = math.floor(0.5 * (s + max)) - - if u < cdfs[m] then max = m; else s = m; end - end - else - for i = 1, max - 1 do - if u < cdfs[i] then return i; end - end - end - - return max - else - local x = lambda + math.sqrt(lambda) * std_normal(u) - - return (x < 0.5 and 0) or (x >= max - 0.5 and max) or math.floor(x + 0.5) - end -end - --- Error function. -statistics.erf = erf - --- Inverse error function. -statistics.erf_inv = erf_inv - ---- Standard normal distribution function (mean 0, standard deviation 1). - -- - -- @return - -- Any real number (actually between -3.0 and 3.0). - -statistics.std_normal = function() - - local u = math.random() - - if u < 0.001 then - return -3.0 - elseif u > 0.999 then - return 3.0 - end - - return std_normal(u) -end - ---- Standard normal distribution function (mean 0, standard deviation 1). - -- - -- @param mu - -- The distribution mean. - -- @param sigma - -- The distribution standard deviation. - -- @return - -- Any real number (actually between -3*sigma and 3*sigma). - -statistics.normal = function(mu, sigma) - - local u = math.random() - - if u < 0.001 then - return mu - 3.0 * sigma - elseif u > 0.999 then - return mu + 3.0 * sigma - end - - return mu + sigma * std_normal(u) -end - ---- Poisson distribution function. - -- - -- @param lambda - -- The distribution mean and variance. - -- @param max - -- The distribution maximum. - -- @return - -- An integer between 0 and max (both inclusive). - -statistics.poisson = function(lambda, max) - - lambda, max = tonumber(lambda), tonumber(max) - - if not lambda or not max or lambda <= 0 or max < 1 then return 0; end - - return poisson(lambda, max) -end - -return statistics diff --git a/farming/sugar.lua b/farming/sugar.lua deleted file mode 100644 index 4888c0c..0000000 --- a/farming/sugar.lua +++ /dev/null @@ -1,16 +0,0 @@ - -local S = farming.intllib - ---= Sugar - -minetest.register_craftitem("farming:sugar", { - description = S("Sugar"), - inventory_image = "farming_sugar.png", -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 3, - output = "farming:sugar 2", - recipe = "core:papyrus", -}) \ No newline at end of file diff --git a/farming/textures/banana_single.png b/farming/textures/banana_single.png deleted file mode 100644 index 87415a3..0000000 Binary files a/farming/textures/banana_single.png and /dev/null differ diff --git a/farming/textures/default_junglegrass.png b/farming/textures/default_junglegrass.png deleted file mode 100644 index 5d8cdbc..0000000 Binary files a/farming/textures/default_junglegrass.png and /dev/null differ diff --git a/farming/textures/farming_barley.png b/farming/textures/farming_barley.png deleted file mode 100644 index f0e7d29..0000000 Binary files a/farming/textures/farming_barley.png and /dev/null differ diff --git a/farming/textures/farming_barley_1.png b/farming/textures/farming_barley_1.png deleted file mode 100644 index 7fbbe77..0000000 Binary files a/farming/textures/farming_barley_1.png and /dev/null differ diff --git a/farming/textures/farming_barley_2.png b/farming/textures/farming_barley_2.png deleted file mode 100644 index 4555840..0000000 Binary files a/farming/textures/farming_barley_2.png and /dev/null differ diff --git a/farming/textures/farming_barley_3.png b/farming/textures/farming_barley_3.png deleted file mode 100644 index f5b12a6..0000000 Binary files a/farming/textures/farming_barley_3.png and /dev/null differ diff --git a/farming/textures/farming_barley_4.png b/farming/textures/farming_barley_4.png deleted file mode 100644 index 4859312..0000000 Binary files a/farming/textures/farming_barley_4.png and /dev/null differ diff --git a/farming/textures/farming_barley_5.png b/farming/textures/farming_barley_5.png deleted file mode 100644 index 412fcaa..0000000 Binary files a/farming/textures/farming_barley_5.png and /dev/null differ diff --git a/farming/textures/farming_barley_6.png b/farming/textures/farming_barley_6.png deleted file mode 100644 index c2b22dc..0000000 Binary files a/farming/textures/farming_barley_6.png and /dev/null differ diff --git a/farming/textures/farming_barley_7.png b/farming/textures/farming_barley_7.png deleted file mode 100644 index 7af8632..0000000 Binary files a/farming/textures/farming_barley_7.png and /dev/null differ diff --git a/farming/textures/farming_barley_seed.png b/farming/textures/farming_barley_seed.png deleted file mode 100644 index 7f3baa2..0000000 Binary files a/farming/textures/farming_barley_seed.png and /dev/null differ diff --git a/farming/textures/farming_coffee_cup.png b/farming/textures/farming_coffee_cup.png deleted file mode 100644 index 8e72dab..0000000 Binary files a/farming/textures/farming_coffee_cup.png and /dev/null differ diff --git a/farming/textures/farming_coffee_cup_hot.png b/farming/textures/farming_coffee_cup_hot.png deleted file mode 100644 index 87cb618..0000000 Binary files a/farming/textures/farming_coffee_cup_hot.png and /dev/null differ diff --git a/farming/textures/farming_donut_apple.png b/farming/textures/farming_donut_apple.png deleted file mode 100644 index c1b18f7..0000000 Binary files a/farming/textures/farming_donut_apple.png and /dev/null differ diff --git a/farming/textures/farming_wheat.png b/farming/textures/farming_wheat.png deleted file mode 100644 index 1e0ad3b..0000000 Binary files a/farming/textures/farming_wheat.png and /dev/null differ diff --git a/farming/textures/farming_wheat_1.png b/farming/textures/farming_wheat_1.png deleted file mode 100644 index c16ad94..0000000 Binary files a/farming/textures/farming_wheat_1.png and /dev/null differ diff --git a/farming/textures/farming_wheat_2.png b/farming/textures/farming_wheat_2.png deleted file mode 100644 index baddb4c..0000000 Binary files a/farming/textures/farming_wheat_2.png and /dev/null differ diff --git a/farming/textures/farming_wheat_3.png b/farming/textures/farming_wheat_3.png deleted file mode 100644 index 36ebb19..0000000 Binary files a/farming/textures/farming_wheat_3.png and /dev/null differ diff --git a/farming/textures/farming_wheat_4.png b/farming/textures/farming_wheat_4.png deleted file mode 100644 index 735ed77..0000000 Binary files a/farming/textures/farming_wheat_4.png and /dev/null differ diff --git a/farming/textures/farming_wheat_5.png b/farming/textures/farming_wheat_5.png deleted file mode 100644 index f40b5f0..0000000 Binary files a/farming/textures/farming_wheat_5.png and /dev/null differ diff --git a/farming/textures/farming_wheat_6.png b/farming/textures/farming_wheat_6.png deleted file mode 100644 index e9c78e0..0000000 Binary files a/farming/textures/farming_wheat_6.png and /dev/null differ diff --git a/farming/textures/farming_wheat_7.png b/farming/textures/farming_wheat_7.png deleted file mode 100644 index cc26ca9..0000000 Binary files a/farming/textures/farming_wheat_7.png and /dev/null differ diff --git a/farming/textures/farming_wheat_8.png b/farming/textures/farming_wheat_8.png deleted file mode 100644 index d050093..0000000 Binary files a/farming/textures/farming_wheat_8.png and /dev/null differ diff --git a/farming/textures/vessels_drinking_cup.png b/farming/textures/vessels_drinking_cup.png deleted file mode 100644 index 2eba232..0000000 Binary files a/farming/textures/vessels_drinking_cup.png and /dev/null differ diff --git a/farming/tomato.lua b/farming/tomato.lua deleted file mode 100644 index a1880df..0000000 --- a/farming/tomato.lua +++ /dev/null @@ -1,80 +0,0 @@ - ---[[ - Textures edited from: - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v2-9) -]] - -local S = farming.intllib - --- tomato -minetest.register_craftitem("farming:tomato", { - description = S("Tomato"), - inventory_image = "farming_tomato.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1", true) - end, - on_use = minetest.item_eat(1), -}) - --- tomato definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_tomato_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - waving = 1, - paramtype2 = "meshoptions", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = mcore.sound_plants, -} - --- stage 1 -minetest.register_node("farming:tomato_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_tomato_2.png"} -minetest.register_node("farming:tomato_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_tomato_3.png"} -minetest.register_node("farming:tomato_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_tomato_4.png"} -minetest.register_node("farming:tomato_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_tomato_5.png"} -minetest.register_node("farming:tomato_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_tomato_6.png"} -minetest.register_node("farming:tomato_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_tomato_7.png"} -crop_def.drop = { - items = { - {items = {'farming:tomato'}, rarity = 1}, - {items = {'farming:tomato'}, rarity = 3}, - } -} -minetest.register_node("farming:tomato_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_tomato_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:tomato 3'}, rarity = 1}, - {items = {'farming:tomato 3'}, rarity = 2}, - } -} -minetest.register_node("farming:tomato_8", table.copy(crop_def)) diff --git a/farming/wheat.lua b/farming/wheat.lua deleted file mode 100644 index 05fa476..0000000 --- a/farming/wheat.lua +++ /dev/null @@ -1,171 +0,0 @@ - -local S = farming.intllib - --- wheat seeds -minetest.register_node("farming:seed_wheat", { - description = S("Wheat Seed"), - tiles = {"farming_wheat_seed.png"}, - inventory_image = "farming_wheat_seed.png", - wield_image = "farming_wheat_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1", true) - end, -}) - --- harvested wheat -minetest.register_craftitem("farming:wheat", { - description = S("Wheat"), - inventory_image = "farming_wheat.png", -}) - --- straw -minetest.register_node("farming:straw", { - description = S("Straw"), - tiles = {"farming_straw.png"}, - is_ground_content = false, - groups = {snappy = 3, flammable = 4}, - sounds = mcore.sound_plants, -}) - -minetest.register_craft({ - output = "farming:straw 3", - recipe = { - {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - } -}) - -minetest.register_craft({ - output = "farming:wheat 3", - recipe = { - {"farming:straw"}, - } -}) - --- flour -minetest.register_craftitem("farming:flour", { - description = S("Flour"), - inventory_image = "farming_flour.png", -}) - -minetest.register_craft({ - type = "shapeless", - output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} -}) - --- bread -minetest.register_craftitem("farming:bread", { - description = S("Bread"), - inventory_image = "farming_bread.png", - on_use = minetest.item_eat(5), -}) - --- TOAAAAAAAAAAAAST - -minetest.register_craftitem("farming:toast", { - description = S("Toast (Not Suitable for making Reactors from.)"), - inventory_image = "farming_bread.png", - on_use = minetest.item_eat(7), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 15, - output = "farming:toast", - recipe = "farming:bread" -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 15, - output = "farming:bread", - recipe = "farming:flour" -}) - --- wheat definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_wheat_1.png"}, - paramtype = "light", - waving = 1, - paramtype2 = "meshoptions", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - --sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:wheat_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_wheat_2.png"} -minetest.register_node("farming:wheat_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_wheat_3.png"} -minetest.register_node("farming:wheat_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_wheat_4.png"} -minetest.register_node("farming:wheat_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_wheat_5.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 2}, - {items = {'farming:seed_wheat'}, rarity = 2}, - } -} -minetest.register_node("farming:wheat_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_wheat_6.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 2}, - {items = {'farming:seed_wheat'}, rarity = 1}, - } -} -minetest.register_node("farming:wheat_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_wheat_7.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 1}, - {items = {'farming:wheat'}, rarity = 3}, - {items = {'farming:seed_wheat'}, rarity = 1}, - {items = {'farming:seed_wheat'}, rarity = 3}, - } -} -minetest.register_node("farming:wheat_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_wheat_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 1}, - {items = {'farming:wheat'}, rarity = 3}, - {items = {'farming:seed_wheat'}, rarity = 1}, - {items = {'farming:seed_wheat'}, rarity = 3}, - } -} -minetest.register_node("farming:wheat_8", table.copy(crop_def)) diff --git a/mods/core/abm_timer.lua b/mods/core/abm_timer.lua index 407a425..e1e4719 100644 --- a/mods/core/abm_timer.lua +++ b/mods/core/abm_timer.lua @@ -77,7 +77,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"core:grass"}, + nodenames = {"core:grass", "core:dirt"}, interval = 30, chance = 2, action = function(pos) @@ -103,7 +103,7 @@ minetest.register_abm({ action = function(pos, node) local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - local is_soil = minetest.get_item_group(nu, "soil") + local is_soil = minetest.get_item_group(nu, "dirt") if is_soil == 0 then return @@ -121,7 +121,7 @@ minetest.register_abm({ action = function(pos, node) local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - local is_soil = minetest.get_item_group(nu, "soil") + local is_soil = minetest.get_item_group(nu, "dirt") if is_soil == 0 then return @@ -139,7 +139,7 @@ minetest.register_abm({ action = function(pos, node) local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - local is_soil = minetest.get_item_group(nu, "soil") + local is_soil = minetest.get_item_group(nu, "dirt") if is_soil == 0 then return @@ -158,7 +158,7 @@ minetest.register_abm({ action = function(pos, node) local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - local is_soil = minetest.get_item_group(nu, "soil") + local is_soil = minetest.get_item_group(nu, "dirt") if is_soil == 0 then return @@ -169,6 +169,24 @@ minetest.register_abm({ end, }) +minetest.register_abm({ + nodenames = {"core:wimba_sapling"}, + interval = 90, --70 + chance = 4, + action = function(pos, node) + + local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name + local is_soil = minetest.get_item_group(nu, "dirt") + + if is_soil == 0 then + return + end + + minetest.remove_node({x=pos.x, y=pos.y, z=pos.z}) + mcore.create_wimba_tree(pos) + end, +}) + minetest.register_abm({ nodenames = {"core:pine_sapling"}, interval = 70, --70 @@ -176,7 +194,7 @@ minetest.register_abm({ action = function(pos, node) local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - local is_soil = minetest.get_item_group(nu, "soil") + local is_soil = minetest.get_item_group(nu, "dirt") if is_soil == 0 then return diff --git a/mods/core/blocks.lua b/mods/core/blocks.lua index 6ecd1c7..104e1dd 100644 --- a/mods/core/blocks.lua +++ b/mods/core/blocks.lua @@ -5,7 +5,7 @@ minetest.register_node("core:dirt", { description = "Dirt", is_ground_content = true, drop = "core:dirt", - groups = {crumbly=3, soil=1, solid=1}, + groups = {crumbly=3, soil=1, solid=1, dirt=1}, sounds = mcore.sound_dirt, }) @@ -14,7 +14,7 @@ minetest.register_node("core:mud", { description = "Mud (Doesn't grow grass!)", is_ground_content = true, drop = "core:dirt", - groups = {crumbly=3, soil=1}, + groups = {crumbly=3, dirt=1}, sounds = mcore.sound_dirt, }) @@ -23,7 +23,7 @@ minetest.register_node("core:grass", { description = "Dirt with Grass", is_ground_content = true, drop = "core:dirt", - groups = {crumbly=3, soil=1, solid=1}, + groups = {crumbly=3, solid=1, dirt=1}, sounds = mcore.sound_grass, }) @@ -32,16 +32,7 @@ minetest.register_node("core:grass_wildland", { description = "Dirt with Grass", is_ground_content = true, drop = "core:dirt", - groups = {crumbly=3, soil=1, solid=1}, - sounds = mcore.sound_grass, -}) - -minetest.register_node("core:grasstest", { - tiles = {"core_grass.png"}, - description = "Dirt with Grass", - is_ground_content = true, - drop = "core:dirt", - groups = {crumbly=3, soil=1}, + groups = {crumbly=3, solid=1, dirt=1}, sounds = mcore.sound_grass, }) diff --git a/mods/core/mapgen.lua b/mods/core/mapgen.lua index 3db567a..d8dcbc2 100644 --- a/mods/core/mapgen.lua +++ b/mods/core/mapgen.lua @@ -43,9 +43,7 @@ function mcore.options(meshtype, horizontal, height, size) bit3 = 32 end - local retval = pshape+bit1+bit2+bit3 - - return retval + return pshape+bit1+bit2+bit3 end -- mapgen specific trees and mapgen saplings - mg_saplings grow trees with vmanip at mapgen diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/hunger.lua index effd25d..064ef57 100644 --- a/mods/hbhunger/hunger.lua +++ b/mods/hbhunger/hunger.lua @@ -114,336 +114,32 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound end end -if minetest.get_modpath("default") ~= nil then - hbhunger.register_food("default:apple", 2) +if minetest.get_modpath("naturum") then + hbhunger.register_food("naturum:bread", 6) + hbhunger.register_food("naturum:toast", 8) + hbhunger.register_food("naturum:potato", 1) + hbhunger.register_food("naturum:baked_potato", 6) + hbhunger.register_food("naturum:cucumber", 4) + hbhunger.register_food("naturum:tomato", 4) + hbhunger.register_food("naturum:carrot", 3) + hbhunger.register_food("naturum:corn", 3) + hbhunger.register_food("naturum:corn_cob", 5) + hbhunger.register_food("naturum:melon_slice", 2) + hbhunger.register_food("naturum:pumpkin_slice", 1) + hbhunger.register_food("naturum:pumpkin_bread", 9) + --hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") + --hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) + hbhunger.register_food("naturum:cookie", 2) + hbhunger.register_food("naturum:chocolate_dark", 3) + hbhunger.register_food("naturum:donut", 4) + hbhunger.register_food("naturum:donut_chocolate", 6) + hbhunger.register_food("naturum:raspberries", 1) + hbhunger.register_food("naturum:blueberries", 1) + hbhunger.register_food("naturum:muffin_blueberry", 4) + hbhunger.register_food("naturum:rhubarb", 1) + hbhunger.register_food("naturum:rhubarb_pie", 6) + hbhunger.register_food("naturum:beans", 1) end -if minetest.get_modpath("flowers") ~= nil then - hbhunger.register_food("flowers:mushroom_brown", 1) - hbhunger.register_food("flowers:mushroom_red", 1, "", 3) -end -if minetest.get_modpath("farming") ~= nil then - hbhunger.register_food("farming:bread", 4) -end - -if minetest.get_modpath("mobs") ~= nil then - if mobs.mod ~= nil and mobs.mod == "redo" then - hbhunger.register_food("mobs:cheese", 4) - hbhunger.register_food("mobs:meat", 8) - hbhunger.register_food("mobs:meat_raw", 4) - hbhunger.register_food("mobs:rat_cooked", 4) - hbhunger.register_food("mobs:honey", 2) - hbhunger.register_food("mobs:pork_raw", 3, "", 3) - hbhunger.register_food("mobs:pork_cooked", 8) - hbhunger.register_food("mobs:chicken_cooked", 6) - hbhunger.register_food("mobs:chicken_raw", 2, "", 3) - hbhunger.register_food("mobs:chicken_egg_fried", 2) - if minetest.get_modpath("bucket") then - hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty") - end - else - hbhunger.register_food("mobs:meat", 6) - hbhunger.register_food("mobs:meat_raw", 3) - hbhunger.register_food("mobs:rat_cooked", 5) - end -end - -if minetest.get_modpath("moretrees") ~= nil then - hbhunger.register_food("moretrees:coconut_milk", 1) - hbhunger.register_food("moretrees:raw_coconut", 2) - hbhunger.register_food("moretrees:acorn_muffin", 3) - hbhunger.register_food("moretrees:spruce_nuts", 1) - hbhunger.register_food("moretrees:pine_nuts", 1) - hbhunger.register_food("moretrees:fir_nuts", 1) -end - -if minetest.get_modpath("dwarves") ~= nil then - hbhunger.register_food("dwarves:beer", 2) - hbhunger.register_food("dwarves:apple_cider", 1) - hbhunger.register_food("dwarves:midus", 2) - hbhunger.register_food("dwarves:tequila", 2) - hbhunger.register_food("dwarves:tequila_with_lime", 2) - hbhunger.register_food("dwarves:sake", 2) -end - -if minetest.get_modpath("animalmaterials") ~= nil then - hbhunger.register_food("animalmaterials:milk", 2) - hbhunger.register_food("animalmaterials:meat_raw", 3) - hbhunger.register_food("animalmaterials:meat_pork", 3) - hbhunger.register_food("animalmaterials:meat_beef", 3) - hbhunger.register_food("animalmaterials:meat_chicken", 3) - hbhunger.register_food("animalmaterials:meat_lamb", 3) - hbhunger.register_food("animalmaterials:meat_venison", 3) - hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3) - hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5) - hbhunger.register_food("animalmaterials:meat_ostrich", 3) - hbhunger.register_food("animalmaterials:fish_bluewhite", 2) - hbhunger.register_food("animalmaterials:fish_clownfish", 2) -end - -if minetest.get_modpath("fishing") ~= nil then - hbhunger.register_food("fishing:fish_raw", 2) - hbhunger.register_food("fishing:fish_cooked", 5) - hbhunger.register_food("fishing:sushi", 6) - hbhunger.register_food("fishing:shark", 4) - hbhunger.register_food("fishing:shark_cooked", 8) - hbhunger.register_food("fishing:pike", 4) - hbhunger.register_food("fishing:pike_cooked", 8) -end - -if minetest.get_modpath("glooptest") ~= nil then - hbhunger.register_food("glooptest:kalite_lump", 1) -end - -if minetest.get_modpath("bushes") ~= nil then - hbhunger.register_food("bushes:sugar", 1) - hbhunger.register_food("bushes:strawberry", 2) - hbhunger.register_food("bushes:berry_pie_raw", 3) - hbhunger.register_food("bushes:berry_pie_cooked", 4) - hbhunger.register_food("bushes:basket_pies", 15) -end - -if minetest.get_modpath("bushes_classic") then - -- bushes_classic mod, as found in the plantlife modpack - local berries = { - "strawberry", - "blackberry", - "blueberry", - "raspberry", - "gooseberry", - "mixed_berry"} - for _, berry in ipairs(berries) do - if berry ~= "mixed_berry" then - hbhunger.register_food("bushes:"..berry, 1) - end - hbhunger.register_food("bushes:"..berry.."_pie_raw", 2) - hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5) - hbhunger.register_food("bushes:basket_"..berry, 15) - end -end - -if minetest.get_modpath("mushroom") ~= nil then - hbhunger.register_food("mushroom:brown", 1) - hbhunger.register_food("mushroom:red", 1, "", 3) - -- mushroom potions: red = strong poison, brown = light restorative - if minetest.get_modpath("vessels") then - hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) - hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10) - end -end - -if minetest.get_modpath("docfarming") ~= nil then - hbhunger.register_food("docfarming:carrot", 3) - hbhunger.register_food("docfarming:cucumber", 2) - hbhunger.register_food("docfarming:corn", 3) - hbhunger.register_food("docfarming:potato", 4) - hbhunger.register_food("docfarming:bakedpotato", 5) - hbhunger.register_food("docfarming:raspberry", 3) -end - -if minetest.get_modpath("farming_plus") ~= nil then - hbhunger.register_food("farming_plus:carrot_item", 3) - hbhunger.register_food("farming_plus:banana", 2) - hbhunger.register_food("farming_plus:orange_item", 2) - hbhunger.register_food("farming:pumpkin_bread", 4) - hbhunger.register_food("farming_plus:strawberry_item", 2) - hbhunger.register_food("farming_plus:tomato_item", 2) - hbhunger.register_food("farming_plus:potato_item", 4) - hbhunger.register_food("farming_plus:rhubarb_item", 2) -end - -if minetest.get_modpath("mtfoods") ~= nil then - hbhunger.register_food("mtfoods:dandelion_milk", 1) - hbhunger.register_food("mtfoods:sugar", 1) - hbhunger.register_food("mtfoods:short_bread", 4) - hbhunger.register_food("mtfoods:cream", 1) - hbhunger.register_food("mtfoods:chocolate", 2) - hbhunger.register_food("mtfoods:cupcake", 2) - hbhunger.register_food("mtfoods:strawberry_shortcake", 2) - hbhunger.register_food("mtfoods:cake", 3) - hbhunger.register_food("mtfoods:chocolate_cake", 3) - hbhunger.register_food("mtfoods:carrot_cake", 3) - hbhunger.register_food("mtfoods:pie_crust", 3) - hbhunger.register_food("mtfoods:apple_pie", 3) - hbhunger.register_food("mtfoods:rhubarb_pie", 2) - hbhunger.register_food("mtfoods:banana_pie", 3) - hbhunger.register_food("mtfoods:pumpkin_pie", 3) - hbhunger.register_food("mtfoods:cookies", 2) - hbhunger.register_food("mtfoods:mlt_burger", 5) - hbhunger.register_food("mtfoods:potato_slices", 2) - hbhunger.register_food("mtfoods:potato_chips", 3) - --mtfoods:medicine - hbhunger.register_food("mtfoods:casserole", 3) - hbhunger.register_food("mtfoods:glass_flute", 2) - hbhunger.register_food("mtfoods:orange_juice", 2) - hbhunger.register_food("mtfoods:apple_juice", 2) - hbhunger.register_food("mtfoods:apple_cider", 2) - hbhunger.register_food("mtfoods:cider_rack", 2) -end - -if minetest.get_modpath("fruit") ~= nil then - hbhunger.register_food("fruit:apple", 2) - hbhunger.register_food("fruit:pear", 2) - hbhunger.register_food("fruit:bananna", 3) - hbhunger.register_food("fruit:orange", 2) -end - -if minetest.get_modpath("mush45") ~= nil then - hbhunger.register_food("mush45:meal", 4) -end - -if minetest.get_modpath("seaplants") ~= nil then - hbhunger.register_food("seaplants:kelpgreen", 1) - hbhunger.register_food("seaplants:kelpbrown", 1) - hbhunger.register_food("seaplants:seagrassgreen", 1) - hbhunger.register_food("seaplants:seagrassred", 1) - hbhunger.register_food("seaplants:seasaladmix", 6) - hbhunger.register_food("seaplants:kelpgreensalad", 1) - hbhunger.register_food("seaplants:kelpbrownsalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) -end - -if minetest.get_modpath("mobfcooking") ~= nil then - hbhunger.register_food("mobfcooking:cooked_pork", 6) - hbhunger.register_food("mobfcooking:cooked_ostrich", 6) - hbhunger.register_food("mobfcooking:cooked_beef", 6) - hbhunger.register_food("mobfcooking:cooked_chicken", 6) - hbhunger.register_food("mobfcooking:cooked_lamb", 6) - hbhunger.register_food("mobfcooking:cooked_venison", 6) - hbhunger.register_food("mobfcooking:cooked_fish", 6) -end - -if minetest.get_modpath("creatures") ~= nil then - hbhunger.register_food("creatures:meat", 6) - hbhunger.register_food("creatures:flesh", 3) - hbhunger.register_food("creatures:rotten_flesh", 3, "", 3) -end - -if minetest.get_modpath("ethereal") then - hbhunger.register_food("ethereal:strawberry", 1) - hbhunger.register_food("ethereal:banana", 4) - hbhunger.register_food("ethereal:pine_nuts", 1) - hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) - hbhunger.register_food("ethereal:fern_tubers", 1) - hbhunger.register_food("ethereal:banana_bread", 7) - hbhunger.register_food("ethereal:mushroom_plant", 2) - hbhunger.register_food("ethereal:coconut_slice", 2) - hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) - hbhunger.register_food("ethereal:wild_onion_plant", 2) - hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") - hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") - hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3) - hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") - if minetest.get_modpath("bucket") then - hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty") - end - hbhunger.register_food("ethereal:fish_raw", 2) - hbhunger.register_food("ethereal:fish_cooked", 5) - hbhunger.register_food("ethereal:seaweed", 1) - hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) - hbhunger.register_food("ethereal:sashimi", 4) - hbhunger.register_food("ethereal:orange", 2) -end - -if minetest.get_modpath("farming") and farming.mod == "redo" then - hbhunger.register_food("farming:bread", 6) - hbhunger.register_food("farming:potato", 1) - hbhunger.register_food("farming:baked_potato", 6) - hbhunger.register_food("farming:cucumber", 4) - hbhunger.register_food("farming:tomato", 4) - hbhunger.register_food("farming:carrot", 3) - hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) - hbhunger.register_food("farming:corn", 3) - hbhunger.register_food("farming:corn_cob", 5) - hbhunger.register_food("farming:melon_slice", 2) - hbhunger.register_food("farming:pumpkin_slice", 1) - hbhunger.register_food("farming:pumpkin_bread", 9) - hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") - hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) - hbhunger.register_food("farming:cookie", 2) - hbhunger.register_food("farming:chocolate_dark", 3) - hbhunger.register_food("farming:donut", 4) - hbhunger.register_food("farming:donut_chocolate", 6) - hbhunger.register_food("farming:donut_apple", 6) - hbhunger.register_food("farming:raspberries", 1) - hbhunger.register_food("farming:blueberries", 1) - hbhunger.register_food("farming:muffin_blueberry", 4) - if minetest.get_modpath("vessels") then - hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") - end - hbhunger.register_food("farming:rhubarb", 1) - hbhunger.register_food("farming:rhubarb_pie", 6) - hbhunger.register_food("farming:beans", 1) -end - -if minetest.get_modpath("kpgmobs") ~= nil then - hbhunger.register_food("kpgmobs:uley", 3) - hbhunger.register_food("kpgmobs:meat", 6) - hbhunger.register_food("kpgmobs:rat_cooked", 5) - hbhunger.register_food("kpgmobs:med_cooked", 4) - if minetest.get_modpath("bucket") then - hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") - end -end - -if minetest.get_modpath("jkfarming") ~= nil then - hbhunger.register_food("jkfarming:carrot", 3) - hbhunger.register_food("jkfarming:corn", 3) - hbhunger.register_food("jkfarming:melon_part", 2) - hbhunger.register_food("jkfarming:cake", 3) -end - -if minetest.get_modpath("jkanimals") ~= nil then - hbhunger.register_food("jkanimals:meat", 6) -end - -if minetest.get_modpath("jkwine") ~= nil then - hbhunger.register_food("jkwine:grapes", 2) - hbhunger.register_food("jkwine:winebottle", 1) -end - -if minetest.get_modpath("cooking") ~= nil then - hbhunger.register_food("cooking:meat_beef_cooked", 4) - hbhunger.register_food("cooking:fish_bluewhite_cooked", 3) - hbhunger.register_food("cooking:fish_clownfish_cooked", 1) - hbhunger.register_food("cooking:meat_chicken_cooked", 2) - hbhunger.register_food("cooking:meat_cooked", 2) - hbhunger.register_food("cooking:meat_pork_cooked", 3) - hbhunger.register_food("cooking:meat_toxic_cooked", -3) - hbhunger.register_food("cooking:meat_venison_cooked", 3) - hbhunger.register_food("cooking:meat_undead_cooked", 1) -end - --- ferns mod of plantlife_modpack -if minetest.get_modpath("ferns") ~= nil then - hbhunger.register_food("ferns:fiddlehead", 1, "", 1) - hbhunger.register_food("ferns:fiddlehead_roasted", 3) - hbhunger.register_food("ferns:ferntuber_roasted", 3) - hbhunger.register_food("ferns:horsetail_01", 1) -end - -if minetest.get_modpath("pizza") ~= nil then - hbhunger.register_food("pizza:pizza", 30, "", nil, 30) - hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5) -end - -if minetest.get_modpath("nssm") then - hbhunger.register_food("nssm:werewolf_leg", 3) - hbhunger.register_food("nssm:heron_leg", 2) - hbhunger.register_food("nssm:chichibios_heron_leg", 4) - hbhunger.register_food("nssm:crocodile_tail", 3) - hbhunger.register_food("nssm:duck_legs", 1) - hbhunger.register_food("nssm:ant_leg", 1) - hbhunger.register_food("nssm:spider_leg", 1) - hbhunger.register_food("nssm:tentacle", 2) - hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous - hbhunger.register_food("nssm:amphibian_heart", 1) - hbhunger.register_food("nssm:raw_scrausics_wing", 1) - -- superfoods - hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20) - hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20) -end - -- player-action based hunger changes function hbhunger.handle_node_actions(pos, oldnode, player, ext) -- is_fake_player comes from the pipeworks, we are not interested in those diff --git a/mods/naturum/depends.txt b/mods/naturum/depends.txt new file mode 100644 index 0000000..0f31176 --- /dev/null +++ b/mods/naturum/depends.txt @@ -0,0 +1 @@ +core \ No newline at end of file diff --git a/mods/naturum/farmland.lua b/mods/naturum/farmland.lua new file mode 100644 index 0000000..7d804c6 --- /dev/null +++ b/mods/naturum/farmland.lua @@ -0,0 +1,46 @@ +-- naturum +-- replacement for farming_plus +-- License: MIT + +--timer:start(55+math.random(-20, 20)) +local function drink_water(pos) + for x=-4, 4 do + for y=-2, -1 do + for z=-4, 4 do + local node = minetest.get_node({x=pos.x + x, y = pos.y + y, z = pos.z + z}) + if node.name == "core:water_flowing" then + return true + elseif node.name == "core:water_source" then + return true + end + end + end + end + + return false +end + +minetest.register_node("naturum:soil", { + description = "well played, you shouldn't have this", + tiles = {"core_dirt.png^farming_soil.png", "core_dirt.png"}, + sounds = mcore.sound_dirt, + groups = {crumbly=3, soil=1, solid=1, dirt=1}, + drop = "core:dirt", + + on_timer = function(pos, elapsed) + if drink_water(pos) then + minetest.set_node(pos, {name = "naturum:soil_wet"}) + return false + else + return true + end + end, +}) + +minetest.register_node("naturum:soil_wet", { + description = "well played, you shouldn't have this", + tiles = {"core_dirt.png^farming_soil_wet.png", "core_dirt.png"}, + sounds = mcore.sound_dirt, + groups = {crumbly=3, soil=1, solid=1, dirt=1}, + drop = "core:dirt", +}) \ No newline at end of file diff --git a/mods/naturum/grow_lib.lua b/mods/naturum/grow_lib.lua new file mode 100644 index 0000000..4c4f084 --- /dev/null +++ b/mods/naturum/grow_lib.lua @@ -0,0 +1,83 @@ +-- naturum +-- replacement for farming_plus +-- License: what's a license + +-- register you plants here: + +-- information about registering your plants: + +--[[ + + time is the time in seconds for the current plant stage to grow + chance is the random chance for the plant to grow when the timer is called + current_node is the node that will be going from a to b + time_next is the time in seconds for the next plant stage to grow + next_node is the node that the plant will grow into + farm_dry is the node that the plant will need to be watered + farmland is the nodes below the plant that might be valid for it to grow, + farmland is the node that the plant will grow on without issues + drink is a bool whether wet soil is enough to grow the plant +]]-- + +local function emit_particle(p_texture, p_pos) + minetest.add_particle({ + pos = { + x = p_pos.x + (math.random(-5, 5) / 100), + y = (p_pos.y + 0.35) + (math.random(-15, 5) / 100), + z = p_pos.z + (math.random(-5, 5) / 100), + }, + vel = { + x = 0.0, + y = math.random(13, 19) / 100, + z = 0.0, + }, + expirationtime = math.random(8, 12) / 10, + size = math.random(175, 225) / 100, + collisiondetection = true, + texture = p_texture, + glow = 8, + }) +end + +function naturum.plant_grow_stage(time, chance, current_node, time_next, next_node, farm_dry, farmland, drink) + -- override nodes here: + minetest.override_item(current_node, { + on_timer = function(pos, elapsed) + -- grow to next plant + if chance == 1 or math.random(1, chance) == 1 then + local can_grow = false + + -- check for light + if minetest.get_node_light(pos) < 8 then + emit_particle("naturum_light.png^naturum_question.png", pos) + return true + end + + local f_pos = table.copy(pos) + f_pos.y = f_pos.y - 1 + local farm = minetest.get_node(f_pos) + + if farm.name == farm_dry then + emit_particle("bucket_water.png^naturum_question.png", pos) + return true + elseif farm.name == farmland then + can_grow = true + minetest.set_node({x = pos.x, y = pos.y-1, z = pos.z}, {name = farm_dry}) + local timer = minetest.get_node_timer({x = pos.x, y = pos.y-1, z = pos.z}) + timer:start(55+math.random(-20, 20)) + else + emit_particle("farming_tool_steelhoe.png^naturum_question.png", pos) + end + + if can_grow then + minetest.swap_node(pos, {name = next_node}) --keeps param2 btw + local timer = minetest.get_node_timer(pos) + timer:start(time_next+math.random(-20, 20)) + return true + end + end + + return true + end, + }) +end \ No newline at end of file diff --git a/mods/naturum/init.lua b/mods/naturum/init.lua index 62f3758..98e4e18 100644 --- a/mods/naturum/init.lua +++ b/mods/naturum/init.lua @@ -1,6 +1,6 @@ -- naturum --- replacement for farming_plus by tenplus1 --- License: WTFPL because i simply do not give a shit since this is a hobby at this point +-- replacement for farming_plus +-- License: what's a license -- things to alias from farming plus: @@ -45,7 +45,7 @@ compost barrel recipes: dust + water = clay - 8 compostable foods + time = 1 dirt + 8 compostable items + time = 1 dirt water + lava + iron compost barrel = obsidian ]] @@ -88,4 +88,34 @@ coffee (and lava coffee) coffee machine -]] \ No newline at end of file +]] + +-- Init all the TINGS + +naturum = {} + +-- kickstart our ~~workbench~~ sub components + +dofile(minetest.get_modpath("naturum").."/grow_lib.lua") +dofile(minetest.get_modpath("naturum").."/mapgen.lua") +dofile(minetest.get_modpath("naturum").."/wheat.lua") +dofile(minetest.get_modpath("naturum").."/farmland.lua") +--dofile(minetest.get_modpath("naturum").."/potato.lua") +--dofile(minetest.get_modpath("naturum").."/carrot.lua") +--dofile(minetest.get_modpath("naturum").."/pumpkin.lua") +--dofile(minetest.get_modpath("naturum").."/melon.lua") +--dofile(minetest.get_modpath("naturum").."/cocoa.lua") +--dofile(minetest.get_modpath("naturum").."/corn.lua") +--dofile(minetest.get_modpath("naturum").."/cucumber.lua") +--dofile(minetest.get_modpath("naturum").."/rhubarb.lua") +--dofile(minetest.get_modpath("naturum").."/sugar.lua") +--dofile(minetest.get_modpath("naturum").."/tomato.lua") +--dofile(minetest.get_modpath("naturum").."/crammer.lua") +--dofile(minetest.get_modpath("naturum").."/berries.lua") +--dofile(minetest.get_modpath("naturum").."/melon.lua") +--dofile(minetest.get_modpath("naturum").."/coffee.lua") +--dofile(minetest.get_modpath("naturum").."/salt.lua") + +--dofile(minetest.get_modpath("naturum").."/utensils.lua") +--dofile(minetest.get_modpath("naturum").."/crafting.lua") +--dofile(minetest.get_modpath("naturum").."/food.lua") \ No newline at end of file diff --git a/mods/naturum/mapgen.lua b/mods/naturum/mapgen.lua new file mode 100644 index 0000000..5d7f119 --- /dev/null +++ b/mods/naturum/mapgen.lua @@ -0,0 +1,30 @@ +-- naturum +-- replacement for farming_plus +-- License: what's a license + +--[[ + + How to add plants to mapgen: + + biome is a table of strings that are valid biomes for the plant to spawn in + node is the target plant to be spawned into the world + plant_on is the node, or table of strings that the plant can be planted onto + fill is the ratio of the biome being filled with the selected plant + div is the number of divisions of a 5x5x5 area of 16^3 chunks + nearby is a node, or table of strings containing target nodes for the plant to spawn near + +]]-- + +function naturum.register_mapgen(biome, node, plant_on, fill, div, nearby, near_num) + minetest.register_decoration({ + deco_type = "simple", + biomes = biome, + height = 1, + decoration = {node}, + spawn_by = nearby, + sidelen = div, + fill_ratio = fill, + place_on = plant_on, + num_spawn_by = near_num + }) +end \ No newline at end of file diff --git a/farming/models/farming_cocoa_1.b3d b/mods/naturum/models/farming_cocoa_1.b3d similarity index 100% rename from farming/models/farming_cocoa_1.b3d rename to mods/naturum/models/farming_cocoa_1.b3d diff --git a/farming/models/farming_cocoa_2.b3d b/mods/naturum/models/farming_cocoa_2.b3d similarity index 100% rename from farming/models/farming_cocoa_2.b3d rename to mods/naturum/models/farming_cocoa_2.b3d diff --git a/farming/models/farming_melon_1.b3d b/mods/naturum/models/farming_melon_1.b3d similarity index 100% rename from farming/models/farming_melon_1.b3d rename to mods/naturum/models/farming_melon_1.b3d diff --git a/farming/models/farming_melon_2.b3d b/mods/naturum/models/farming_melon_2.b3d similarity index 100% rename from farming/models/farming_melon_2.b3d rename to mods/naturum/models/farming_melon_2.b3d diff --git a/farming/models/farming_melon_3.b3d b/mods/naturum/models/farming_melon_3.b3d similarity index 100% rename from farming/models/farming_melon_3.b3d rename to mods/naturum/models/farming_melon_3.b3d diff --git a/farming/models/farming_melon_4.b3d b/mods/naturum/models/farming_melon_4.b3d similarity index 100% rename from farming/models/farming_melon_4.b3d rename to mods/naturum/models/farming_melon_4.b3d diff --git a/farming/models/farming_melon_5.b3d b/mods/naturum/models/farming_melon_5.b3d similarity index 100% rename from farming/models/farming_melon_5.b3d rename to mods/naturum/models/farming_melon_5.b3d diff --git a/farming/models/farming_melon_6.b3d b/mods/naturum/models/farming_melon_6.b3d similarity index 100% rename from farming/models/farming_melon_6.b3d rename to mods/naturum/models/farming_melon_6.b3d diff --git a/farming/models/farming_melon_7.b3d b/mods/naturum/models/farming_melon_7.b3d similarity index 100% rename from farming/models/farming_melon_7.b3d rename to mods/naturum/models/farming_melon_7.b3d diff --git a/farming/models/farming_melon_8.b3d b/mods/naturum/models/farming_melon_8.b3d similarity index 100% rename from farming/models/farming_melon_8.b3d rename to mods/naturum/models/farming_melon_8.b3d diff --git a/farming/textures/farming_baked_potato.png b/mods/naturum/textures/farming_baked_potato.png similarity index 100% rename from farming/textures/farming_baked_potato.png rename to mods/naturum/textures/farming_baked_potato.png diff --git a/farming/textures/farming_beanbush.png b/mods/naturum/textures/farming_beanbush.png similarity index 100% rename from farming/textures/farming_beanbush.png rename to mods/naturum/textures/farming_beanbush.png diff --git a/farming/textures/farming_beanpole.png b/mods/naturum/textures/farming_beanpole.png similarity index 100% rename from farming/textures/farming_beanpole.png rename to mods/naturum/textures/farming_beanpole.png diff --git a/farming/textures/farming_beanpole_1.png b/mods/naturum/textures/farming_beanpole_1.png similarity index 100% rename from farming/textures/farming_beanpole_1.png rename to mods/naturum/textures/farming_beanpole_1.png diff --git a/farming/textures/farming_beanpole_2.png b/mods/naturum/textures/farming_beanpole_2.png similarity index 100% rename from farming/textures/farming_beanpole_2.png rename to mods/naturum/textures/farming_beanpole_2.png diff --git a/farming/textures/farming_beanpole_3.png b/mods/naturum/textures/farming_beanpole_3.png similarity index 100% rename from farming/textures/farming_beanpole_3.png rename to mods/naturum/textures/farming_beanpole_3.png diff --git a/farming/textures/farming_beanpole_4.png b/mods/naturum/textures/farming_beanpole_4.png similarity index 100% rename from farming/textures/farming_beanpole_4.png rename to mods/naturum/textures/farming_beanpole_4.png diff --git a/farming/textures/farming_beanpole_5.png b/mods/naturum/textures/farming_beanpole_5.png similarity index 100% rename from farming/textures/farming_beanpole_5.png rename to mods/naturum/textures/farming_beanpole_5.png diff --git a/farming/textures/farming_beans.png b/mods/naturum/textures/farming_beans.png similarity index 100% rename from farming/textures/farming_beans.png rename to mods/naturum/textures/farming_beans.png diff --git a/farming/textures/farming_blueberries.png b/mods/naturum/textures/farming_blueberries.png similarity index 100% rename from farming/textures/farming_blueberries.png rename to mods/naturum/textures/farming_blueberries.png diff --git a/farming/textures/farming_blueberry_1.png b/mods/naturum/textures/farming_blueberry_1.png similarity index 100% rename from farming/textures/farming_blueberry_1.png rename to mods/naturum/textures/farming_blueberry_1.png diff --git a/farming/textures/farming_blueberry_2.png b/mods/naturum/textures/farming_blueberry_2.png similarity index 100% rename from farming/textures/farming_blueberry_2.png rename to mods/naturum/textures/farming_blueberry_2.png diff --git a/farming/textures/farming_blueberry_3.png b/mods/naturum/textures/farming_blueberry_3.png similarity index 100% rename from farming/textures/farming_blueberry_3.png rename to mods/naturum/textures/farming_blueberry_3.png diff --git a/farming/textures/farming_blueberry_4.png b/mods/naturum/textures/farming_blueberry_4.png similarity index 100% rename from farming/textures/farming_blueberry_4.png rename to mods/naturum/textures/farming_blueberry_4.png diff --git a/farming/textures/farming_blueberry_muffin.png b/mods/naturum/textures/farming_blueberry_muffin.png similarity index 100% rename from farming/textures/farming_blueberry_muffin.png rename to mods/naturum/textures/farming_blueberry_muffin.png diff --git a/farming/textures/farming_bottle_ethanol.png b/mods/naturum/textures/farming_bottle_ethanol.png similarity index 100% rename from farming/textures/farming_bottle_ethanol.png rename to mods/naturum/textures/farming_bottle_ethanol.png diff --git a/farming/textures/farming_bread.png b/mods/naturum/textures/farming_bread.png similarity index 100% rename from farming/textures/farming_bread.png rename to mods/naturum/textures/farming_bread.png diff --git a/farming/textures/farming_carrot.png b/mods/naturum/textures/farming_carrot.png similarity index 100% rename from farming/textures/farming_carrot.png rename to mods/naturum/textures/farming_carrot.png diff --git a/farming/textures/farming_carrot_1.png b/mods/naturum/textures/farming_carrot_1.png similarity index 100% rename from farming/textures/farming_carrot_1.png rename to mods/naturum/textures/farming_carrot_1.png diff --git a/farming/textures/farming_carrot_2.png b/mods/naturum/textures/farming_carrot_2.png similarity index 100% rename from farming/textures/farming_carrot_2.png rename to mods/naturum/textures/farming_carrot_2.png diff --git a/farming/textures/farming_carrot_3.png b/mods/naturum/textures/farming_carrot_3.png similarity index 100% rename from farming/textures/farming_carrot_3.png rename to mods/naturum/textures/farming_carrot_3.png diff --git a/farming/textures/farming_carrot_4.png b/mods/naturum/textures/farming_carrot_4.png similarity index 100% rename from farming/textures/farming_carrot_4.png rename to mods/naturum/textures/farming_carrot_4.png diff --git a/farming/textures/farming_carrot_5.png b/mods/naturum/textures/farming_carrot_5.png similarity index 100% rename from farming/textures/farming_carrot_5.png rename to mods/naturum/textures/farming_carrot_5.png diff --git a/farming/textures/farming_carrot_6.png b/mods/naturum/textures/farming_carrot_6.png similarity index 100% rename from farming/textures/farming_carrot_6.png rename to mods/naturum/textures/farming_carrot_6.png diff --git a/farming/textures/farming_carrot_7.png b/mods/naturum/textures/farming_carrot_7.png similarity index 100% rename from farming/textures/farming_carrot_7.png rename to mods/naturum/textures/farming_carrot_7.png diff --git a/farming/textures/farming_carrot_8.png b/mods/naturum/textures/farming_carrot_8.png similarity index 100% rename from farming/textures/farming_carrot_8.png rename to mods/naturum/textures/farming_carrot_8.png diff --git a/farming/textures/farming_carrot_gold.png b/mods/naturum/textures/farming_carrot_gold.png similarity index 100% rename from farming/textures/farming_carrot_gold.png rename to mods/naturum/textures/farming_carrot_gold.png diff --git a/farming/textures/farming_chocolate_dark.png b/mods/naturum/textures/farming_chocolate.png similarity index 100% rename from farming/textures/farming_chocolate_dark.png rename to mods/naturum/textures/farming_chocolate.png diff --git a/farming/textures/farming_cocoa_1.png b/mods/naturum/textures/farming_cocoa_1.png similarity index 100% rename from farming/textures/farming_cocoa_1.png rename to mods/naturum/textures/farming_cocoa_1.png diff --git a/farming/textures/farming_cocoa_2.png b/mods/naturum/textures/farming_cocoa_2.png similarity index 100% rename from farming/textures/farming_cocoa_2.png rename to mods/naturum/textures/farming_cocoa_2.png diff --git a/farming/textures/farming_cocoa_3.png b/mods/naturum/textures/farming_cocoa_3.png similarity index 100% rename from farming/textures/farming_cocoa_3.png rename to mods/naturum/textures/farming_cocoa_3.png diff --git a/farming/textures/farming_cocoa_beans.png b/mods/naturum/textures/farming_cocoa_beans.png similarity index 100% rename from farming/textures/farming_cocoa_beans.png rename to mods/naturum/textures/farming_cocoa_beans.png diff --git a/farming/textures/farming_coffee_1.png b/mods/naturum/textures/farming_coffee_1.png similarity index 100% rename from farming/textures/farming_coffee_1.png rename to mods/naturum/textures/farming_coffee_1.png diff --git a/farming/textures/farming_coffee_2.png b/mods/naturum/textures/farming_coffee_2.png similarity index 100% rename from farming/textures/farming_coffee_2.png rename to mods/naturum/textures/farming_coffee_2.png diff --git a/farming/textures/farming_coffee_3.png b/mods/naturum/textures/farming_coffee_3.png similarity index 100% rename from farming/textures/farming_coffee_3.png rename to mods/naturum/textures/farming_coffee_3.png diff --git a/farming/textures/farming_coffee_4.png b/mods/naturum/textures/farming_coffee_4.png similarity index 100% rename from farming/textures/farming_coffee_4.png rename to mods/naturum/textures/farming_coffee_4.png diff --git a/farming/textures/farming_coffee_5.png b/mods/naturum/textures/farming_coffee_5.png similarity index 100% rename from farming/textures/farming_coffee_5.png rename to mods/naturum/textures/farming_coffee_5.png diff --git a/farming/textures/farming_coffee_beans.png b/mods/naturum/textures/farming_coffee_beans.png similarity index 100% rename from farming/textures/farming_coffee_beans.png rename to mods/naturum/textures/farming_coffee_beans.png diff --git a/farming/textures/farming_cookie.png b/mods/naturum/textures/farming_cookie.png similarity index 100% rename from farming/textures/farming_cookie.png rename to mods/naturum/textures/farming_cookie.png diff --git a/farming/textures/farming_corn.png b/mods/naturum/textures/farming_corn.png similarity index 100% rename from farming/textures/farming_corn.png rename to mods/naturum/textures/farming_corn.png diff --git a/farming/textures/farming_corn_1.png b/mods/naturum/textures/farming_corn_1.png similarity index 100% rename from farming/textures/farming_corn_1.png rename to mods/naturum/textures/farming_corn_1.png diff --git a/farming/textures/farming_corn_2.png b/mods/naturum/textures/farming_corn_2.png similarity index 100% rename from farming/textures/farming_corn_2.png rename to mods/naturum/textures/farming_corn_2.png diff --git a/farming/textures/farming_corn_3.png b/mods/naturum/textures/farming_corn_3.png similarity index 100% rename from farming/textures/farming_corn_3.png rename to mods/naturum/textures/farming_corn_3.png diff --git a/farming/textures/farming_corn_4.png b/mods/naturum/textures/farming_corn_4.png similarity index 100% rename from farming/textures/farming_corn_4.png rename to mods/naturum/textures/farming_corn_4.png diff --git a/farming/textures/farming_corn_5.png b/mods/naturum/textures/farming_corn_5.png similarity index 100% rename from farming/textures/farming_corn_5.png rename to mods/naturum/textures/farming_corn_5.png diff --git a/farming/textures/farming_corn_6.png b/mods/naturum/textures/farming_corn_6.png similarity index 100% rename from farming/textures/farming_corn_6.png rename to mods/naturum/textures/farming_corn_6.png diff --git a/farming/textures/farming_corn_7.png b/mods/naturum/textures/farming_corn_7.png similarity index 100% rename from farming/textures/farming_corn_7.png rename to mods/naturum/textures/farming_corn_7.png diff --git a/farming/textures/farming_corn_8.png b/mods/naturum/textures/farming_corn_8.png similarity index 100% rename from farming/textures/farming_corn_8.png rename to mods/naturum/textures/farming_corn_8.png diff --git a/farming/textures/farming_corn_cob.png b/mods/naturum/textures/farming_corn_cob.png similarity index 100% rename from farming/textures/farming_corn_cob.png rename to mods/naturum/textures/farming_corn_cob.png diff --git a/farming/textures/farming_cotton.png b/mods/naturum/textures/farming_cotton.png similarity index 100% rename from farming/textures/farming_cotton.png rename to mods/naturum/textures/farming_cotton.png diff --git a/farming/textures/farming_cotton_1.png b/mods/naturum/textures/farming_cotton_1.png similarity index 100% rename from farming/textures/farming_cotton_1.png rename to mods/naturum/textures/farming_cotton_1.png diff --git a/farming/textures/farming_cotton_2.png b/mods/naturum/textures/farming_cotton_2.png similarity index 100% rename from farming/textures/farming_cotton_2.png rename to mods/naturum/textures/farming_cotton_2.png diff --git a/farming/textures/farming_cotton_3.png b/mods/naturum/textures/farming_cotton_3.png similarity index 100% rename from farming/textures/farming_cotton_3.png rename to mods/naturum/textures/farming_cotton_3.png diff --git a/farming/textures/farming_cotton_4.png b/mods/naturum/textures/farming_cotton_4.png similarity index 100% rename from farming/textures/farming_cotton_4.png rename to mods/naturum/textures/farming_cotton_4.png diff --git a/farming/textures/farming_cotton_5.png b/mods/naturum/textures/farming_cotton_5.png similarity index 100% rename from farming/textures/farming_cotton_5.png rename to mods/naturum/textures/farming_cotton_5.png diff --git a/farming/textures/farming_cotton_6.png b/mods/naturum/textures/farming_cotton_6.png similarity index 100% rename from farming/textures/farming_cotton_6.png rename to mods/naturum/textures/farming_cotton_6.png diff --git a/farming/textures/farming_cotton_7.png b/mods/naturum/textures/farming_cotton_7.png similarity index 100% rename from farming/textures/farming_cotton_7.png rename to mods/naturum/textures/farming_cotton_7.png diff --git a/farming/textures/farming_cotton_8.png b/mods/naturum/textures/farming_cotton_8.png similarity index 100% rename from farming/textures/farming_cotton_8.png rename to mods/naturum/textures/farming_cotton_8.png diff --git a/farming/textures/farming_cotton_seed.png b/mods/naturum/textures/farming_cotton_seed.png similarity index 100% rename from farming/textures/farming_cotton_seed.png rename to mods/naturum/textures/farming_cotton_seed.png diff --git a/farming/textures/farming_cucumber.png b/mods/naturum/textures/farming_cucumber.png similarity index 100% rename from farming/textures/farming_cucumber.png rename to mods/naturum/textures/farming_cucumber.png diff --git a/farming/textures/farming_cucumber_1.png b/mods/naturum/textures/farming_cucumber_1.png similarity index 100% rename from farming/textures/farming_cucumber_1.png rename to mods/naturum/textures/farming_cucumber_1.png diff --git a/farming/textures/farming_cucumber_2.png b/mods/naturum/textures/farming_cucumber_2.png similarity index 100% rename from farming/textures/farming_cucumber_2.png rename to mods/naturum/textures/farming_cucumber_2.png diff --git a/farming/textures/farming_cucumber_3.png b/mods/naturum/textures/farming_cucumber_3.png similarity index 100% rename from farming/textures/farming_cucumber_3.png rename to mods/naturum/textures/farming_cucumber_3.png diff --git a/farming/textures/farming_cucumber_4.png b/mods/naturum/textures/farming_cucumber_4.png similarity index 100% rename from farming/textures/farming_cucumber_4.png rename to mods/naturum/textures/farming_cucumber_4.png diff --git a/farming/textures/farming_donut.png b/mods/naturum/textures/farming_donut.png similarity index 100% rename from farming/textures/farming_donut.png rename to mods/naturum/textures/farming_donut.png diff --git a/farming/textures/farming_donut_chocolate.png b/mods/naturum/textures/farming_donut_chocolate.png similarity index 100% rename from farming/textures/farming_donut_chocolate.png rename to mods/naturum/textures/farming_donut_chocolate.png diff --git a/farming/textures/farming_flour.png b/mods/naturum/textures/farming_flour.png similarity index 100% rename from farming/textures/farming_flour.png rename to mods/naturum/textures/farming_flour.png diff --git a/farming/textures/farming_grapebush.png b/mods/naturum/textures/farming_grapebush.png similarity index 100% rename from farming/textures/farming_grapebush.png rename to mods/naturum/textures/farming_grapebush.png diff --git a/farming/textures/farming_grapes.png b/mods/naturum/textures/farming_grapes.png similarity index 100% rename from farming/textures/farming_grapes.png rename to mods/naturum/textures/farming_grapes.png diff --git a/farming/textures/farming_grapes_1.png b/mods/naturum/textures/farming_grapes_1.png similarity index 100% rename from farming/textures/farming_grapes_1.png rename to mods/naturum/textures/farming_grapes_1.png diff --git a/farming/textures/farming_grapes_2.png b/mods/naturum/textures/farming_grapes_2.png similarity index 100% rename from farming/textures/farming_grapes_2.png rename to mods/naturum/textures/farming_grapes_2.png diff --git a/farming/textures/farming_grapes_3.png b/mods/naturum/textures/farming_grapes_3.png similarity index 100% rename from farming/textures/farming_grapes_3.png rename to mods/naturum/textures/farming_grapes_3.png diff --git a/farming/textures/farming_grapes_4.png b/mods/naturum/textures/farming_grapes_4.png similarity index 100% rename from farming/textures/farming_grapes_4.png rename to mods/naturum/textures/farming_grapes_4.png diff --git a/farming/textures/farming_grapes_5.png b/mods/naturum/textures/farming_grapes_5.png similarity index 100% rename from farming/textures/farming_grapes_5.png rename to mods/naturum/textures/farming_grapes_5.png diff --git a/farming/textures/farming_grapes_6.png b/mods/naturum/textures/farming_grapes_6.png similarity index 100% rename from farming/textures/farming_grapes_6.png rename to mods/naturum/textures/farming_grapes_6.png diff --git a/farming/textures/farming_grapes_7.png b/mods/naturum/textures/farming_grapes_7.png similarity index 100% rename from farming/textures/farming_grapes_7.png rename to mods/naturum/textures/farming_grapes_7.png diff --git a/farming/textures/farming_grapes_8.png b/mods/naturum/textures/farming_grapes_8.png similarity index 100% rename from farming/textures/farming_grapes_8.png rename to mods/naturum/textures/farming_grapes_8.png diff --git a/farming/textures/farming_melon.png b/mods/naturum/textures/farming_melon.png similarity index 100% rename from farming/textures/farming_melon.png rename to mods/naturum/textures/farming_melon.png diff --git a/farming/textures/farming_melon_slice.png b/mods/naturum/textures/farming_melon_slice.png similarity index 100% rename from farming/textures/farming_melon_slice.png rename to mods/naturum/textures/farming_melon_slice.png diff --git a/farming/textures/farming_orange.png b/mods/naturum/textures/farming_orange.png similarity index 100% rename from farming/textures/farming_orange.png rename to mods/naturum/textures/farming_orange.png diff --git a/farming/textures/farming_potato.png b/mods/naturum/textures/farming_potato.png similarity index 100% rename from farming/textures/farming_potato.png rename to mods/naturum/textures/farming_potato.png diff --git a/farming/textures/farming_potato_1.png b/mods/naturum/textures/farming_potato_1.png similarity index 100% rename from farming/textures/farming_potato_1.png rename to mods/naturum/textures/farming_potato_1.png diff --git a/farming/textures/farming_potato_2.png b/mods/naturum/textures/farming_potato_2.png similarity index 100% rename from farming/textures/farming_potato_2.png rename to mods/naturum/textures/farming_potato_2.png diff --git a/farming/textures/farming_potato_3.png b/mods/naturum/textures/farming_potato_3.png similarity index 100% rename from farming/textures/farming_potato_3.png rename to mods/naturum/textures/farming_potato_3.png diff --git a/farming/textures/farming_potato_4.png b/mods/naturum/textures/farming_potato_4.png similarity index 100% rename from farming/textures/farming_potato_4.png rename to mods/naturum/textures/farming_potato_4.png diff --git a/farming/textures/farming_pumpkin_face_off.png b/mods/naturum/textures/farming_pumpkin_face_off.png similarity index 100% rename from farming/textures/farming_pumpkin_face_off.png rename to mods/naturum/textures/farming_pumpkin_face_off.png diff --git a/farming/textures/farming_pumpkin_face_on.png b/mods/naturum/textures/farming_pumpkin_face_on.png similarity index 100% rename from farming/textures/farming_pumpkin_face_on.png rename to mods/naturum/textures/farming_pumpkin_face_on.png diff --git a/farming/textures/farming_pumpkin_side.png b/mods/naturum/textures/farming_pumpkin_side.png similarity index 100% rename from farming/textures/farming_pumpkin_side.png rename to mods/naturum/textures/farming_pumpkin_side.png diff --git a/farming/textures/farming_pumpkin_slice.png b/mods/naturum/textures/farming_pumpkin_slice.png similarity index 100% rename from farming/textures/farming_pumpkin_slice.png rename to mods/naturum/textures/farming_pumpkin_slice.png diff --git a/farming/textures/farming_pumpkin_tiny.png b/mods/naturum/textures/farming_pumpkin_tiny.png similarity index 100% rename from farming/textures/farming_pumpkin_tiny.png rename to mods/naturum/textures/farming_pumpkin_tiny.png diff --git a/farming/textures/farming_pumpkin_top.png b/mods/naturum/textures/farming_pumpkin_top.png similarity index 100% rename from farming/textures/farming_pumpkin_top.png rename to mods/naturum/textures/farming_pumpkin_top.png diff --git a/farming/textures/farming_raspberries.png b/mods/naturum/textures/farming_raspberries.png similarity index 100% rename from farming/textures/farming_raspberries.png rename to mods/naturum/textures/farming_raspberries.png diff --git a/farming/textures/farming_raspberry_1.png b/mods/naturum/textures/farming_raspberry_1.png similarity index 100% rename from farming/textures/farming_raspberry_1.png rename to mods/naturum/textures/farming_raspberry_1.png diff --git a/farming/textures/farming_raspberry_2.png b/mods/naturum/textures/farming_raspberry_2.png similarity index 100% rename from farming/textures/farming_raspberry_2.png rename to mods/naturum/textures/farming_raspberry_2.png diff --git a/farming/textures/farming_raspberry_3.png b/mods/naturum/textures/farming_raspberry_3.png similarity index 100% rename from farming/textures/farming_raspberry_3.png rename to mods/naturum/textures/farming_raspberry_3.png diff --git a/farming/textures/farming_raspberry_4.png b/mods/naturum/textures/farming_raspberry_4.png similarity index 100% rename from farming/textures/farming_raspberry_4.png rename to mods/naturum/textures/farming_raspberry_4.png diff --git a/farming/textures/farming_raspberry_smoothie.png b/mods/naturum/textures/farming_raspberry_smoothie.png similarity index 100% rename from farming/textures/farming_raspberry_smoothie.png rename to mods/naturum/textures/farming_raspberry_smoothie.png diff --git a/farming/textures/farming_rhubarb.png b/mods/naturum/textures/farming_rhubarb.png similarity index 100% rename from farming/textures/farming_rhubarb.png rename to mods/naturum/textures/farming_rhubarb.png diff --git a/farming/textures/farming_rhubarb_1.png b/mods/naturum/textures/farming_rhubarb_1.png similarity index 100% rename from farming/textures/farming_rhubarb_1.png rename to mods/naturum/textures/farming_rhubarb_1.png diff --git a/farming/textures/farming_rhubarb_2.png b/mods/naturum/textures/farming_rhubarb_2.png similarity index 100% rename from farming/textures/farming_rhubarb_2.png rename to mods/naturum/textures/farming_rhubarb_2.png diff --git a/farming/textures/farming_rhubarb_3.png b/mods/naturum/textures/farming_rhubarb_3.png similarity index 100% rename from farming/textures/farming_rhubarb_3.png rename to mods/naturum/textures/farming_rhubarb_3.png diff --git a/farming/textures/farming_rhubarb_pie.png b/mods/naturum/textures/farming_rhubarb_pie.png similarity index 100% rename from farming/textures/farming_rhubarb_pie.png rename to mods/naturum/textures/farming_rhubarb_pie.png diff --git a/farming/textures/farming_soil.png b/mods/naturum/textures/farming_soil.png similarity index 100% rename from farming/textures/farming_soil.png rename to mods/naturum/textures/farming_soil.png diff --git a/farming/textures/farming_soil_wet.png b/mods/naturum/textures/farming_soil_wet.png similarity index 100% rename from farming/textures/farming_soil_wet.png rename to mods/naturum/textures/farming_soil_wet.png diff --git a/farming/textures/farming_soil_wet_side.png b/mods/naturum/textures/farming_soil_wet_side.png similarity index 100% rename from farming/textures/farming_soil_wet_side.png rename to mods/naturum/textures/farming_soil_wet_side.png diff --git a/farming/textures/farming_straw.png b/mods/naturum/textures/farming_straw.png similarity index 100% rename from farming/textures/farming_straw.png rename to mods/naturum/textures/farming_straw.png diff --git a/farming/textures/farming_sugar.png b/mods/naturum/textures/farming_sugar.png similarity index 100% rename from farming/textures/farming_sugar.png rename to mods/naturum/textures/farming_sugar.png diff --git a/farming/textures/farming_toast.png b/mods/naturum/textures/farming_toast.png similarity index 100% rename from farming/textures/farming_toast.png rename to mods/naturum/textures/farming_toast.png diff --git a/farming/textures/farming_tomato.png b/mods/naturum/textures/farming_tomato.png similarity index 100% rename from farming/textures/farming_tomato.png rename to mods/naturum/textures/farming_tomato.png diff --git a/farming/textures/farming_tomato_1.png b/mods/naturum/textures/farming_tomato_1.png similarity index 100% rename from farming/textures/farming_tomato_1.png rename to mods/naturum/textures/farming_tomato_1.png diff --git a/farming/textures/farming_tomato_2.png b/mods/naturum/textures/farming_tomato_2.png similarity index 100% rename from farming/textures/farming_tomato_2.png rename to mods/naturum/textures/farming_tomato_2.png diff --git a/farming/textures/farming_tomato_3.png b/mods/naturum/textures/farming_tomato_3.png similarity index 100% rename from farming/textures/farming_tomato_3.png rename to mods/naturum/textures/farming_tomato_3.png diff --git a/farming/textures/farming_tomato_4.png b/mods/naturum/textures/farming_tomato_4.png similarity index 100% rename from farming/textures/farming_tomato_4.png rename to mods/naturum/textures/farming_tomato_4.png diff --git a/farming/textures/farming_tomato_5.png b/mods/naturum/textures/farming_tomato_5.png similarity index 100% rename from farming/textures/farming_tomato_5.png rename to mods/naturum/textures/farming_tomato_5.png diff --git a/farming/textures/farming_tomato_6.png b/mods/naturum/textures/farming_tomato_6.png similarity index 100% rename from farming/textures/farming_tomato_6.png rename to mods/naturum/textures/farming_tomato_6.png diff --git a/farming/textures/farming_tomato_7.png b/mods/naturum/textures/farming_tomato_7.png similarity index 100% rename from farming/textures/farming_tomato_7.png rename to mods/naturum/textures/farming_tomato_7.png diff --git a/farming/textures/farming_tomato_8.png b/mods/naturum/textures/farming_tomato_8.png similarity index 100% rename from farming/textures/farming_tomato_8.png rename to mods/naturum/textures/farming_tomato_8.png diff --git a/farming/textures/farming_tool_bronzehoe.png b/mods/naturum/textures/farming_tool_bronzehoe.png similarity index 100% rename from farming/textures/farming_tool_bronzehoe.png rename to mods/naturum/textures/farming_tool_bronzehoe.png diff --git a/farming/textures/farming_tool_diamondhoe.png b/mods/naturum/textures/farming_tool_diamondhoe.png similarity index 100% rename from farming/textures/farming_tool_diamondhoe.png rename to mods/naturum/textures/farming_tool_diamondhoe.png diff --git a/farming/textures/farming_tool_mesehoe.png b/mods/naturum/textures/farming_tool_mesehoe.png similarity index 100% rename from farming/textures/farming_tool_mesehoe.png rename to mods/naturum/textures/farming_tool_mesehoe.png diff --git a/farming/textures/farming_tool_steelhoe.png b/mods/naturum/textures/farming_tool_steelhoe.png similarity index 100% rename from farming/textures/farming_tool_steelhoe.png rename to mods/naturum/textures/farming_tool_steelhoe.png diff --git a/farming/textures/farming_tool_stonehoe.png b/mods/naturum/textures/farming_tool_stonehoe.png similarity index 100% rename from farming/textures/farming_tool_stonehoe.png rename to mods/naturum/textures/farming_tool_stonehoe.png diff --git a/farming/textures/farming_tool_woodhoe.png b/mods/naturum/textures/farming_tool_woodhoe.png similarity index 100% rename from farming/textures/farming_tool_woodhoe.png rename to mods/naturum/textures/farming_tool_woodhoe.png diff --git a/farming/textures/farming_trellis.png b/mods/naturum/textures/farming_trellis.png similarity index 100% rename from farming/textures/farming_trellis.png rename to mods/naturum/textures/farming_trellis.png diff --git a/mods/naturum/textures/farming_wheat.png b/mods/naturum/textures/farming_wheat.png new file mode 100644 index 0000000..13ec22f Binary files /dev/null and b/mods/naturum/textures/farming_wheat.png differ diff --git a/mods/naturum/textures/farming_wheat_1.png b/mods/naturum/textures/farming_wheat_1.png new file mode 100644 index 0000000..d76226d Binary files /dev/null and b/mods/naturum/textures/farming_wheat_1.png differ diff --git a/mods/naturum/textures/farming_wheat_2.png b/mods/naturum/textures/farming_wheat_2.png new file mode 100644 index 0000000..b307252 Binary files /dev/null and b/mods/naturum/textures/farming_wheat_2.png differ diff --git a/mods/naturum/textures/farming_wheat_3.png b/mods/naturum/textures/farming_wheat_3.png new file mode 100644 index 0000000..88dffd3 Binary files /dev/null and b/mods/naturum/textures/farming_wheat_3.png differ diff --git a/mods/naturum/textures/farming_wheat_4.png b/mods/naturum/textures/farming_wheat_4.png new file mode 100644 index 0000000..062803e Binary files /dev/null and b/mods/naturum/textures/farming_wheat_4.png differ diff --git a/mods/naturum/textures/farming_wheat_5.png b/mods/naturum/textures/farming_wheat_5.png new file mode 100644 index 0000000..4b678be Binary files /dev/null and b/mods/naturum/textures/farming_wheat_5.png differ diff --git a/mods/naturum/textures/farming_wheat_6.png b/mods/naturum/textures/farming_wheat_6.png new file mode 100644 index 0000000..987c225 Binary files /dev/null and b/mods/naturum/textures/farming_wheat_6.png differ diff --git a/mods/naturum/textures/farming_wheat_7.png b/mods/naturum/textures/farming_wheat_7.png new file mode 100644 index 0000000..f748b0a Binary files /dev/null and b/mods/naturum/textures/farming_wheat_7.png differ diff --git a/mods/naturum/textures/farming_wheat_8.png b/mods/naturum/textures/farming_wheat_8.png new file mode 100644 index 0000000..7119921 Binary files /dev/null and b/mods/naturum/textures/farming_wheat_8.png differ diff --git a/farming/textures/farming_wheat_seed.png b/mods/naturum/textures/farming_wheat_seed.png similarity index 100% rename from farming/textures/farming_wheat_seed.png rename to mods/naturum/textures/farming_wheat_seed.png diff --git a/mods/naturum/textures/naturum_light.png b/mods/naturum/textures/naturum_light.png new file mode 100644 index 0000000..8fc69b7 Binary files /dev/null and b/mods/naturum/textures/naturum_light.png differ diff --git a/mods/naturum/textures/naturum_question.png b/mods/naturum/textures/naturum_question.png new file mode 100644 index 0000000..40f3531 Binary files /dev/null and b/mods/naturum/textures/naturum_question.png differ diff --git a/farming/textures/strawberry.png b/mods/naturum/textures/strawberry.png similarity index 100% rename from farming/textures/strawberry.png rename to mods/naturum/textures/strawberry.png diff --git a/mods/naturum/wheat.lua b/mods/naturum/wheat.lua new file mode 100644 index 0000000..718b31b --- /dev/null +++ b/mods/naturum/wheat.lua @@ -0,0 +1,126 @@ +-- naturum +-- replacement for farming_plus +-- License: what's a license + +for i=1, 8 do + local rare = 8 - (i - 1) * 7 / (8 - 1) + local drop = { + items = { + {items = {"naturum:wheat"}, rarity = rare}, + {items = {"naturum:wheat"}, rarity = rare * 2}, + {items = {"naturum:wheat_seeds"}, rarity = rare}, + {items = {"naturum:wheat_seeds"}, rarity = rare * 2}, + } + } + + minetest.register_node("naturum:wheat_" .. i, { + description = "wheat_phase_" .. i, + tiles = {"farming_wheat_" .. i .. ".png"}, + drawtype = "plantlike", + paramtype = "light", + paramtype2 = "meshoptions", + sounds = mcore.sound_plants, + walkable = false, + drop = drop, + waving = 1, + groups = {snappy=3, flammable=2, attached_node=1}, + }) + + if i < 8 then + naturum.plant_grow_stage(140, 1, "naturum:wheat_"..i, 140, "naturum:wheat_"..i+1, "naturum:soil", "naturum:soil_wet", true) + end + +end + +minetest.register_craftitem("naturum:wheat_seeds", { + description = "Wheat Seeds", + inventory_image = "farming_wheat_seed.png", + groups = {seed=1}, + + on_place = function(itemstack, placer, pointed_thing) + if pointed_thing.type ~= "node" then + return + end + + local node = minetest.get_node_or_nil(pointed_thing.under) + local npos + local nodedef = minetest.registered_nodes[node.name] + + if nodedef and nodedef.buildable_to then + npos = pointed_thing.under + else + npos = pointed_thing.above + node = minetest.get_node_or_nil(pointed_thing.above) + + local above_node = minetest.registered_nodes[node.name] + + if not above_node.buildable_to then + return itemstack + end + end + + local is_soil = minetest.get_item_group(node, "soil") + + if is_soil == 0 then + itemstack:take_item() + minetest.set_node(npos, {name = "naturum:wheat_1", param2 = mcore.options("croplike", false, true, false)}) + minetest.get_node_timer(npos):start(140+math.random(-20, 20)) + end + return itemstack + end, + +}) + +minetest.register_craftitem("naturum:wheat", { + description = "Wheat", + inventory_image = "farming_wheat.png", +}) + +minetest.register_craftitem("naturum:flour", { + description = "Flour", + inventory_image = "farming_flour.png", +}) + +minetest.register_craftitem("naturum:bread", { + description = "Bread", + inventory_image = "farming_bread.png", + on_use = minetest.item_eat(5) +}) + +minetest.register_craftitem("naturum:toast", { + description = "Toast", + inventory_image = "farming_toast.png", + on_use = minetest.item_eat(7) + +}) + + +minetest.register_craft({ + type = "shapeless", + output = "naturum:wheat_seeds 2", + recipe = { + "naturum:wheat", + }, +}) + +minetest.register_craft({ + output = "naturum:flour 4", + recipe = { + {"naturum:wheat", "naturum:wheat"}, + {"naturum:wheat", "naturum:wheat"}, + } +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "farming:bread", + recipe = "farming:flour", +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "farming:toast", + recipe = "farming:bread", +}) \ No newline at end of file diff --git a/mods/snowdrift/init.lua b/mods/snowdrift/init.lua index c7ab5a7..5900a5a 100644 --- a/mods/snowdrift/init.lua +++ b/mods/snowdrift/init.lua @@ -195,7 +195,6 @@ minetest.register_globalstep(function(dtime) end end) - -- Stop sound and remove player handle on leaveplayer minetest.register_on_leaveplayer(function(player) diff --git a/ntex/farming_pumpkin_bread.png b/ntex/farming_pumpkin_bread.png deleted file mode 100644 index 0dfae08..0000000 Binary files a/ntex/farming_pumpkin_bread.png and /dev/null differ diff --git a/ntex/farming_pumpkin_dough.png b/ntex/farming_pumpkin_dough.png deleted file mode 100644 index 62ea7a6..0000000 Binary files a/ntex/farming_pumpkin_dough.png and /dev/null differ diff --git a/ntex/farming_wheat.png b/ntex/farming_wheat.png deleted file mode 100644 index 1e0ad3b..0000000 Binary files a/ntex/farming_wheat.png and /dev/null differ diff --git a/ntex/farming_wheat_1.png b/ntex/farming_wheat_1.png deleted file mode 100644 index 4b5564b..0000000 Binary files a/ntex/farming_wheat_1.png and /dev/null differ diff --git a/ntex/farming_wheat_2.png b/ntex/farming_wheat_2.png deleted file mode 100644 index baddb4c..0000000 Binary files a/ntex/farming_wheat_2.png and /dev/null differ diff --git a/ntex/farming_wheat_3.png b/ntex/farming_wheat_3.png deleted file mode 100644 index 36ebb19..0000000 Binary files a/ntex/farming_wheat_3.png and /dev/null differ diff --git a/ntex/farming_wheat_4.png b/ntex/farming_wheat_4.png deleted file mode 100644 index 735ed77..0000000 Binary files a/ntex/farming_wheat_4.png and /dev/null differ diff --git a/ntex/farming_wheat_5.png b/ntex/farming_wheat_5.png deleted file mode 100644 index f40b5f0..0000000 Binary files a/ntex/farming_wheat_5.png and /dev/null differ diff --git a/ntex/farming_wheat_6.png b/ntex/farming_wheat_6.png deleted file mode 100644 index e9c78e0..0000000 Binary files a/ntex/farming_wheat_6.png and /dev/null differ diff --git a/ntex/farming_wheat_7.png b/ntex/farming_wheat_7.png deleted file mode 100644 index cc26ca9..0000000 Binary files a/ntex/farming_wheat_7.png and /dev/null differ diff --git a/ntex/farming_wheat_8.png b/ntex/farming_wheat_8.png deleted file mode 100644 index d050093..0000000 Binary files a/ntex/farming_wheat_8.png and /dev/null differ diff --git a/ntex/farming_wheat_seed.png b/ntex/farming_wheat_seed.png deleted file mode 100644 index e13781d..0000000 Binary files a/ntex/farming_wheat_seed.png and /dev/null differ diff --git a/ntex/vessels_drinking_cup.png b/ntex/vessels_drinking_cup.png deleted file mode 100644 index 2eba232..0000000 Binary files a/ntex/vessels_drinking_cup.png and /dev/null differ