diff --git a/graphics/dough.xcf b/graphics/dough.xcf new file mode 100644 index 0000000..4833ae4 Binary files /dev/null and b/graphics/dough.xcf differ diff --git a/src/java/mmm/food/FIngredients.java b/src/java/mmm/food/FIngredients.java index 5ebfb56..a237ab6 100644 --- a/src/java/mmm/food/FIngredients.java +++ b/src/java/mmm/food/FIngredients.java @@ -1,10 +1,13 @@ package mmm.food; +import mmm.MmmMaterials; import mmm.core.CRegistry; import mmm.core.api.I_RecipeRegistrar; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; @@ -12,6 +15,7 @@ public class FIngredients implements I_RecipeRegistrar { public final Item FLOUR; + public final Item DOUGH; public FIngredients( ) @@ -19,6 +23,7 @@ public class FIngredients CRegistry.addRegistrar( this ); this.FLOUR = FHelpers.makeIngredient( "flour" ); + this.DOUGH = FHelpers.makeIngredient( "dough" ); } @@ -27,6 +32,17 @@ public class FIngredients { FHelpers.addTransform( Items.WHEAT , this.FLOUR ); FHelpers.addCooking( this.FLOUR , Items.BREAD ); + GameRegistry.addShapedRecipe( new ItemStack( Items.CAKE ) , // + "MMM" , // + "SES" , // + " F " , // + 'M' , Items.MILK_BUCKET , // + 'S' , Items.SUGAR , // + 'E' , Items.EGG , // + 'F' , this.FLOUR ); + + GameRegistry.addShapelessRecipe( new ItemStack( this.DOUGH ) , // + this.FLOUR , Items.WATER_BUCKET , MmmMaterials.ITEM.ROCK_SALT ); } } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 87bc1b7..04f798b 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -155,6 +155,7 @@ item.mmm.food.milk.horse.name=Horse milk item.mmm.food.milk.donkey.name=Donkey milk item.mmm.food.ingredient.flour.name=Wheat Flour +item.mmm.food.ingredient.dough.name=Dough item.mmm.food.meal.sausage.raw.name=Raw Sausage item.mmm.food.meal.sausage.cooked.name=Sausage diff --git a/src/resources/assets/mmm/models/item/food/ingredient/dough.json b/src/resources/assets/mmm/models/item/food/ingredient/dough.json new file mode 100644 index 0000000..ea30e81 --- /dev/null +++ b/src/resources/assets/mmm/models/item/food/ingredient/dough.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/food/ingredient/dough" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/food/ingredient/dough.png b/src/resources/assets/mmm/textures/items/food/ingredient/dough.png new file mode 100644 index 0000000..479a70f Binary files /dev/null and b/src/resources/assets/mmm/textures/items/food/ingredient/dough.png differ