Changed some book stuff again °___°

src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java

@@ -130,7 +130,7 @@ public class GuiBooklet extends GuiScreen{
         this.buttonList.add(new TexturedButton(BUTTON_RETURN_ID, this.guiLeft+this.xSize/2-7, this.guiTop+this.ySize+2, 182, 0, 15, 10));
 
         for(int i = 0; i < BUTTONS_PER_PAGE; i++){
-            this.buttonList.add(new IndexButton(this.unicodeRenderer, CHAPTER_BUTTONS_START+i, guiLeft+15, guiTop+10+(i*12), 120, 10, ""));
+            this.buttonList.add(new IndexButton(this.unicodeRenderer, CHAPTER_BUTTONS_START+i, guiLeft+15, guiTop+10+(i*12), 110, 10, ""));
         }
 
         this.buttonList.add(new TexturedButton(BUTTON_ACHIEVEMENTS_ID, this.guiLeft+138, this.guiTop, 205, 0, 8, 8));

src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java

@@ -47,6 +47,7 @@ public class InitBooklet{
         new BookletChapter("quartz", entryMisc, new PageText(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock), new PageCrafting(4, BlockCrafting.recipeQuartzPillar), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled));
         new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud));
         new BookletChapter("foods", entryMisc, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())));
+        new BookletChapter("coalStuff", entryMisc, new PageCrafting(1, ItemCrafting.recipeTinyCoal), new PageCrafting(2, ItemCrafting.recipeTinyChar), new PageCrafting(3, BlockCrafting.recipeBlockChar));
 
         new BookletChapter("breaker", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector));
         new BookletChapter("phantomfaces", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomface), new PageCrafting(3, BlockCrafting.recipeLiquiface), new PageCrafting(4, BlockCrafting.recipeEnergyface), new PageCrafting(5, ItemCrafting.recipePhantomConnector), new PageCrafting(6, BlockCrafting.recipePhantomBooster));
@@ -55,6 +56,8 @@ public class InitBooklet{
         new BookletChapter("xpSolidifier", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal())), new PageCrafting(2, BlockCrafting.recipeSolidifier));
         new BookletChapter("greenhouseGlass", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeGlass));
         new BookletChapter("fishingNet", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFisher));
+        new BookletChapter("feeder", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFeeder));
+        new BookletChapter("compost", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemFertilizer)), new PageCrafting(2, BlockCrafting.recipeCompost), new PageCrafting(3, ItemCrafting.recipeMashedFood));
 
         new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine));
         new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher));

src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java

@@ -54,6 +54,10 @@ public class PageCrafting extends BookletPage{
         if(this.recipe == null){
             gui.unicodeRenderer.drawSplitString(StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0);
         }
+        else{
+            String strg = StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+"."+(recipe instanceof ShapedRecipes ? "shapedRecipe" : (recipe instanceof ShapelessRecipes ? "shapelessRecipe" : (recipe instanceof ShapelessOreRecipe ? "shapelessOreRecipe" : "shapedOreRecipe"))));
+            gui.unicodeRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.unicodeRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+        }
 
         String text = gui.currentPage.getText();
         if(text != null && !text.isEmpty() && !text.contains("booklet.")){

src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java

@@ -65,6 +65,9 @@ public class BlockCrafting{
     public static IRecipe recipeQuartzBlock;
     public static IRecipe recipeQuartzChiseled;
     public static IRecipe recipeQuartzPillar;
+    public static IRecipe recipeBlockChar;
+    public static IRecipe recipeFeeder;
+    public static IRecipe recipeCompost;
 
     public static void init(){
 
@@ -83,6 +86,7 @@ public class BlockCrafting{
                     "W W", "W W", "WCW",
                     'W', "plankWood",
                     'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
+            recipeCompost = Util.lastIRecipe();
         }
 
         //XP Solidifier
@@ -99,6 +103,7 @@ public class BlockCrafting{
         GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()),
                 "CCC", "CCC", "CCC",
                 'C', new ItemStack(Items.coal, 1, 1));
+        recipeBlockChar = Util.lastIRecipe();
         GameRegistry.addShapelessRecipe(new ItemStack(Items.coal, 9, 1),
                 new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()));
 
@@ -438,6 +443,7 @@ public class BlockCrafting{
                     'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'C', new ItemStack(Items.golden_carrot),
                     'H', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
+            recipeFeeder = Util.lastIRecipe();
         }
 
         //Giant Chest

src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java

@@ -36,6 +36,9 @@ public class ItemCrafting{
     public static IRecipe recipeCoil;
     public static IRecipe recipeCoilAdvanced;
     public static IRecipe recipeBook;
+    public static IRecipe recipeTinyCoal;
+    public static IRecipe recipeTinyChar;
+    public static IRecipe recipeMashedFood;
 
     public static void init(){
 
@@ -329,8 +332,10 @@ public class ItemCrafting{
         //Tiny Coal
         GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()),
                 new ItemStack(Items.coal));
+        recipeTinyCoal = Util.lastIRecipe();
         GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_CHAR.ordinal()),
                 new ItemStack(Items.coal, 1, 1));
+        recipeTinyChar = Util.lastIRecipe();
 
         //Rice Seeds
         GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemRiceSeed),
@@ -414,6 +419,9 @@ public class ItemCrafting{
                     if(!isBlacklisted(item)){
                         ItemStack ingredient = new ItemStack((Item)item, 1, Util.WILDCARD);
                         GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.MASHED_FOOD.ordinal()), ingredient, ingredient, ingredient, ingredient, new ItemStack(InitItems.itemKnife, 1, Util.WILDCARD));
+                        if(recipeMashedFood == null){
+                            recipeMashedFood = Util.lastIRecipe();
+                        }
                     }
                 }
             }

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -364,6 +364,11 @@ achievement.actuallyadditions.openTreasureChest.desc=Open a Treasure Chest under
 
 item.actuallyadditions.itemBooklet.name=Actually Additions Information Manual
 
+booklet.actuallyadditions.shapelessRecipe=Shapeless Recipe
+booklet.actuallyadditions.shapedRecipe=Shaped Recipe
+booklet.actuallyadditions.shapelessOreRecipe=Shapeless OreDictionary Recipe
+booklet.actuallyadditions.shapedOreRecipe=Shaped OreDictionary Recipe
+
 booklet.actuallyadditions.indexEntry.misc.name=Miscellaneous
 booklet.actuallyadditions.indexEntry.functionalNoRF.name=Functional Blocks (No RF use)
 booklet.actuallyadditions.indexEntry.allAndSearch.name=All Items and Search