Rest der Rezepte amgepasst

mods/x_farming/cocoa.lua

@@ -145,7 +145,7 @@ minetest.register_craftitem('x_farming:cocoa_bean', {
     tiles = { 'x_farming_cocoa_bean.png' },
     inventory_image = 'x_farming_cocoa_bean.png',
     wield_image = 'x_farming_cocoa_bean.png',
-    groups = { compost = 65 },
+    groups = { compost = 65 , food_cocoa = 1},
     on_place = x_farming.place_cocoa_bean,
 })
 

mods/x_farming/coffee.lua

@@ -41,6 +41,7 @@ minetest.override_item('x_farming:coffee', {
         compost = 50,
         -- MCL
         compostability = 50,
+        food_coffee = 1
     }
 })
 

mods/x_farming/crafting.lua

@@ -31,7 +31,7 @@ minetest.register_craft({
 minetest.register_craft({
     type = 'shapeless',
     output = 'x_farming:cookie 8',
-    recipe = { 'x_farming:barley', 'x_farming:cocoa_bean', 'x_farming:flour', 'x_farming:bottle_soymilk', 'x_farming:sugar' }
+    recipe = { 'x_farming:barley', 'x_farming:cocoa_bean', 'x_farming:flour', 'group:food_soy_milk', 'x_farming:sugar' }
 })
 
 minetest.register_craft({
@@ -76,7 +76,7 @@ minetest.register_craft({
     output = 'x_farming:fish_stew',
     recipe = {
         { '', 'group:fish', '' },
-        { 'x_farming:carrot', 'x_farming:bakedpotato', 'x_farming:salt' },
+        { 'x_farming:carrot', 'x_farming:bakedpotato', 'group:food_salt' },
         { '', 'x_farming:bowl', '' }
     }
 })
@@ -137,7 +137,7 @@ minetest.register_craft({
     output = 'x_farming:corn_popcorn',
     recipe = {
         { 'x_farming:corn_pop', 'x_farming:corn_pop', 'x_farming:corn_pop' },
-        { 'default:paper', 'x_farming:salt', 'default:paper' },
+        { 'default:paper', 'group:food_salt', 'default:paper' },
         { 'default:paper', 'default:paper', 'default:paper' },
     }
 })
@@ -225,7 +225,7 @@ minetest.register_craft({
 minetest.register_craft({
     type = 'shapeless',
     output = 'x_farming:pumpkin_pie',
-    recipe = { 'group:pumpkin', 'x_farming:flour', 'x_farming:bottle_soymilk', 'x_farming:sugar' }
+    recipe = { 'group:pumpkin', 'x_farming:flour', 'group:food_soy_milk', 'x_farming:sugar' }
 })
 
 -- pumpkin block carving
@@ -335,13 +335,13 @@ end
 minetest.register_craft({
     type = 'shapeless',
     output = 'x_farming:donut',
-    recipe = { 'x_farming:bottle_soymilk', 'x_farming:sugar', 'x_farming:flour' }
+    recipe = { 'group:food_soy_milk', 'x_farming:sugar', 'x_farming:flour' }
 })
 
 minetest.register_craft({
     type = 'shapeless',
     output = 'x_farming:donut_chocolate',
-    recipe = { 'x_farming:bottle_soymilk', 'x_farming:sugar', 'x_farming:flour', 'x_farming:cocoa_bean' }
+    recipe = { 'group:food_soy_milk', 'x_farming:sugar', 'x_farming:flour', 'x_farming:cocoa_bean' }
 })
 
 -- Fries
@@ -349,7 +349,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'x_farming:fries',
     recipe = {
-        { '', '', 'x_farming:salt' },
+        { '', '', 'group:food_salt' },
         { '', 'x_farming:bakedpotato', '' },
         { 'default:paper', '', '' }
     },
@@ -942,35 +942,45 @@ minetest.register_craft({
 
 -- Sushi
 
-minetest.register_craft({
-    type = 'shapeless',
-    output = 'x_farming:sushi_maki',
-    recipe = { 'x_farming:rice_grains', 'default:sand_with_kelp', 'group:fish' }
+    minetest.register_craft({
+        type = 'shapeless',
+        output = 'x_farming:sushi_maki',
+        recipe = { 'group:food_rice', 'default:sand_with_kelp', 'group:fish' }
 })
 
-minetest.register_craft({
-    type = 'shapeless',
-    output = 'x_farming:sushi_nigiri',
-    recipe = { 'x_farming:rice_grains', 'group:fish' }
-})
+    minetest.register_craft({
+        type = 'shapeless',
+        output = 'x_farming:sushi_maki',
+        recipe = { 'group:food_rice', 'group:food_seaweed', 'group:fish' }
+    })
+
+if not(minetest.get_modpath("ethereal")) then
+
+    minetest.register_craft({
+        type = 'shapeless',
+        output = 'x_farming:sushi_nigiri',
+        recipe = { 'group:food_rice', 'group:fish' }
+    })
+
+end
 
 -- Feasts
 
 minetest.register_craft({
     output = 'x_farming:french_potatoes_1',
     recipe = {
-        { 'x_farming:bakedpotato', 'x_farming:bottle_soymilk', 'x_farming:bakedpotato' },
-        { 'x_farming:bakedpotato', 'x_farming:corn', 'x_farming:bakedpotato' },
-        { 'x_farming:salt', 'x_farming:bowl', 'x_farming:salt' },
+        { 'x_farming:bakedpotato', 'group:food_soy_milk', 'x_farming:bakedpotato' },
+        { 'x_farming:bakedpotato', 'group:food_corn', 'x_farming:bakedpotato' },
+        { 'group:food_salt', 'group:food_bowl', 'group:food_salt' },
     }
 })
 
 minetest.register_craft({
     output = 'x_farming:baked_fish_1',
     recipe = {
-        { 'x_farming:beetroot', 'x_farming:rice_grains', 'x_farming:beetroot' },
+        { 'x_farming:beetroot', 'group:food_rice', 'x_farming:beetroot' },
         { 'x_farming:carrot', 'group:fish', 'x_farming:carrot' },
-        { 'x_farming:salt', 'x_farming:bowl', 'x_farming:salt' },
+        { 'group:food_salt', 'group:food_bowl', 'group:food_salt' },
     }
 })
 
@@ -983,6 +993,15 @@ minetest.register_craft({
     }
 })
 
+minetest.register_craft({
+    output = 'x_farming:melon_slush_1',
+    recipe = {
+        { 'x_farming:sugar', 'x_farming:melon_fruit', 'x_farming:sugar' },
+        { 'default:ice', 'x_farming:melon_fruit', 'default:ice' },
+        { 'default:ice', 'default:glass', 'default:ice' },
+    }
+})
+
 minetest.register_craft({
     type = 'shapeless',
     output = 'x_farming:french_potatoes_1',
@@ -1015,7 +1034,7 @@ minetest.register_craft({
     output = 'x_farming:chocolate_pie_1',
     recipe = {
         { 'x_farming:chocolate', 'x_farming:chocolate', 'x_farming:chocolate' },
-        { 'x_farming:bottle_soymilk', 'x_farming:bottle_soymilk', 'x_farming:bottle_soymilk' },
+        { 'group:food_soy_milk', 'group:food_soy_milk', 'group:food_soy_milk' },
         { 'x_farming:sugar', 'x_farming:flour', 'x_farming:sugar' },
     }
 })
@@ -1025,7 +1044,7 @@ minetest.register_craft({
     recipe = {
         { 'x_farming:bottle_honey', 'x_farming:bottle_honey', 'x_farming:bottle_honey' },
         { 'x_farming:kiwi_fruit', 'x_farming:kiwi_fruit', 'x_farming:kiwi_fruit' },
-        { 'x_farming:bottle_soymilk', 'x_farming:flour', 'x_farming:bottle_soymilk' },
+        { 'group:food_soy_milk', 'x_farming:flour', 'group:food_soy_milk' },
     }
 })
 

mods/x_farming/craftitems.lua

@@ -103,7 +103,8 @@ local bottle_honey_def = {
         craftitem = 1,
         food = 3,
         eatable = 6,
-        can_eat_when_full = 1
+        can_eat_when_full = 1,
+        food_honey = 1
     },
     _mcl_saturation = 1.2,
 }
@@ -206,7 +207,9 @@ if minetest.get_modpath('mcl_farming') then
     sushi_nigiri_def.on_secondary_use = minetest.item_eat(3)
 end
 
+if not(minetest.get_modpath('ethereal')) then
 minetest.register_craftitem('x_farming:sushi_nigiri', sushi_nigiri_def)
+end
 
 -- Brick
 minetest.register_craftitem('x_farming:silt_loam_brick', {

mods/x_farming/ice_fishing.lua

@@ -671,6 +671,7 @@ for i, def in ipairs(fishes) do
                 -- MCL
                 food = 2,
                 eatable = 5,
+                food_fish = 1
             },
             _mcl_saturation = 6,
         }

mods/x_farming/melon.lua

@@ -42,6 +42,7 @@ local melon_def = {
         food = 2,
         eatable = 2,
         compostability = 50,
+        food_melon = 1
     },
     _mcl_saturation = 1.2,
     wield_image = 'x_farming_melon.png',

mods/x_farming/stevia.lua

@@ -48,7 +48,7 @@ minetest.register_craftitem('x_farming:sugar', {
     description = S('Sugar'),
     short_description = S('Sugar'),
     inventory_image = 'x_farming_sugar.png',
-    groups = { flammable = 1 },
+    groups = { flammable = 1 , food_sugar = 1},
 })
 
 ---crate