diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index bed3e123e..93bf4fa85 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -52,6 +52,7 @@ public enum ConfigCrafting{ CHOCOLATE("Chocolate", ConfigCategories.FOOD_CRAFTING), CHOCOLATE_CAKE("Chocolate Cake", ConfigCategories.FOOD_CRAFTING), TOAST("Toast", ConfigCategories.FOOD_CRAFTING), + CHOCOTOAST("ChocoToast", ConfigCategories.FOOD_CRAFTING), LEAF_BLOWER("Leaf Blower", ConfigCategories.ITEMS_CRAFTING), LEAF_BLOWER_ADVANCED("Advanced Leaf Blower", ConfigCategories.ITEMS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java index 65ca8faa7..bcc0b7629 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java @@ -40,6 +40,7 @@ public class FoodCrafting{ public static IRecipe recipeChocolate; public static IRecipe recipeChocolateCake; public static IRecipe recipeToast; + public static IRecipe recipeChocoToast; public static void init(){ @@ -195,6 +196,12 @@ public class FoodCrafting{ new ItemStack(Items.bread)); recipeToast = Util.GetRecipes.lastIRecipe(); } + + //ChocoToast: + if(ConfigCrafting.CHOCOTOAST.isEnabled()){ + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOTOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE.ordinal())); + recipeChocoToast = Util.GetRecipes.lastIRecipe(); + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java index 16e85941e..6f444ad62 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java @@ -35,7 +35,8 @@ public enum TheFoods{ BAGUETTE("Baguette", 7, 2F, false, 25, EnumRarity.common), RICE("Rice", 2, 1F, false, 10, EnumRarity.uncommon), RICE_BREAD("RiceBread", 8, 3F, false, 25, EnumRarity.uncommon), - DOUGHNUT("Doughnut", 4, 0.5F, false, 10, EnumRarity.epic); + DOUGHNUT("Doughnut", 4, 0.5F, false, 10, EnumRarity.epic), + CHOCOTOAST("ChocoToast", 8, 1.4F, false, 40, EnumRarity.rare); public final String name; public final int healAmount; diff --git a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang index 569f1919a..4fc0a7c5a 100644 --- a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang +++ b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang @@ -201,6 +201,7 @@ item.actuallyadditions.itemFoodHamburger.name=Hamburger item.actuallyadditions.itemFoodBigCookie.name=Risencookie item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich item.actuallyadditions.itemFoodToast.name=Toast +item.actuallyadditions.itemFoodChocoToast.name=Schokoladenüberzogener Toast item.actuallyadditions.itemFoodChocolate.name=Schokolade item.actuallyadditions.itemFoodChocolateCake.name=Schokoladenkuchen °-° item.actuallyadditions.itemFoodNoodle.name=Nudeln diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 904e1e158..cefb56546 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -229,6 +229,7 @@ item.actuallyadditions.itemFoodHamburger.name=Hamburger item.actuallyadditions.itemFoodBigCookie.name=Big Cookie item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich item.actuallyadditions.itemFoodToast.name=Toast +item.actuallyadditions.itemFoodChocoToast.name=Toast covered in Chocolate item.actuallyadditions.itemFoodChocolate.name=Chocolate item.actuallyadditions.itemFoodChocolateCake.name=Chocolate Cake item.actuallyadditions.itemFoodNoodle.name=Noodle diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocoToast.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocoToast.png new file mode 100644 index 000000000..2d10d1738 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocoToast.png differ