Pasta!

TODO.txt

@@ -21,7 +21,6 @@ food			No		Extra recipes
 							Apple pie
 							Ratatouille
 							Tomato stew
-							Pasta
 							Pasta w/tomato
 							Beef stew
 							Pizza

src/java/mmm/food/FCookableMeal.java

@@ -6,6 +6,7 @@ import mmm.core.api.I_RecipeRegistrar;
 import net.minecraft.init.MobEffects;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
@@ -22,12 +23,25 @@ public class FCookableMeal
 	private Object[] recipe;
 
 
-	public FCookableMeal( final String name , final int amount , final float saturation , final boolean dangerous ,
+	public FCookableMeal( final String name , final int amount , final float saturation , float danger ,
 			final boolean wolfLikes , final int quantity , final Object... recipe )
 	{
 		this.RAW = new ItemFood( Math.max( 1 , amount / 3 ) , saturation / 3f , wolfLikes );
-		if ( dangerous ) {
-			this.RAW.setPotionEffect( new PotionEffect( MobEffects.HUNGER , 600 , 0 ) , .3f );
+		if ( danger > 0 ) {
+			Potion effect;
+			if ( danger > 1 ) {
+				if ( danger > 2 ) {
+					effect = MobEffects.POISON;
+					danger -= 2;
+				} else {
+					effect = MobEffects.NAUSEA;
+					danger -= 1;
+				}
+			} else {
+				effect = MobEffects.HUNGER;
+
+			}
+			this.RAW.setPotionEffect( new PotionEffect( effect , 600 , 0 ) , Math.min( 1f , danger ) );
 		}
 		CRegistry.setIdentifiers( this.RAW , "food" , "meal" , name , "raw" );
 		CRegistry.addItem( this.RAW );
@@ -53,8 +67,7 @@ public class FCookableMeal
 			}
 			this.recipe = null;
 		}
-
-		GameRegistry.addSmelting( this.RAW , new ItemStack( this.COOKED ) , 0.15f );
+		FHelpers.addCooking( this.RAW , this.COOKED );
 	}
 
 }

src/java/mmm/food/FMeals.java

@@ -1,6 +1,7 @@
 package mmm.food;
 
 
+import mmm.MmmFood;
 import mmm.MmmMaterials;
 import net.minecraft.init.Items;
 
@@ -10,12 +11,15 @@ public class FMeals
 {
 
 	public final FCookableMeal SAUSAGE;
+	public final FCookableMeal PASTA;
 
 
 	public FMeals( )
 	{
-		this.SAUSAGE = new FCookableMeal( "sausage" , 3 , 0.7f , true , true , 4 , //
+		this.SAUSAGE = new FCookableMeal( "sausage" , 3 , 0.7f , 1.3f , true , 4 , //
 				Items.PORKCHOP , MmmMaterials.ITEM.ROCK_SALT , Items.LEATHER );
+		this.PASTA = new FCookableMeal( "pasta" , 2 , 0.7f , 0.5f , false , 1 , //
+				Items.EGG , MmmFood.INGREDIENT.FLOUR );
 	}
 
 }

src/resources/assets/mmm/lang/en_US.lang

@@ -149,6 +149,9 @@ item.mmm.food.ingredient.flour.name=Wheat Flour
 item.mmm.food.meal.sausage.raw.name=Raw Sausage
 item.mmm.food.meal.sausage.cooked.name=Sausage
 
+item.mmm.food.meal.pasta.raw.name=Pasta Dough
+item.mmm.food.meal.pasta.cooked.name=Pasta
+
 
 tile.mmm.deco.smoothstone.limestone.name=Polished Limestone
 tile.mmm.deco.smoothstone.basalt.name=Polished Basalt

src/resources/assets/mmm/models/item/food/meal/pasta/cooked.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/food/meal/pasta/cooked"
+    }
+}

src/resources/assets/mmm/models/item/food/meal/pasta/raw.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/food/meal/pasta/raw"
+    }
+}