From 6acfea1b32b391a4071fe9553c36ec9ccde79375 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 24 Oct 2015 21:20:27 +0200 Subject: [PATCH] Fix Chocolate Toast --- .../actuallyadditions/booklet/InitBooklet.java | 2 +- .../config/values/ConfigCrafting.java | 2 +- .../actuallyadditions/crafting/FoodCrafting.java | 10 +++++----- .../items/metalists/TheFoods.java | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 2 +- .../textures/items/itemFoodChocoToast.png | Bin 327 -> 0 bytes 6 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocoToast.png diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index c6f51faa2..05930161b 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -95,7 +95,7 @@ public class InitBooklet{ //No RF Using Items new BookletChapter("wings", entryItemsNonRF, new ItemStack(InitItems.itemWingsOfTheBats), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal())), new PageCrafting(2, ItemCrafting.recipeWings).setNoText()).setSpecial(); - new BookletChapter("foods", entryItemsNonRF, new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()), new PageCrafting(1, FoodCrafting.recipePizza).setNoText(), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())).setNoText(), new PageCrafting(3, FoodCrafting.recipeHamburger).setNoText(), new PageCrafting(4, FoodCrafting.recipeBigCookie).setNoText(), new PageCrafting(5, FoodCrafting.recipeSubSandwich).setNoText(), new PageCrafting(6, FoodCrafting.recipeFrenchFry).setNoText(), new PageCrafting(7, FoodCrafting.recipeFrenchFries).setNoText(), new PageCrafting(8, FoodCrafting.recipeFishNChips).setNoText(), new PageCrafting(9, FoodCrafting.recipeCheese).setNoText(), new PageCrafting(10, FoodCrafting.recipePumpkinStew).setNoText(), new PageCrafting(11, FoodCrafting.recipeCarrotJuice).setNoText(), new PageCrafting(12, FoodCrafting.recipeSpaghetti).setNoText(), new PageCrafting(13, FoodCrafting.recipeNoodle).setNoText(), new PageCrafting(14, FoodCrafting.recipeChocolate).setNoText(), new PageCrafting(15, FoodCrafting.recipeChocolateCake).setNoText(), new PageCrafting(16, FoodCrafting.recipeToast).setNoText(), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())).setNoText()); + new BookletChapter("foods", entryItemsNonRF, new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()), new PageCrafting(1, FoodCrafting.recipePizza).setNoText(), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())).setNoText(), new PageCrafting(3, FoodCrafting.recipeHamburger).setNoText(), new PageCrafting(4, FoodCrafting.recipeBigCookie).setNoText(), new PageCrafting(5, FoodCrafting.recipeSubSandwich).setNoText(), new PageCrafting(6, FoodCrafting.recipeFrenchFry).setNoText(), new PageCrafting(7, FoodCrafting.recipeFrenchFries).setNoText(), new PageCrafting(8, FoodCrafting.recipeFishNChips).setNoText(), new PageCrafting(9, FoodCrafting.recipeCheese).setNoText(), new PageCrafting(10, FoodCrafting.recipePumpkinStew).setNoText(), new PageCrafting(11, FoodCrafting.recipeCarrotJuice).setNoText(), new PageCrafting(12, FoodCrafting.recipeSpaghetti).setNoText(), new PageCrafting(13, FoodCrafting.recipeNoodle).setNoText(), new PageCrafting(14, FoodCrafting.recipeChocolate).setNoText(), new PageCrafting(15, FoodCrafting.recipeChocolateCake).setNoText(), new PageCrafting(16, FoodCrafting.recipeToast).setNoText(), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())).setNoText(), new PageCrafting(18, FoodCrafting.recipeChocolateToast).setNoText()); new BookletChapter("leafBlower", entryItemsNonRF, new ItemStack(InitItems.itemLeafBlowerAdvanced), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeLeafBlower).setNoText(), new PageCrafting(3, ItemCrafting.recipeLeafBlowerAdvanced).setNoText()).setImportant(); ArrayList aiotPages = new ArrayList(); aiotPages.add(new PageTextOnly(aiotPages.size()+1)); diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 93bf4fa85..0ee5a67ae 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -52,7 +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), + CHOCOLATE_TOAST("Chocolate Toast", 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 bcc0b7629..bd9a50fbf 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java @@ -40,7 +40,7 @@ public class FoodCrafting{ public static IRecipe recipeChocolate; public static IRecipe recipeChocolateCake; public static IRecipe recipeToast; - public static IRecipe recipeChocoToast; + public static IRecipe recipeChocolateToast; public static void init(){ @@ -197,10 +197,10 @@ public class FoodCrafting{ 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(); + //Chocolate Toast + if(ConfigCrafting.CHOCOLATE_TOAST.isEnabled()){ + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE_TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE.ordinal())); + recipeChocolateToast = 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 6f444ad62..7b6a703d6 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java @@ -36,7 +36,7 @@ public enum TheFoods{ 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), - CHOCOTOAST("ChocoToast", 8, 1.4F, false, 40, EnumRarity.rare); + CHOCOLATE_TOAST("ChocolateToast", 8, 1.4F, false, 40, EnumRarity.rare); public final String name; public final int healAmount; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index cefb56546..1b1c9cd19 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -229,7 +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.itemFoodChocolateToast.name=Toast o' 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 deleted file mode 100644 index 2d10d1738c8bc738cfb705b20d1a72cef7be4983..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~mxPd>WJCVeN}$jcPZ!4!i_^(}{{OdUR&D5PbUM)F zd%-1=Y4zrFcWMuMTwql@CG`L1%^MOM9I|UgeEn;TPHa~d~ P=syNeS3j3^P6