diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java index 289373195..62d428542 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -120,7 +120,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 PageCrafting(18, FoodCrafting.recipeChocolateToast).setNoText()); + new BookletChapter("foods", entryItemsNonRF, new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()), new PageCrafting(1, FoodCrafting.recipeBacon), 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 PageCrafting(1, FoodCrafting.recipePizza).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/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 9e1200f7c..9b8e05ed2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -84,6 +84,7 @@ public enum ConfigCrafting{ TOOL_CRYSTALS("Crystal Tools", ConfigCategories.ITEMS_CRAFTING), RICE_BREAD("Rice Bread", ConfigCategories.FOOD_CRAFTING), RICE_DOUGH("Rice Dough", ConfigCategories.FOOD_CRAFTING), + BACON("Bacon", ConfigCategories.FOOD_CRAFTING), RICE_GADGETS("Rice Gadgets", ConfigCategories.ITEMS_CRAFTING), RESONANT_RICE("Resonant Rice", ConfigCategories.ITEMS_CRAFTING), diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java index 990bba625..24d42f3c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/crafting/FoodCrafting.java @@ -41,6 +41,7 @@ public class FoodCrafting{ public static IRecipe recipeChocolateCake; public static IRecipe recipeToast; public static IRecipe recipeChocolateToast; + public static IRecipe recipeBacon; public static void init(){ @@ -52,6 +53,13 @@ public class FoodCrafting{ new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal()), 1F); } + //Bacon + if(ConfigCrafting.BACON.isEnabled()){ + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 3, TheFoods.BACON.ordinal()), + knifeStack, new ItemStack(Items.cooked_porkchop))); + recipeBacon = Util.GetRecipes.lastIRecipe(); + } + //Baguette if(ConfigCrafting.BAGUETTE.isEnabled()){ GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 2a9d872d5..77758ceff 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -378,6 +378,7 @@ item.actuallyadditions.itemPaxelCrystalLightBlue.name=Diamatine Crystal AIOT item.actuallyadditions.itemPaxelCrystalBlack.name=Void Crystal AIOT item.actuallyadditions.itemPaxelCrystalWhite.name=Enori Crystal AIOT item.actuallyadditions.itemPaxelCrystalGreen.name=Emeradic Crystal AIOT +item.actuallyadditions.itemFoodBacon.name=Bacon #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -644,6 +645,7 @@ booklet.actuallyadditions.chapter.wings.name=Wings Of The Bats booklet.actuallyadditions.chapter.wings.text.1=Sometimes, bats will drop Wings. These wings can't really be used to fly, but that's just because they're not powerful enough. To make them more powerful, you can craft Wings Of The Bats. When you have these in your inventory, they will allow you to fly like in creative mode. booklet.actuallyadditions.chapter.foods.name=Foodstuffs +booklet.actuallyadditions.chapter.foods.text.1=Yes, this is Bacon. Don't try naming it Ellspeck. Please, just don't. booklet.actuallyadditions.chapter.leafBlower.name=Leaf Blowers booklet.actuallyadditions.chapter.leafBlower.text.1=The Leaf Blower can blow away tall grass, flowers and other stuff around you when you hold right-click. There is an Advanced Leaf Blower, which works like the basic one, except that it operates much faster and also breaks Leaves.