Started implementing food things.

mods/desert_life/barrel_cacti.lua

@@ -27,7 +27,7 @@ minetest.register_node('desert_life:barrel_cacti_'..num, {
    drawtype = 'mesh',
    mesh = 'dl_barrel_cacti_'..num..'.obj',
    tiles = {'dl_barrel_cacti.png'},
-   groups = {oddly_breakable_by_hand=3, choppy=1},
+   groups = {oddly_breakable_by_hand=3, choppy=1, flora=1},
    paramtype = 'light',
    paramtype2 = 'facedir',
    selection_box = col,

mods/desert_life/prickly_pear.lua

@@ -53,7 +53,7 @@ for i in ipairs (prickly_pear_table) do
       drawtype = 'mesh',
       mesh = 'dl_pp_'..num..'.obj',
       tiles = {'dl_prickly_pear.png'},
-      groups = {not_in_creative_inventory=1, dl_pp=1},
+      groups = {not_in_creative_inventory=1, dl_pp=1, flora=1},
       paramtype = 'light',
       paramtype2 = 'facedir',
       selection_box = col,
@@ -81,7 +81,7 @@ minetest.register_node('desert_life:prickly_pear', {
    drawtype = 'mesh',
    mesh = 'dl_pp_1.obj',
    tiles = {'dl_prickly_pear.png'},
-   groups = {dig_immediate = 3},
+   groups = {dig_immediate = 3, flora=1},
    paramtype = 'light',
    paramtype2 = 'facedir',
    selection_box = {

mods/drinks/drink_machines.lua

@@ -163,7 +163,7 @@ minetest.register_node('drinks:juice_press', {
                         meta:set_string('container', 'tube')
                         meta:set_string('fruitnumber', 2)
                         meta:set_string('infotext', 'Juicing...')
-                        meta_u:set_string('fruit', fruit)
+                        meta_u:set_string('fruit', fruit_name)
                         timer:start(4)
                      else
                         meta:set_string('infotext', "You can't mix juices.")
@@ -175,7 +175,7 @@ minetest.register_node('drinks:juice_press', {
                         meta:set_string('container', 'tube')
                         meta:set_string('fruitnumber', 2)
                         meta:set_string('infotext', 'Juicing...')
-                        meta_u:set_string('fruit', fruit)
+                        meta_u:set_string('fruit', fruit_name)
                         timer:start(4)
                      else
                         meta:set_string('infotext', "You can't mix juices.")

mods/drinks/init.lua

@@ -73,7 +73,9 @@ drinks.juice_name = {
    ['banana'] = 'banana',
    ['orange'] = 'orange',
    ['prickly_pear'] = 'cactus',
-   ['barrel_cacti_1'] = 'cactus'
+   ['barrel_cacti_1'] = 'cactus',
+   ['barrel_cacti_2'] = 'cactus',
+   ['barrel_cacti_3'] = 'cactus'
 }
 
 --Default
@@ -115,6 +117,8 @@ table.insert(drinks.drink_table, {'orange', 'Orange', '#ffc417'})
 --Desert_life
 drinks.juiceable['prickly_pear'] = true
 drinks.juiceable['barrel_cacti_1'] = true
+drinks.juiceable['barrel_cacti_2'] = true
+drinks.juiceable['barrel_cacti_3'] = true
 table.insert(drinks.drink_table, {'prickly', 'Cactus', '#96F97B'})
 table.insert(drinks.drink_table, {'barrel', 'Cactus', '#96F97B'})
 

mods/epic/overrides.lua

@@ -12,36 +12,6 @@ minetest.register_tool(':mobs:pick_lava', {
    groups = {pickaxe = 1}
 })
 
-local flour_recipes = {
-   {'farming:rice_flour', 'farming:rice'},
-   {'farming:flour', 'farming:wheat'},
-   {'farming:flour', 'farming:rye'},
-   {'farming:flour', 'farming:barley'},
-}
-
-for i in ipairs (flour_recipes) do
-   local output = flour_recipes[i][1]
-   local input = flour_recipes[i][2]
-
-   minetest.register_craft({
-      type = 'shapeless',
-      output = output,
-      recipe = {
-         input, input, input,
-         input,
-      }
-   })
-end
-
-minetest.register_craft({
-   type = 'shapeless',
-   output = 'farming:flour_multigrain',
-   recipe = {
-      'farming:wheat', 'farming:barley', 'farming:oat',
-      'farming:rye',
-   }
-})
-
 minetest.clear_craft({ --TNT recipe
    recipe = {
       {'default:coal_lump', 'default:gravel', ''},

mods/fantasy_mobs/larva.lua

@@ -92,6 +92,7 @@ mobs:register_mob('fantasy_mobs:larva_pet', {
       if mobs:feed_tame(self, clicker, 10, false, true) then
          return
       end
+      if mobs:protect(self, clicker) then return end
       if self.owner and self.owner == name then
          if self.order == 'follow' then
             self.order = 'stand'

mods/farming/crops/barley.lua

@@ -26,17 +26,6 @@ minetest.register_craftitem("farming:barley", {
 	groups = {food_barley = 1, flammable = 2},
 })
 
--- flour
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:flour",
-	recipe = {
-		"farming:barley", "farming:barley", "farming:barley",
-		"farming:barley", "farming:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
-})
-
 -- barley definition
 local crop_def = {
 	drawtype = "plantlike",

mods/farming/crops/ryeoatrice.lua

@@ -17,16 +17,6 @@ minetest.override_item("farming:rye", {
 	groups = {food_rye = 1, flammable = 4}
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:flour",
-	recipe = {
-		"farming:rye", "farming:rye", "farming:rye", "farming:rye",
-		"farming:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
-})
-
 -- Oats
 
 farming.register_plant("farming:oat", {
@@ -41,16 +31,6 @@ minetest.override_item("farming:oat", {
 	groups = {food_oats = 1, flammable = 4}
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:flour",
-	recipe = {
-		"farming:oat", "farming:oat", "farming:oat", "farming:oat",
-		"farming:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
-})
-
 -- Rice
 
 farming.register_plant("farming:rice", {
@@ -78,16 +58,6 @@ minetest.register_craftitem("farming:rice_flour", {
 	groups = {food_rice_flour = 1, flammable = 1},
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:rice_flour",
-	recipe = {
-		"farming:rice", "farming:rice", "farming:rice", "farming:rice",
-		"farming:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
-})
-
 minetest.register_craft({
 	type = "cooking",
 	cooktime = 15,
@@ -103,16 +73,6 @@ minetest.register_craftitem("farming:flour_multigrain", {
 	groups = {food_flour = 1, flammable = 1},
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:flour_multigrain",
-	recipe = {
-		"farming:wheat", "farming:barley", "farming:oat",
-		"farming:rye", "farming:mortar_pestle"
-	},
-	replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}},
-})
-
 -- Multigrain bread
 
 minetest.register_craftitem("farming:bread_multigrain", {

mods/farming/hoes.lua

@@ -155,6 +155,34 @@ farming.register_hoe(":farming:hoe_diamond", {
    groups = {not_in_creative_inventory = 1},
 })
 
+-- Toolranks support
+if tr then
+
+minetest.override_item("farming:hoe_wood", {
+	original_description = "Wood Hoe",
+	description = toolranks.create_description("Wood Hoe")})
+
+minetest.override_item("farming:hoe_stone", {
+	original_description = "Stone Hoe",
+	description = toolranks.create_description("Stone Hoe")})
+
+minetest.override_item("farming:hoe_steel", {
+	original_description = "Steel Hoe",
+	description = toolranks.create_description("Steel Hoe")})
+
+minetest.override_item("farming:hoe_bronze", {
+	original_description = "Bronze Hoe",
+	description = toolranks.create_description("Bronze Hoe")})
+
+minetest.override_item("farming:hoe_mese", {
+	original_description = "Mese Hoe",
+	description = toolranks.create_description("Mese Hoe")})
+
+minetest.override_item("farming:hoe_diamond", {
+	original_description = "Diamond Hoe",
+	description = toolranks.create_description("Diamond Hoe")})
+end
+
 -- hoe bomb function
 local function hoe_area(pos, player)
    -- check for protection

mods/food/baked_goods/breads.lua

@@ -0,0 +1,31 @@
+local breads = {
+   {'Banana', 'banana', 5},
+   {'Barley', 'barley', 4},
+   {'Corn', 'corn', 5},
+   {'Multigrain', 'multigrain', 6},
+   {'Oat', 'oat', 5},
+   {'Pumpkin', 'pumpkin', 6},
+   {'Rice', 'rice', 5},
+   {'Rye', 'rye', 5},
+   {'Wheat', 'wheat', 5},
+}
+
+for i in ipairs (breads) do
+   local name = breads[i][1]
+   local internal = breads[i][2]
+   local hunger = breads[i][3]
+
+   minetest.register_craftitem('food:bread_'..internal..'_dough', {
+      description = (name..' Bread Dough'),
+      inventory_image = 'food_bread_'..internal..'_dough.png',
+   })
+
+   minetest.register_craftitem('food:bread_'..internal, {
+      description = (name..' Bread'),
+      inventory_image = 'food_bread_'..internal..'.png',
+      on_use = minetest.item_eat(hunger)
+   })
+
+   --hbhunger.register_food(name, hunger_change, replace_with_item, poisen, heal, sound)
+   hbhunger.register_food('food:bread_'..internal, hunger)
+end

mods/food/baked_goods/cooking.lua

@@ -0,0 +1,23 @@
+local breads = {
+   {'banana', 15},
+   {'barley', 15},
+   {'corn', 15},
+   {'multigrain', 15},
+   {'oat', 15},
+   {'pumpkin', 15},
+   {'rice', 15},
+   {'rye', 15},
+   {'wheat', 15}
+}
+
+for i in ipairs (breads) do
+   local type = breads[i][1]
+   local time = breads[i][2]
+
+   minetest.register_craft({
+      type = 'cooking',
+      output = 'food:bread_'..type,
+      recipe = 'food:bread_'..type..'_dough',
+      cooktime = time,
+   })
+end

mods/food/baked_goods/simplecrafting_recipes.lua

@@ -0,0 +1,44 @@
+stations.dual_register_recipe('food_prep', {
+   input = {
+      ['group:food_flour'] = 1,
+      ['farming:sugar'] = 1,
+      ['mobs:egg'] = 1,
+      ['epic_trees:banana'] = 2,
+   },
+   output = 'food:bread_banana_dough',
+})
+
+stations.dual_register_recipe('food_prep', {
+   input = {
+      ['group:food_flour'] = 1,
+      ['farming:sugar'] = 1,
+      ['mobs:egg'] = 1,
+      ['farming:pumpkin_slice'] = 2,
+   },
+   output = 'food:bread_pumpkin_dough',
+})
+
+
+local breads = {
+   {'barley', 'barley'},
+   {'corn', 'corn'},
+   {'multigrain', 'multigrain'},
+   {'oat', 'oat'},
+   {'rice', 'rice'},
+   {'rye', 'rye'},
+   {'wheat', 'wheat'}
+}
+
+for i in ipairs (breads) do
+   local flour = breads[i][1]
+
+   stations.dual_register_recipe('food_prep', {
+      input = {
+         ['food:flour_'..flour] = 1,
+         ['farming:sugar'] = 1,
+         ['mobs:egg'] = 1,
+         ['epic:salt'] = 1,
+      },
+      output = 'food:bread_'..flour..'_dough',
+   })
+end