Made lots of pages.

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

@@ -63,7 +63,7 @@ public class GuiBooklet extends GuiScreen{
     private static final int BUTTON_RETURN_ID = 2;
     private static final int CHAPTER_BUTTONS_START = 3;
 
-    private static final int BUTTONS_PER_PAGE = 15;
+    private static final int BUTTONS_PER_PAGE = 13;
 
     private boolean mouseClicked;
 
@@ -133,7 +133,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+13, guiTop+15+(i*11), 120, 10, ""));
+            this.buttonList.add(new IndexButton(this.unicodeRenderer, CHAPTER_BUTTONS_START+i, guiLeft+15, guiTop+10+(i*12), 120, 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

@@ -19,6 +19,7 @@ import ellpeck.actuallyadditions.crafting.FoodCrafting;
 import ellpeck.actuallyadditions.crafting.ItemCrafting;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.TheFoods;
+import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
@@ -42,10 +43,15 @@ public class InitBooklet{
         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));
         new BookletChapter("phantomBreaker", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomPlacer), new PageCrafting(3, BlockCrafting.recipePhantomBreaker));
         new BookletChapter("esd", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeESD), new PageCrafting(3, BlockCrafting.recipeAdvancedESD));
+        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("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));
         new BookletChapterFurnace("furnaceDouble", entryFunctionalRF, new PageCrafting(1, BlockCrafting.recipeFurnace));
+        new BookletChapter("miner", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeMiner), new PageCrafting(3, BlockCrafting.recipeCasing));
+        new BookletChapter("lavaFactory", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeLavaFactory));
+        new BookletChapter("energizer", entryFunctionalRF, new PageCrafting(1, BlockCrafting.recipeEnergizer), new PageCrafting(2, BlockCrafting.recipeEnervator));
 
         new BookletChapter("craftingIngs", entryMisc, new PageText(1), new PageCrafting(2, ItemCrafting.recipeCoil), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced), new PageCrafting(4, BlockCrafting.recipeCase), new PageCrafting(5, BlockCrafting.recipeStoneCase), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock), new PageCrafting(7, BlockCrafting.recipeEnderCase));
         new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud));

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

@@ -53,7 +53,7 @@ public class BookletPage implements IBookletPage{
 
     @Override
     public String getText(){
-        return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.id).replaceAll("<imp>", EnumChatFormatting.DARK_GREEN+"").replaceAll("<item>", EnumChatFormatting.BLUE+"").replaceAll("<r>", EnumChatFormatting.BLACK+"");
+        return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.id).replaceAll("<imp>", EnumChatFormatting.DARK_GREEN+"").replaceAll("<item>", EnumChatFormatting.BLUE+"").replaceAll("<r>", EnumChatFormatting.BLACK+"").replaceAll("<n>", "\n").replaceAll("<i>", EnumChatFormatting.ITALIC+"").replaceAll("<rs>", EnumChatFormatting.RESET+"");
     }
 
     @Override

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

@@ -57,7 +57,7 @@ public class PageCrafting extends BookletPage{
 
         String text = gui.currentPage.getText();
         if(text != null && !text.isEmpty() && !text.contains("booklet.")){
-            gui.unicodeRenderer.drawSplitString(text.replace("<n>", "\n"), gui.guiLeft+14, gui.guiTop+100, 115, 0);
+            gui.unicodeRenderer.drawSplitString(text, gui.guiLeft+14, gui.guiTop+100, 115, 0);
         }
 
         if(this.recipe != null){

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

@@ -50,7 +50,7 @@ public class PageCrusherRecipe extends BookletPage{
 
         String text = gui.currentPage.getText();
         if(text != null && !text.isEmpty() && !text.contains("booklet.")){
-            gui.unicodeRenderer.drawSplitString(text.replace("<n>", "\n"), gui.guiLeft+14, gui.guiTop+100, 115, 0);
+            gui.unicodeRenderer.drawSplitString(text, gui.guiLeft+14, gui.guiTop+100, 115, 0);
         }
 
         if(recipe.secondChance > 0){

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

@@ -58,7 +58,7 @@ public class PageFurnace extends BookletPage{
 
         String text = gui.currentPage.getText();
         if(text != null && !text.isEmpty() && !text.contains("booklet.")){
-            gui.unicodeRenderer.drawSplitString(text.replace("<n>", "\n"), gui.guiLeft+14, gui.guiTop+100, 115, 0);
+            gui.unicodeRenderer.drawSplitString(text, gui.guiLeft+14, gui.guiTop+100, 115, 0);
         }
 
         if(input != null){

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

@@ -11,18 +11,35 @@
 package ellpeck.actuallyadditions.booklet.page;
 
 import ellpeck.actuallyadditions.booklet.GuiBooklet;
+import ellpeck.actuallyadditions.booklet.InitBooklet;
+import net.minecraft.item.ItemStack;
 
 public class PageText extends BookletPage{
 
+    private ItemStack stack;
+
     public PageText(int id){
         super(id);
     }
 
+    public PageText setStack(ItemStack stack){
+        if(!InitBooklet.pagesWithItemStackData.contains(this)){
+            InitBooklet.pagesWithItemStackData.add(this);
+        }
+        this.stack = stack;
+        return this;
+    }
+
     @Override
-    public void render(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick){
+    public ItemStack getItemStackForPage(){
+        return this.stack;
+    }
+
+    @Override
+    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick){
         String text = gui.currentPage.getText();
         if(text != null && !text.isEmpty() && !text.contains("booklet.")){
-            gui.unicodeRenderer.drawSplitString(text.replace("<n>", "\n"), gui.guiLeft+14, gui.guiTop+11, 115, 0);
+            gui.unicodeRenderer.drawSplitString(text, gui.guiLeft+14, gui.guiTop+11, 115, 0);
         }
     }
 }

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

@@ -49,6 +49,13 @@ public class BlockCrafting{
     public static IRecipe recipeCrusher;
     public static IRecipe recipeDoubleCrusher;
     public static IRecipe recipeFurnace;
+    public static IRecipe recipeSolidifier;
+    public static IRecipe recipeMiner;
+    public static IRecipe recipeCasing;
+    public static IRecipe recipeGlass;
+    public static IRecipe recipeLavaFactory;
+    public static IRecipe recipeEnergizer;
+    public static IRecipe recipeEnervator;
 
     public static void init(){
 
@@ -76,6 +83,7 @@ public class BlockCrafting{
                     'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()),
                     'D', "blockDiamond",
                     'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
+            recipeSolidifier = Util.lastIRecipe();
         }
 
         //Charcoal Block
@@ -132,15 +140,17 @@ public class BlockCrafting{
                     'I', "ingotIron",
                     'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
+            recipeEnergizer = Util.lastIRecipe();
         }
 
-        //Energizer
+        //Enervator
         if(ConfigCrafting.ENERVATOR.isEnabled()){
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator),
                     " I ", "CAC", " I ",
                     'I', "ingotIron",
                     'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
+            recipeEnervator = Util.lastIRecipe();
         }
 
         //Lava Factory
@@ -151,6 +161,7 @@ public class BlockCrafting{
                     'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'I', "blockIron",
                     'L', Items.lava_bucket));
+            recipeLavaFactory = Util.lastIRecipe();
         }
 
         //Casing
@@ -159,6 +170,7 @@ public class BlockCrafting{
                     "ICI",
                     'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'I', "blockIron"));
+            recipeCasing = Util.lastIRecipe();
         }
 
         //Canola Press
@@ -179,6 +191,7 @@ public class BlockCrafting{
                     'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'B', new ItemStack(InitItems.itemBatteryDouble),
                     'I', new ItemStack(Blocks.iron_block)));
+            recipeMiner = Util.lastIRecipe();
         }
 
         //Fermenting Barrel
@@ -425,6 +438,7 @@ public class BlockCrafting{
                     'G', "blockGlass",
                     'D', Blocks.obsidian,
                     'S', "treeSapling"));
+            recipeGlass = Util.lastIRecipe();
         }
 
         //Placer

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

@@ -370,7 +370,7 @@ booklet.actuallyadditions.indexEntry.allAndSearch.name=All Items and Search
 booklet.actuallyadditions.indexEntry.functionalRF.name=Functional Blocks (Use RF)
 
 booklet.actuallyadditions.recipeDisabled=The crafting recipe for this item is disabled in the Config File! If you're on a server, ask the server author to enable it in the config. If you're on a client, press the 'Open Config'-Button on the top right and enable the recipe!
-booklet.actuallyadditions.clickToSeeRecipe=Click to see Recipe
+booklet.actuallyadditions.clickToSeeRecipe=Click to see more Information
 
 booklet.actuallyadditions.chapter.foods.name=Food
 booklet.actuallyadditions.chapter.cloud.name=Smiley Cloud
@@ -419,4 +419,30 @@ booklet.actuallyadditions.chapter.crusher.name=Crushers
 booklet.actuallyadditions.chapter.crusher.text.1=The <item>Crusher<r> is a machine that uses <imp>RF<r> to <imp>double ores<r>, meaning when you put in any ore block, it gets broken down to two dust items which can be <imp>smelted in a furnace<r> afterwards. <n>See all of the recipes on the following pages.
 
 booklet.actuallyadditions.chapter.furnaceDouble.name=Double Furnace
-booklet.actuallyadditions.chapter.furnaceDouble.text.1=The <item>Double Furnace<r> is a block that works exactly <imp>like a furnace<r>, but it can smelt <imp>two items at a time<r> and uses <imp>RF<r> to work. <n>See all of the recipes on the following pages.
+booklet.actuallyadditions.chapter.furnaceDouble.text.1=The <item>Double Furnace<r> is a block that works exactly <imp>like a furnace<r>, but it can smelt <imp>two items at a time<r> and uses <imp>RF<r> to work. <n>See all of the recipes on the following pages.
+
+booklet.actuallyadditions.chapter.xpSolidifier.name=Experience Solidifier
+booklet.actuallyadditions.chapter.xpSolidifier.text.1=The <item>Experience Solidifier<r> can be used to turn your Experience into <item>Solidified Experience<r>-Items that can then either be <imp>stored<r> or used again by right-clicking to get the XP you spent for them back. <item>Solidified Experience<r> also gets dropped from mobs sometimes!<n><imp>An easy way to store your XP!<r>
+booklet.actuallyadditions.chapter.xpSolidifier.text.2=Block of knowledge
+
+booklet.actuallyadditions.chapter.miner.name=Magnetic Miner
+booklet.actuallyadditions.chapter.miner.text.1=The <item>Magnetic Miner<r> is a block that automatically <imp>digs ores out of the ground<r>, supplied a bit of <imp>RF<r> and some <imp>Oil<r>, and places them on top of <item>Casing Blocks<r> that you need to put down <imp>one block below it<r> in the area in places where you want ores to be mined. The ores you get will then be <imp>stacked up on top of the casings<r>.
+booklet.actuallyadditions.chapter.miner.text.2=Magnet Ore
+booklet.actuallyadditions.chapter.miner.text.3=These blocks need to be placed <imp>one block lower than the miner is<r> around it where ores should be stacked up.
+
+booklet.actuallyadditions.chapter.greenhouseGlass.name=Greenhouse Glass
+booklet.actuallyadditions.chapter.greenhouseGlass.text.1=<item>Greenhouse Glass<r> can be used to <imp>make the growth of plants a lot faster<r>. When placed above a plant, it, and this is tech talk right here, ticks the plant much more often, causing it to grow much faster. It doesn't have a set range on the vertical axis, so you could place the glass really high above the plants to grow.<n>The Item version of this is the <item>Ring Of Growth<r>.
+booklet.actuallyadditions.chapter.greenhouseGlass.text.2=Growing Glass.
+
+booklet.actuallyadditions.chapter.lavaFactory.name=Lava Factory
+booklet.actuallyadditions.chapter.lavaFactory.text.1=The <item>Lava Factory<r> is a block that automatically generates lava if supplied with enough <imp>RF<r>. Before it can do that, however, you need to place <item>Casing Blocks<r> (their entries can be found on the Magnetic Miner page!) around it in a certain way: Go <imp>one block up above the controller<r>. That block is where the lava is going to appear. Around that block, place <imp>4 Casing Blocks<r>. You can check if you did it right by right-clicking the <item>Lava Factory<r>.
+booklet.actuallyadditions.chapter.lavaFactory.text.2=Mister Lava, Lava! <n>..sorry.
+
+booklet.actuallyadditions.chapter.energizer.name=Energizers and Enervators
+booklet.actuallyadditions.chapter.energizer.text.1=The <item>Energizer<r> will charge up Items that can hold <imp>RF<r>.
+booklet.actuallyadditions.chapter.energizer.text.2=The <item>Enervator<r> will enervate, meaning discharge, Items that can hold <imp>RF<r>.
+
+booklet.actuallyadditions.chapter.intro.name=An Introduction to ActAdd
+booklet.actuallyadditions.chapter.intro.text.1=<i>This book, written years ago, found by the player, used to help understand the wonders of this world, finally opened, finally looked at, full of glory, full of grace, will be used to help the player along on their journey through <imp>Actually Additions<r><i>. <n>What is <imp>Actually Additions<r><i>, you may ask. <n><imp>Actually Additions<r><i> adds blocks, items, and features to make the player's experience easier, automate the world and properly do what you've always wanted to do.
+booklet.actuallyadditions.chapter.intro.text.2=<i>This book, written by <imp>Ellpeck<r><i>, the author of everything <imp>Actually Additions<r><i> contains, often called Ellopecko, Peck or Ellpack, is easy to navigate. It has an <imp>index page<r><i> at the front from which you can choose <imp>criteria pages<r><i>. These criteria pages contain a list of every item which is part of the criteria, and clicking on that will show <imp>precise information and the crafting recipe<r><i> of the item. The page you were on previously will stay open between sessions, too! <n><rs>Go check it out!
+booklet.actuallyadditions.chapter.intro.text.3=If you, for some reason, want to craft this book again, just take a <item>piece of paper<r> and a <item>canola seed<r> which you can find randomly generated and craft them together!