diff --git a/TODO.txt b/TODO.txt index 6a2e786..f20dcf1 100644 --- a/TODO.txt +++ b/TODO.txt @@ -18,7 +18,6 @@ food ??? Milk processing Butter Cheesemaking food No Extra recipes - Apple pie Ratatouille Pasta w/tomato Beef stew diff --git a/graphics/pie.xcf b/graphics/pie.xcf new file mode 100644 index 0000000..cfdf1d2 Binary files /dev/null and b/graphics/pie.xcf differ diff --git a/src/java/mmm/food/FMeals.java b/src/java/mmm/food/FMeals.java index 5cd25dd..3b6dde9 100644 --- a/src/java/mmm/food/FMeals.java +++ b/src/java/mmm/food/FMeals.java @@ -3,28 +3,49 @@ package mmm.food; import mmm.MmmFood; import mmm.MmmPlants; +import mmm.core.CRegistry; +import mmm.core.api.I_RecipeRegistrar; import net.minecraft.init.Items; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; public class FMeals + implements I_RecipeRegistrar { public final FSausage SAUSAGE; public final FCookableMeal PASTA; + public final FMealInBowl TOMATO_SOUP; public final FMealInBowl GLOWING_SOUP; + public final ItemFood APPLE_PIE; + public FMeals( ) { + CRegistry.addRegistrar( this ); + this.SAUSAGE = new FSausage( ); this.PASTA = new FCookableMeal( "pasta" , 2 , 0.7f , 0.5f , false , 1 , // Items.EGG , MmmFood.INGREDIENT.FLOUR ); + this.TOMATO_SOUP = new FMealInBowl( "tomato_soup" , 8 , 1.1f , // "TTT" , " B " , 'T' , MmmPlants.TOMATO.FRUIT ); - this.GLOWING_SOUP = new FGlowingSoup( ); + + this.APPLE_PIE = FHelpers.makeBasicMeal( 8 , 0.5f , false , "pie" , "apple" ); + } + + + @Override + public void registerRecipes( ) + { + GameRegistry.addShapelessRecipe( new ItemStack( this.APPLE_PIE ) , // + MmmFood.INGREDIENT.DOUGH , Items.SUGAR , Items.APPLE ); } } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 04f798b..4a051dd 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -167,6 +167,8 @@ item.mmm.food.meal.pasta.cooked.name=Pasta item.mmm.food.meal.tomato_soup.name=Tomato Soup item.mmm.food.meal.glowing_soup.name=Glowing Soup +item.mmm.food.meal.pie.apple.name=Apple Pie + tile.mmm.deco.smoothstone.limestone.name=Polished Limestone tile.mmm.deco.smoothstone.basalt.name=Polished Basalt diff --git a/src/resources/assets/mmm/models/item/food/meal/pie/apple.json b/src/resources/assets/mmm/models/item/food/meal/pie/apple.json new file mode 100644 index 0000000..b29bdf1 --- /dev/null +++ b/src/resources/assets/mmm/models/item/food/meal/pie/apple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/food/meal/pie/apple" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/food/meal/pie/apple.png b/src/resources/assets/mmm/textures/items/food/meal/pie/apple.png new file mode 100644 index 0000000..dc0d7f2 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/food/meal/pie/apple.png differ