From f3a7e9350f6056046c35774304e7b06fcc78e03a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 11 Aug 2024 16:54:35 +0100 Subject: [PATCH] remove certain foods and recipes when using mineclone --- item_recipes.lua | 132 +++++++++++++++++++++++++++------------------ items_food.lua | 58 ++++++++++++-------- items_non_food.lua | 120 +++++++++++++++++++++-------------------- lucky_block.lua | 1 + 4 files changed, 178 insertions(+), 133 deletions(-) diff --git a/item_recipes.lua b/item_recipes.lua index 430da91..4b10895 100644 --- a/item_recipes.lua +++ b/item_recipes.lua @@ -192,12 +192,15 @@ minetest.register_craft( { -- cocoa beans -minetest.register_craft({ - type = "cooking", - cooktime = 5, - output = "farming:cocoa_beans", - recipe = "farming:cocoa_beans_raw" -}) +if not farming.mcl then + + minetest.register_craft({ + type = "cooking", + cooktime = 5, + output = "farming:cocoa_beans", + recipe = "farming:cocoa_beans_raw" + }) +end -- bar of dark chocolate @@ -269,10 +272,13 @@ minetest.register_craft({ -- golden carrot -minetest.register_craft({ - output = "farming:carrot_gold", - recipe = {{"group:food_carrot", "default:gold_lump"}} -}) +if not farming.mcl then + + minetest.register_craft({ + output = "farming:carrot_gold", + recipe = {{"group:food_carrot", "default:gold_lump"}} + }) +end -- blueberry pie @@ -296,13 +302,16 @@ minetest.register_craft({ -- beetroot soup -minetest.register_craft({ - output = "farming:beetroot_soup", - recipe = { - {"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"}, - {"group:food_beetroot", "group:food_bowl", "group:food_beetroot"} - } -}) +if not farming.mcl then + + minetest.register_craft({ + output = "farming:beetroot_soup", + recipe = { + {"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"}, + {"group:food_beetroot", "group:food_bowl", "group:food_beetroot"} + } + }) +end -- tomato soup @@ -885,12 +894,15 @@ minetest.register_craft({ -- baked potato -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:baked_potato", - recipe = "group:food_potato" -}) +if not farming.mcl then + + minetest.register_craft({ + type = "cooking", + cooktime = 10, + output = "farming:baked_potato", + recipe = "group:food_potato" + }) +end -- potato & cucumber salad @@ -1046,36 +1058,47 @@ minetest.register_craft({ -- toasted sunflower seeds -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:sunflower_seeds_toasted", - recipe = "farming:seed_sunflower" -}) +if not farming.mcl then + + minetest.register_craft({ + type = "cooking", + cooktime = 10, + output = "farming:sunflower_seeds_toasted", + recipe = "farming:seed_sunflower" + }) +end -- sunflower oil -minetest.register_craft( { - output = "farming:sunflower_oil", - recipe = { - {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, - {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, - {"group:food_sunflower_seeds", a.glass_bottle, "group:food_sunflower_seeds"} - } -}) +if not farming.mcl then + + local tmp = "group:food_sunflower_seeds" + + minetest.register_craft( { + output = "farming:sunflower_oil", + recipe = { + {tmp, tmp, tmp}, + {tmp, tmp, tmp}, + {tmp, a.glass_bottle, tmp} + } + }) +end -- sunflower seed bread -minetest.register_craft({ - output = "farming:sunflower_bread", - recipe = { - { - "group:food_sunflower_seeds_toasted", - "group:food_bread", - "group:food_sunflower_seeds_toasted" +if not farming.mcl then + + minetest.register_craft({ + output = "farming:sunflower_bread", + recipe = { + { + "group:food_sunflower_seeds_toasted", + "group:food_bread", + "group:food_sunflower_seeds_toasted" + } } - } -}) + }) +end -- vanilla extract @@ -1092,13 +1115,16 @@ minetest.register_craft( { -- jack 'o lantern -minetest.register_craft({ - output = "farming:jackolantern", - recipe = { - {"default:torch"}, - {"group:food_pumpkin"} - } -}) +if not farming.mcl then + + minetest.register_craft({ + output = "farming:jackolantern", + recipe = { + {"default:torch"}, + {"group:food_pumpkin"} + } + }) +end -- wooden scarecrow base diff --git a/items_food.lua b/items_food.lua index 929edfa..869557b 100644 --- a/items_food.lua +++ b/items_food.lua @@ -113,11 +113,14 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") -- Cocoa beans -minetest.register_craftitem("farming:cocoa_beans", { - description = S("Cocoa Beans"), - inventory_image = "farming_cocoa_beans.png", - groups = {compostability = 65, food_cocoa = 1, flammable = 2} -}) +if not farming.mcl then + + minetest.register_craftitem("farming:cocoa_beans", { + description = S("Cocoa Beans"), + inventory_image = "farming_cocoa_beans.png", + groups = {compostability = 65, food_cocoa = 1, flammable = 2} + }) +end -- Chocolate cookie @@ -180,13 +183,16 @@ farming.add_eatable("farming:carrot_juice", 4) -- Golden carrot -minetest.register_craftitem("farming:carrot_gold", { - description = S("Golden Carrot"), - inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(10) -}) +if not farming.mcl then -farming.add_eatable("farming:carrot_gold", 10) + minetest.register_craftitem("farming:carrot_gold", { + description = S("Golden Carrot"), + inventory_image = "farming_carrot_gold.png", + on_use = minetest.item_eat(10) + }) + + farming.add_eatable("farming:carrot_gold", 10) +end -- Blueberry Pie @@ -212,13 +218,16 @@ farming.add_eatable("farming:muffin_blueberry", 2) -- beetroot soup -minetest.register_craftitem("farming:beetroot_soup", { - description = S("Beetroot Soup"), - inventory_image = "farming_beetroot_soup.png", - on_use = minetest.item_eat(6, "farming:bowl") -}) +if not farming.mcl then -farming.add_eatable("farming:beetroot_soup", 6) + minetest.register_craftitem("farming:beetroot_soup", { + description = S("Beetroot Soup"), + inventory_image = "farming_beetroot_soup.png", + on_use = minetest.item_eat(6, "farming:bowl") + }) + + farming.add_eatable("farming:beetroot_soup", 6) +end -- Tomato soup @@ -784,13 +793,16 @@ farming.add_eatable("farming:pineapple_juice", 4) -- Baked potato -minetest.register_craftitem("farming:baked_potato", { - description = S("Baked Potato"), - inventory_image = "farming_baked_potato.png", - on_use = minetest.item_eat(6) -}) +if not farming.mcl then -farming.add_eatable("farming:baked_potato", 6) + minetest.register_craftitem("farming:baked_potato", { + description = S("Baked Potato"), + inventory_image = "farming_baked_potato.png", + on_use = minetest.item_eat(6) + }) + + farming.add_eatable("farming:baked_potato", 6) +end -- Potato & cucumber Salad diff --git a/items_non_food.lua b/items_non_food.lua index 25d176c..d097a4b 100644 --- a/items_non_food.lua +++ b/items_non_food.lua @@ -3,11 +3,14 @@ local S = minetest.get_translator("farming") -- wooden bowl -minetest.register_craftitem("farming:bowl", { - description = S("Wooden Bowl"), - inventory_image = "farming_bowl.png", - groups = {food_bowl = 1, flammable = 2} -}) +if not farming.mcl then + + minetest.register_craftitem("farming:bowl", { + description = S("Wooden Bowl"), + inventory_image = "farming_bowl.png", + groups = {food_bowl = 1, flammable = 2} + }) +end -- saucepan @@ -189,61 +192,64 @@ minetest.register_node("farming:hemp_rope", { -- Jack 'O Lantern -minetest.register_node("farming:jackolantern", { - description = S("Jack 'O Lantern (punch to turn on and off)"), - tiles = { - "farming_pumpkin_bottom.png^farming_pumpkin_top.png", - "farming_pumpkin_bottom.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png^farming_pumpkin_face_off.png" - }, - paramtype2 = "facedir", - groups = { - handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 - }, - is_ground_content = false, - sounds = farming.node_sound_wood_defaults(), +if not farming.mcl then - on_punch = function(pos, node, puncher) - local name = puncher:get_player_name() or "" - if minetest.is_protected(pos, name) then return end - node.name = "farming:jackolantern_on" - minetest.swap_node(pos, node) - end, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1 -}) + minetest.register_node("farming:jackolantern", { + description = S("Jack 'O Lantern (punch to turn on and off)"), + tiles = { + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", + "farming_pumpkin_bottom.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png^farming_pumpkin_face_off.png" + }, + paramtype2 = "facedir", + groups = { + handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 + }, + is_ground_content = false, + sounds = farming.node_sound_wood_defaults(), -minetest.register_node("farming:jackolantern_on", { - tiles = { - "farming_pumpkin_bottom.png^farming_pumpkin_top.png", - "farming_pumpkin_bottom.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png^farming_pumpkin_face_on.png" - }, - light_source = minetest.LIGHT_MAX - 1, - paramtype2 = "facedir", - groups = { - handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, - not_in_creative_inventory = 1 - }, - is_ground_content = false, - sounds = farming.node_sound_wood_defaults(), - drop = "farming:jackolantern", + on_punch = function(pos, node, puncher) + local name = puncher:get_player_name() or "" + if minetest.is_protected(pos, name) then return end + node.name = "farming:jackolantern_on" + minetest.swap_node(pos, node) + end, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1 + }) - on_punch = function(pos, node, puncher) - local name = puncher:get_player_name() or "" - if minetest.is_protected(pos, name) then return end - node.name = "farming:jackolantern" - minetest.swap_node(pos, node) - end, - _mcl_hardness = 0.8, - _mcl_blast_resistance = 1 -}) + minetest.register_node("farming:jackolantern_on", { + tiles = { + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", + "farming_pumpkin_bottom.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png", + "farming_pumpkin_side.png^farming_pumpkin_face_on.png" + }, + light_source = minetest.LIGHT_MAX - 1, + paramtype2 = "facedir", + groups = { + handy = 1, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, + not_in_creative_inventory = 1 + }, + is_ground_content = false, + sounds = farming.node_sound_wood_defaults(), + drop = "farming:jackolantern", + + on_punch = function(pos, node, puncher) + local name = puncher:get_player_name() or "" + if minetest.is_protected(pos, name) then return end + node.name = "farming:jackolantern" + minetest.swap_node(pos, node) + end, + _mcl_hardness = 0.8, + _mcl_blast_resistance = 1 + }) +end --- Wooden scarecrow base diff --git a/lucky_block.lua b/lucky_block.lua index 68cf63f..118fadc 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -27,6 +27,7 @@ lucky_block:add_blocks({ {"dro", {"farming:juicer"}, 1}, {"dro", {"farming:mixing_bowl"}, 1}, {"dro", {"farming:hoe_bronze"}, 1}, + {"dro", {"farming:sunflower_oil", 5}, {"dro", {"farming:hoe_mese"}, 1}, {"dro", {"farming:hoe_diamond"}, 1}, {"dro", {"farming:hoe_bomb"}, 10},