From e4c25cb294ec9dcbcafc2b7026ca5769a5bf9b29 Mon Sep 17 00:00:00 2001 From: cale Date: Sun, 18 Sep 2016 10:26:45 +0200 Subject: [PATCH] added pine sapling + removed water with sugar --- mods/default/nodes.lua | 28 ++++++++++++++++++++ mods/default/textures/default_sapling.png | Bin 296 -> 341 bytes mods/default/textures/default_sapling_2.png | Bin 0 -> 278 bytes mods/juice/init.lua | 13 ++------- mods/juice/textures/juice_water_sugar.png | Bin 352 -> 0 bytes mods/potions/init.lua | 15 +++++------ 6 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 mods/default/textures/default_sapling_2.png delete mode 100644 mods/juice/textures/juice_water_sugar.png diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 478ffe2..1c3ea8b 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -94,6 +94,7 @@ minetest.register_node("default:leaves_1", { max_items = 1, items = { {items = {"default:sapling 2"},rarity = 3}, + {items = {"farming:apple"},rarity = 5}, {items = {'default:leaves_1'}}, } }, @@ -440,6 +441,33 @@ minetest.register_abm({ end, }) +minetest.register_node("default:sapling_2", { + description = "Sapling", + tiles = {"default_sapling_2.png"}, + drawtype = "plantlike", + paramtype = "light", + inventory_image = "default_sapling_2.png", + buildable_to = true, + walkable = false, + groups = {crumbly = 3, sapling = 1}, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}, + }, +}) + +minetest.register_abm({ + nodenames = {"default:sapling_2"}, + neighbors = {"default:grass", "default:dirt"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + minetest.set_node(pos, {name = "air"}) + local path = minetest.get_modpath("default") .. "/schematics/pinetree1.mts" + minetest.place_schematic({x = pos.x - 2, y = pos.y - 0, z = pos.z - 2}, path, 0, nil, false) + end, +}) + minetest.register_node("default:plant_grass", { description = "Grass (Plant)", tiles = {"default_plant_grass.png"}, diff --git a/mods/default/textures/default_sapling.png b/mods/default/textures/default_sapling.png index c59c799be2c82fbf9b1c6de523b587d896dfa948..26ed99dc8a5bc5aedf79998969c38d809277d11a 100644 GIT binary patch delta 250 zcmV1NEU<2i80sp^#|3Ojo5$ym%J|orVR7r%e5MX!1ZVoYtk%h$64o__F zo_}RvxC58^Pp$_^P6OzPkyF@2iVH9ebU{Q?2)uj#mFkI*g~CJ&i+e^PNp2K}&M!Mm zeFvZ$TAmg_Fl`L4G(b+;po;^DjqgDj1)~lC0MNusZ_0Ng5C8xG07*qoM6N<$f`5x= A7XSbN delta 232 zcmVcMxqZ3po~Gv*_EGp9~BP z3=BU${~^ioEW|2=SpWm1T12q}uz~Wlfd5~=|Dec0L^}YV1*F6|RTCjB1lZlkcNhz` zvJ<&!goWJf_U`#t28KHWkOo)+*wCl-4tNi1L* iXitnfVAKHv?f?MA5J8BTP+(~Q0000<>&pIsQ;0)S%qN_28&F8H#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-J9H^+y)5S3);&5_;1nc4ik)EbN1FkkB4S((*^Mzl3oG)Z7aq{Yn z3(xzLJ~l1tO__PrX&tkj?Jv8g#SFGTG&|X*DN6rg7GvGfH2+RUg5;)y_6mUx8b3}# zBue_3lA7mV0ZaH_*HAG1;R%u80Rqd7aw6`G3=`elGCMxReFnOO!PC{xWt~$(69BJ~ BS)2d> literal 0 HcmV?d00001 diff --git a/mods/juice/init.lua b/mods/juice/init.lua index 0e1af72..e27e226 100644 --- a/mods/juice/init.lua +++ b/mods/juice/init.lua @@ -19,15 +19,6 @@ minetest.register_craftitem("juice:water", { stack_max = 1, }) -minetest.register_craftitem("juice:water_sugar", { - description = "Water with Sugar", - inventory_image = "juice_water_sugar.png", - on_use = function(itemstack, user, pointed_thing) - return juice.drink(user, itemstack, -2) - end, - stack_max = 1, -}) - minetest.register_craftitem("juice:cactus", { description = "Cactus Juice", inventory_image = "juice_cactus.png", @@ -72,8 +63,8 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = "juice:water_sugar", - recipe = {"juice:water", "farming:sugar"}, + output = "juice:apple", + recipe = {"juice:water", "farming:apple"}, }) minetest.register_craft({ diff --git a/mods/juice/textures/juice_water_sugar.png b/mods/juice/textures/juice_water_sugar.png deleted file mode 100644 index 3fda8f283addf8a6b337353a40c9e83921cc57d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(|>ks~HlL&ay5Bif|Tq zL>4nJa0`PlBg3pY5H=O_6JO?+*};_@8@a)g(OQ{BTAg}b8}PkN*J7rQWHy3 zQxwWGOEMJPJ$(bh8~Mb6icWaCIEGl9PEL@>IMCty;o@TV|AmlTe0f`6V%E~uN&}w6gK4KPZ;yY_#o4*}L6Mf3cmlHp?~Ps0)!Jrk@3v}_5Y{{U z?AbG(`F8&sF7Mz;J@mBcZZ)6LhmS=Db8IRn9lUx}E{`LSZN}``#s)x8^XpIZ!^_X* zd3Jx7Nhv7ZsD6)O##)01uaeGhs6Oxbh_|7VaV~GMWFXst9Jg}GK+m6dcbEVF{cO># ss!vZm+qM)WAM%upuXDKWBg(+AOe1*0m+wbPfqr7}boFyt=akR{06oWw?*IS* diff --git a/mods/potions/init.lua b/mods/potions/init.lua index 1dc773d..547315c 100644 --- a/mods/potions/init.lua +++ b/mods/potions/init.lua @@ -119,22 +119,21 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "potions:running", - recipe = {"juice:water_sugar", "juice:water_sugar", "juice:water_sugar", "potions:glass"}, + recipe = {"juice:water", "juice:water", "farming:sugar", "potions:glass"}, replacements = { - {"juice:water_sugar", "juice:glass"}, - {"juice:water_sugar", "juice:glass"}, - {"juice:water_sugar", "juice:glass"} + {"juice:water", "juice:glass"}, + {"juice:water", "juice:glass"} } }) minetest.register_craft({ type = "shapeless", output = "potions:jumping", - recipe = {"juice:water_sugar", "juice:water_sugar", "juice:water", "potions:glass"}, + recipe = {"juice:water", "juice:water", "juice:apple", "potions:glass"}, replacements = { - {"juice:water_sugar", "juice:glass"}, - {"juice:water_sugar", "juice:glass"}, - {"juice:water", "juice:glass"} + {"juice:water", "juice:glass"}, + {"juice:water", "juice:glass"}, + {"juice:apple", "juice:glass"} } })