Merge pull request #17 from canitzp/master

-Added Chocolate Toast
This commit is contained in:
Ellpeck 2015-10-24 21:13:59 +02:00
commit 0a3b532442
6 changed files with 12 additions and 1 deletions

View file

@ -52,6 +52,7 @@ public enum ConfigCrafting{
CHOCOLATE("Chocolate", ConfigCategories.FOOD_CRAFTING), CHOCOLATE("Chocolate", ConfigCategories.FOOD_CRAFTING),
CHOCOLATE_CAKE("Chocolate Cake", ConfigCategories.FOOD_CRAFTING), CHOCOLATE_CAKE("Chocolate Cake", ConfigCategories.FOOD_CRAFTING),
TOAST("Toast", ConfigCategories.FOOD_CRAFTING), TOAST("Toast", ConfigCategories.FOOD_CRAFTING),
CHOCOTOAST("ChocoToast", ConfigCategories.FOOD_CRAFTING),
LEAF_BLOWER("Leaf Blower", ConfigCategories.ITEMS_CRAFTING), LEAF_BLOWER("Leaf Blower", ConfigCategories.ITEMS_CRAFTING),
LEAF_BLOWER_ADVANCED("Advanced Leaf Blower", ConfigCategories.ITEMS_CRAFTING), LEAF_BLOWER_ADVANCED("Advanced Leaf Blower", ConfigCategories.ITEMS_CRAFTING),

View file

@ -40,6 +40,7 @@ public class FoodCrafting{
public static IRecipe recipeChocolate; public static IRecipe recipeChocolate;
public static IRecipe recipeChocolateCake; public static IRecipe recipeChocolateCake;
public static IRecipe recipeToast; public static IRecipe recipeToast;
public static IRecipe recipeChocoToast;
public static void init(){ public static void init(){
@ -195,6 +196,12 @@ public class FoodCrafting{
new ItemStack(Items.bread)); new ItemStack(Items.bread));
recipeToast = Util.GetRecipes.lastIRecipe(); 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();
}
} }
} }

View file

@ -35,7 +35,8 @@ public enum TheFoods{
BAGUETTE("Baguette", 7, 2F, false, 25, EnumRarity.common), BAGUETTE("Baguette", 7, 2F, false, 25, EnumRarity.common),
RICE("Rice", 2, 1F, false, 10, EnumRarity.uncommon), RICE("Rice", 2, 1F, false, 10, EnumRarity.uncommon),
RICE_BREAD("RiceBread", 8, 3F, false, 25, 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 String name;
public final int healAmount; public final int healAmount;

View file

@ -201,6 +201,7 @@ item.actuallyadditions.itemFoodHamburger.name=Hamburger
item.actuallyadditions.itemFoodBigCookie.name=Risencookie item.actuallyadditions.itemFoodBigCookie.name=Risencookie
item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich
item.actuallyadditions.itemFoodToast.name=Toast item.actuallyadditions.itemFoodToast.name=Toast
item.actuallyadditions.itemFoodChocoToast.name=Schokoladenüberzogener Toast
item.actuallyadditions.itemFoodChocolate.name=Schokolade item.actuallyadditions.itemFoodChocolate.name=Schokolade
item.actuallyadditions.itemFoodChocolateCake.name=Schokoladenkuchen °-° item.actuallyadditions.itemFoodChocolateCake.name=Schokoladenkuchen °-°
item.actuallyadditions.itemFoodNoodle.name=Nudeln item.actuallyadditions.itemFoodNoodle.name=Nudeln

View file

@ -229,6 +229,7 @@ item.actuallyadditions.itemFoodHamburger.name=Hamburger
item.actuallyadditions.itemFoodBigCookie.name=Big Cookie item.actuallyadditions.itemFoodBigCookie.name=Big Cookie
item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich
item.actuallyadditions.itemFoodToast.name=Toast item.actuallyadditions.itemFoodToast.name=Toast
item.actuallyadditions.itemFoodChocoToast.name=Toast covered in Chocolate
item.actuallyadditions.itemFoodChocolate.name=Chocolate item.actuallyadditions.itemFoodChocolate.name=Chocolate
item.actuallyadditions.itemFoodChocolateCake.name=Chocolate Cake item.actuallyadditions.itemFoodChocolateCake.name=Chocolate Cake
item.actuallyadditions.itemFoodNoodle.name=Noodle item.actuallyadditions.itemFoodNoodle.name=Noodle

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B