diff --git a/mods/ITEMS/mcl_cocoas/init.lua b/mods/ITEMS/mcl_cocoas/init.lua index 0792972be..0a8ec6134 100644 --- a/mods/ITEMS/mcl_cocoas/init.lua +++ b/mods/ITEMS/mcl_cocoas/init.lua @@ -147,17 +147,6 @@ crop_def.selection_box = { crop_def.drop = "mcl_cocoas:cocoa_beans 3" minetest.register_node("mcl_cocoas:cocoa_3", table.copy(crop_def)) -minetest.register_craftitem("mcl_cocoas:cocoa_beans", { - description = S("Cocoa Beans"), - _tt_help = S("Grows at the side of jungle trees"), - _doc_items_longdesc = S("Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye."), - _doc_items_usagehelp = S("Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."), - inventory_image = "mcl_cocoas_cocoa_beans.png", - groups = {craftitem = 1, compostability = 65}, - on_place = function(itemstack, placer, pointed_thing) - return cocoa_place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1") - end, -}) minetest.register_abm({ label = "Cocoa pod growth", diff --git a/mods/ITEMS/mcl_farming/beetroot.lua b/mods/ITEMS/mcl_farming/beetroot.lua index f32b2bf8e..27d0d888f 100644 --- a/mods/ITEMS/mcl_farming/beetroot.lua +++ b/mods/ITEMS/mcl_farming/beetroot.lua @@ -1,18 +1,5 @@ local S = minetest.get_translator(minetest.get_current_modname()) -minetest.register_craftitem("mcl_farming:beetroot_seeds", { - description = S("Beetroot Seeds"), - _tt_help = S("Grows on farmland"), - _doc_items_longdesc = S("Grows into a beetroot plant. Chickens like beetroot seeds."), - _doc_items_usagehelp = S("Place the beetroot seeds on farmland (which can be created with a hoe) to plant a beetroot plant. They grow in sunlight and grow faster on hydrated farmland. Rightclick an animal to feed it beetroot seeds."), - groups = {craftitem = 1, compostability = 30}, - inventory_image = "mcl_farming_beetroot_seeds.png", - wield_image = "mcl_farming_beetroot_seeds.png", - on_place = function(itemstack, placer, pointed_thing) - return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:beetroot_0") - end -}) - minetest.register_node("mcl_farming:beetroot_0", { description = S("Premature Beetroot Plant (Stage 1)"), _doc_items_longdesc = S("Beetroot plants are plants which grow on farmland under sunlight in 4 stages. On hydrated farmland, they grow a bit faster. They can be harvested at any time but will only yield a profit when mature."), diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index d62288333..f5fdb185d 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -1,18 +1,5 @@ local S = minetest.get_translator(minetest.get_current_modname()) --- Seeds -minetest.register_craftitem("mcl_farming:melon_seeds", { - description = S("Melon Seeds"), - _tt_help = S("Grows on farmland"), - _doc_items_longdesc = S("Grows into a melon stem which in turn grows melons. Chickens like melon seeds."), - _doc_items_usagehelp = S("Place the melon seeds on farmland (which can be created with a hoe) to plant a melon stem. Melon stems grow in sunlight and grow faster on hydrated farmland. When mature, the stem will attempt to grow a melon at the side. Rightclick an animal to feed it melon seeds."), - stack_max = 64, - groups = {craftitem = 1, compostability = 30}, - inventory_image = "mcl_farming_melon_seeds.png", - on_place = function(itemstack, placer, pointed_thing) - return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:melontige_1") - end, -}) -- Melon template (will be fed into mcl_farming.register_gourd diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 15ba9c95e..e9d63142e 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -7,19 +7,6 @@ if mod_screwdriver then on_rotate = screwdriver.rotate_simple end --- Seeds -minetest.register_craftitem("mcl_farming:pumpkin_seeds", { - description = S("Pumpkin Seeds"), - _tt_help = S("Grows on farmland"), - _doc_items_longdesc = S("Grows into a pumpkin stem which in turn grows pumpkins. Chickens like pumpkin seeds."), - _doc_items_usagehelp = S("Place the pumpkin seeds on farmland (which can be created with a hoe) to plant a pumpkin stem. Pumpkin stems grow in sunlight and grow faster on hydrated farmland. When mature, the stem attempts to grow a pumpkin next to it. Rightclick an animal to feed it pumpkin seeds."), - stack_max = 64, - inventory_image = "mcl_farming_pumpkin_seeds.png", - groups = {craftitem=1, compostability = 30}, - on_place = function(itemstack, placer, pointed_thing) - return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:pumpkin_1") - end -}) local stem_drop = { max_items = 1, @@ -197,29 +184,6 @@ minetest.register_craft({ {"mcl_torches:torch"}} }) -minetest.register_craft({ - output = "mcl_farming:pumpkin_seeds 4", - recipe = {{"mcl_farming:pumpkin"}} -}) - -minetest.register_craftitem("mcl_farming:pumpkin_pie", { - description = S("Pumpkin Pie"), - _doc_items_longdesc = S("A pumpkin pie is a tasty food item which can be eaten."), - stack_max = 64, - inventory_image = "mcl_farming_pumpkin_pie.png", - wield_image = "mcl_farming_pumpkin_pie.png", - on_place = minetest.item_eat(8), - on_secondary_use = minetest.item_eat(8), - groups = {food = 2, eatable = 8, compostability = 100}, - _mcl_saturation = 4.8, -}) - -minetest.register_craft({ - type = "shapeless", - output = "mcl_farming:pumpkin_pie", - recipe = {"mcl_farming:pumpkin", "mcl_core:sugar", "mcl_throwing:egg"}, -}) - if minetest.get_modpath("doc") then for i=2,8 do diff --git a/mods/ITEMS/mcl_farming/wheat.lua b/mods/ITEMS/mcl_farming/wheat.lua index 676cc1301..6d57d5b1c 100644 --- a/mods/ITEMS/mcl_farming/wheat.lua +++ b/mods/ITEMS/mcl_farming/wheat.lua @@ -1,18 +1,5 @@ local S = minetest.get_translator(minetest.get_current_modname()) -minetest.register_craftitem("mcl_farming:wheat_seeds", { - -- Original Minecraft name: “Seeds” - description = S("Wheat Seeds"), - _tt_help = S("Grows on farmland"), - _doc_items_longdesc = S("Grows into a wheat plant. Chickens like wheat seeds."), - _doc_items_usagehelp = S("Place the wheat seeds on farmland (which can be created with a hoe) to plant a wheat plant.").."\n".. - S("They grow in sunlight and grow faster on hydrated farmland. Rightclick an animal to feed it wheat seeds."), - groups = {craftitem = 1, compostability = 30}, - inventory_image = "mcl_farming_wheat_seeds.png", - on_place = function(itemstack, placer, pointed_thing) - return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:wheat_1") - end -}) local sel_heights = { -5/16, @@ -100,49 +87,6 @@ minetest.register_node("mcl_farming:wheat", { mcl_farming:add_plant("plant_wheat", "mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3", "mcl_farming:wheat_4", "mcl_farming:wheat_5", "mcl_farming:wheat_6", "mcl_farming:wheat_7"}, 25, 20) -minetest.register_craftitem("mcl_farming:wheat_item", { - description = S("Wheat"), - _doc_items_longdesc = S("Wheat is used in crafting. Some animals like wheat."), - _doc_items_usagehelp = S("Use the “Place” key on an animal to try to feed it wheat."), - inventory_image = "farming_wheat_harvested.png", - groups = {craftitem = 1, compostability = 65}, -}) - -minetest.register_craft({ - output = "mcl_farming:bread", - recipe = { - {"mcl_farming:wheat_item", "mcl_farming:wheat_item", "mcl_farming:wheat_item"}, - } -}) - -minetest.register_craft({ - output = "mcl_farming:cookie 8", - recipe = { - {"mcl_farming:wheat_item", "mcl_cocoas:cocoa_beans", "mcl_farming:wheat_item"}, - } -}) - -minetest.register_craftitem("mcl_farming:cookie", { - description = S("Cookie"), - _doc_items_longdesc = S("This is a food item which can be eaten."), - inventory_image = "farming_cookie.png", - groups = {food = 2, eatable = 2, compostability = 85}, - _mcl_saturation = 0.4, - on_place = minetest.item_eat(2), - on_secondary_use = minetest.item_eat(2), -}) - - -minetest.register_craftitem("mcl_farming:bread", { - description = S("Bread"), - _doc_items_longdesc = S("This is a food item which can be eaten."), - inventory_image = "farming_bread.png", - groups = {food = 2, eatable = 5, compostability = 85}, - _mcl_saturation = 6.0, - on_place = minetest.item_eat(5), - on_secondary_use = minetest.item_eat(5), -}) - local mod_screwdriver = minetest.get_modpath("screwdriver") local on_rotate if mod_screwdriver then diff --git a/mods/ITEMS/mcl_honey/init.lua b/mods/ITEMS/mcl_honey/init.lua index 32a3818e6..526663005 100644 --- a/mods/ITEMS/mcl_honey/init.lua +++ b/mods/ITEMS/mcl_honey/init.lua @@ -7,73 +7,6 @@ mcl_honey = {} local S = minetest.get_translator(minetest.get_current_modname()) local alldirs = { { x = 0, y = 0, z = 1 }, { x = 1, y = 0, z = 0 }, { x = 0, y = 0, z = -1 }, { x = -1, y = 0, z = 0 }, { x = 0, y = -1, z = 0 }, { x = 0, y = 1, z = 0 } } --- Waxing Function -function mcl_honey.wax_block(pos, node, player, itemstack, pointed_thing) - -- prevent modification of protected nodes. - if mcl_util.check_position_protection(pos, player) then return end - - -- Make sure we aren't trying to wax an unknown node - local def = minetest.registered_nodes[node.name] - if not def then return itemstack end - - -- Do right-click action if a handler exists and the player isn't sneaking - if def.on_rightclick and not ( player and player:get_player_control().sneak ) then - return def.on_rightclick(pos, node, player, itemstack, pointed_thing) - end - - -- We shouldn't try to wax blocks that don't have a waxed variant - if not def._mcl_waxed_variant then return end - - -- Wax the node - node.name = def._mcl_waxed_variant - minetest.swap_node(pos, node) - - -- Call the node's waxed hook - local hook = def._mcl_on_wax - if hook then hook(pos, node, def) end - - -- Handle the award - awards.unlock(player:get_player_name(), "mcl:wax_on") - - -- Deal with the honeycomb - if not minetest.is_creative_enabled(player:get_player_name()) then - itemstack:take_item() - end - return itemstack -end - --- Honeycomb -minetest.register_craftitem("mcl_honey:honeycomb", { - description = S("Honeycomb"), - _doc_items_longdesc = S("Used to craft beehives and protect copper blocks from further oxidation."), - _doc_items_usagehelp = S("Use on copper blocks to prevent further oxidation."), - inventory_image = "mcl_honey_honeycomb.png", - groups = { craftitem = 1 }, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then - return itemstack - end - local node = minetest.get_node(pointed_thing.under) - local pos = pointed_thing.under - - -- wax the block. This is the only viable usage of honeycomb's on_place. If it "fails" to wax, then nothing is changed. - return mcl_honey.wax_block(pos, node, placer, itemstack, pointed_thing) - end, -}) - --- Honey -minetest.register_craftitem("mcl_honey:honey_bottle", { - description = S("Honey Bottle"), - _doc_items_longdesc = S("Honey Bottle is used to craft honey blocks and to restore hunger points."), - _doc_items_usagehelp = S("Drinking will restore 6 hunger points. Can also be used to craft honey blocks."), - inventory_image = "mcl_honey_honey_bottle.png", - groups = { craftitem = 1, food = 3, eatable = 6, can_eat_when_full = 1 }, - on_place = minetest.item_eat(6, "mcl_potions:glass_bottle"), - on_secondary_use = minetest.item_eat(6, "mcl_potions:glass_bottle"), - _mcl_saturation = 1.2, - stack_max = 16, -}) - minetest.register_node("mcl_honey:honey_block", { description = S("Honey Block"), _doc_items_longdesc = S("Honey Block. Used as a decoration and in redstone. Is sticky on some sides."),