Update Farming, Mobs, 3d_armor

Farming : minors fixe, add the straw block
Mobs : better api, swimming parameter for mobs, add eggs, code
optimisation
3d_armor : change the model, many new textures, new shield, and new
enchanted shield (which gain compared to normal shield +1 armor and x2
durability)

mods/3d_armor/shields/crafting_guide.txt

@@ -10,7 +10,25 @@ Shields -- Crafting Guide
 +---+---+---+
 
 [shields:shield_wood] X = [default:wood]
+[shields:shield_cactus] X = [default:cactus]
 [shields:shield_steel] X = [default:steel_ingot]
 [shields:shield_bronze] X = [default:bronze_ingot]
 [shields:shield_diamond] X = [default:diamond]
 [shields:shield_gold] X = [default:gold_ingot]
+
+Enhanced Shields
+----------------
+
++---+
+| S |
++---+
+| X |
++---+
+| S |
++---+
+
+[shields:shield_enhanced_wood] X = [shields:shield_wood]
+[shields:shield_enhanced_cactus] X = [shields:shield_cactus]
+
+S = [default:steel_ingot]
+

mods/3d_armor/shields/init.lua

@@ -2,42 +2,96 @@ local use_moreores = minetest.get_modpath("moreores")
 
 -- Regisiter Shields
 
-minetest.register_tool("shields:shield_wood", {
-	description = "Wooden Shield",
-	inventory_image = "shields_inv_shield_wood.png",
-	groups = {armor_shield=5, armor_heal=0, armor_use=2000},
+minetest.register_tool("shields:shield_admin", {
+	description = "Admin Shield",
+	inventory_image = "shields_inv_shield_admin.png",
+	groups = {armor_shield=1000, armor_heal=100, armor_use=0},
 	wear = 0,
 })
 
-minetest.register_tool("shields:shield_steel", {
-	description = "Steel Shield",
-	inventory_image = "shields_inv_shield_steel.png",
-	groups = {armor_shield=8, armor_heal=0, armor_use=500},
-	wear = 0,
-})
+if ARMOR_MATERIALS.wood then
+	minetest.register_tool("shields:shield_wood", {
+		description = "Wooden Shield",
+		inventory_image = "shields_inv_shield_wood.png",
+		groups = {armor_shield=5, armor_heal=0, armor_use=2000},
+		wear = 0,
+	})
+	minetest.register_tool("shields:shield_enhanced_wood", {
+		description = "Enhanced Wood Shield",
+		inventory_image = "shields_inv_shield_enhanced_wood.png",
+		groups = {armor_shield=6, armor_heal=0, armor_use=1000},
+		wear = 0,
+	})
+	minetest.register_craft({
+		output = "shields:shield_enhanced_wood",
+		recipe = {
+			{"default:steel_ingot"},
+			{"shields:shield_wood"},
+			{"default:steel_ingot"},
+		},
+	})
+end
 
-minetest.register_tool("shields:shield_bronze", {
-	description = "Bronze Shield",
-	inventory_image = "shields_inv_shield_bronze.png",
-	groups = {armor_shield=10, armor_heal=6, armor_use=250},
-	wear = 0,
-})
+if ARMOR_MATERIALS.cactus then
+	minetest.register_tool("shields:shield_cactus", {
+		description = "Cactus Shield",
+		inventory_image = "shields_inv_shield_cactus.png",
+		groups = {armor_shield=6, armor_heal=0, armor_use=1000},
+		wear = 0,
+	})
+	minetest.register_tool("shields:shield_enhanced_cactus", {
+		description = "Enhanced Cactus Shield",
+		inventory_image = "shields_inv_shield_enhanced_cactus.png",
+		groups = {armor_shield=7, armor_heal=0, armor_use=500},
+		wear = 0,
+	})
+	minetest.register_craft({
+		output = "shields:shield_enhanced_cactus",
+		recipe = {
+			{"default:steel_ingot"},
+			{"shields:shield_cactus"},
+			{"default:steel_ingot"},
+		},
+	})
+end
 
-minetest.register_tool("shields:shield_diamond", {
-	description = "Diamond Shield",
-	inventory_image = "shields_inv_shield_diamond.png",
-	groups = {armor_shield=14, armor_heal=12, armor_use=100},
-	wear = 0,
-})
+if ARMOR_MATERIALS.steel then
+	minetest.register_tool("shields:shield_steel", {
+		description = "Steel Shield",
+		inventory_image = "shields_inv_shield_steel.png",
+		groups = {armor_shield=8, armor_heal=0, armor_use=500},
+		wear = 0,
+	})
+end
 
-minetest.register_tool("shields:shield_gold", {
-	description = "Gold Shield",
-	inventory_image = "shields_inv_shield_gold.png",
-	groups = {armor_shield=12, armor_heal=6, armor_use=200},
-	wear = 0,
-})
+if ARMOR_MATERIALS.bronze then
+	minetest.register_tool("shields:shield_bronze", {
+		description = "Bronze Shield",
+		inventory_image = "shields_inv_shield_bronze.png",
+		groups = {armor_shield=10, armor_heal=6, armor_use=250},
+		wear = 0,
+	})
+end
 
-if use_moreores then
+if ARMOR_MATERIALS.diamond then
+	minetest.register_tool("shields:shield_diamond", {
+		description = "Diamond Shield",
+		inventory_image = "shields_inv_shield_diamond.png",
+		groups = {armor_shield=14, armor_heal=12, armor_use=100},
+		wear = 0,
+	})
+end
+
+if ARMOR_MATERIALS.gold then
+	minetest.register_tool("shields:shield_gold", {
+		description = "Gold Shield",
+		inventory_image = "shields_inv_shield_gold.png",
+		groups = {armor_shield=12, armor_heal=6, armor_use=200},
+		wear = 0,
+	})
+end
+
+if ARMOR_MATERIALS.mithril then
 	minetest.register_tool("shields:shield_mithril", {
 		description = "Mithril Shield",
 		inventory_image = "shields_inv_shield_mithril.png",
@@ -46,19 +100,7 @@ if use_moreores then
 	})
 end
 
-local craft_ingreds = {
-	wood = "default:wood",
-	steel = "default:steel_ingot",
-	bronze = "default:bronze_ingot",
-	diamond = "default:diamond",
-	gold = "default:gold_ingot",
-}	
-
-if use_moreores then
-	craft_ingreds.mithril = "moreores:mithril_ingot"
-end
-
-for k, v in pairs(craft_ingreds) do
+for k, v in pairs(ARMOR_MATERIALS) do
 	minetest.register_craft({
 		output = "shields:shield_"..k,
 		recipe = {