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 c59c799..26ed99d 100644 Binary files a/mods/default/textures/default_sapling.png and b/mods/default/textures/default_sapling.png differ diff --git a/mods/default/textures/default_sapling_2.png b/mods/default/textures/default_sapling_2.png new file mode 100644 index 0000000..5516f73 Binary files /dev/null and b/mods/default/textures/default_sapling_2.png differ 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 3fda8f2..0000000 Binary files a/mods/juice/textures/juice_water_sugar.png and /dev/null differ 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"} } })