Added the Booklet stuff to the API

src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java

@@ -10,6 +10,8 @@
 
 package de.ellpeck.actuallyadditions.api;
 
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
@@ -31,6 +33,19 @@ public class ActuallyAdditionsAPI{
     public static List<LensNoneRecipe> reconstructorLensNoneRecipes = new ArrayList<LensNoneRecipe>();
     public static List<CoffeeIngredient> coffeeMachineIngredients = new ArrayList<CoffeeIngredient>();
 
+    public static List<IBookletEntry> bookletEntries = new ArrayList<IBookletEntry>();
+    public static List<BookletPage> bookletPagesWithItemStackData = new ArrayList<BookletPage>();
+
+    //These are getting initlized in Actually Additions' PreInit phase
+    public static IBookletEntry entryGettingStarted;
+    public static IBookletEntry entryFunctionalNonRF;
+    public static IBookletEntry entryFunctionalRF;
+    public static IBookletEntry entryGeneratingRF;
+    public static IBookletEntry entryItemsNonRF;
+    public static IBookletEntry entryItemsRF;
+    public static IBookletEntry entryMisc;
+    public static IBookletEntry allAndSearch;
+
     /**
      * Adds a Recipe to the Crusher Recipe Registry
      * The second output will be nothing
@@ -144,9 +159,29 @@ public class ActuallyAdditionsAPI{
 
     /**
      * Adds an ingredient to the Coffee Machine ingredient list
+     *
      * @param ingredient The ingredient to add
      */
     public static void addCoffeeMachineIngredient(CoffeeIngredient ingredient){
         coffeeMachineIngredients.add(ingredient);
     }
+
+    /**
+     * Adds a booklet entry to the list of entries
+     *
+     * @param entry The entry to add
+     */
+    public static void addBookletEntry(IBookletEntry entry){
+        bookletEntries.add(entry);
+    }
+
+    /**
+     * Adds a page to the pages with ItemStack data
+     * This should be done with every page that uses getItemStacksForPage()
+     *
+     * @param page The page to add
+     */
+    public static void addPageWithItemStackData(BookletPage page){
+        bookletPagesWithItemStackData.add(page);
+    }
 }

src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java

@@ -0,0 +1,78 @@
+/*
+ * This file ("IBookletPage.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.booklet;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
+import net.minecraft.item.ItemStack;
+
+public abstract class BookletPage{
+
+    public boolean arePageStacksWildcard;
+    protected IBookletChapter chapter;
+
+    /**
+     * The ID of the page, for the page number etc.
+     * Don't make two pages in the same chapter with the same ID.
+     */
+    public abstract int getID();
+
+    /**
+     * Gets the localized text to be displayed
+     */
+    public abstract String getText();
+
+    /**
+     * This render method ica called before super.drawScreen() is called in the GUI
+     */
+    @SideOnly(Side.CLIENT)
+    public abstract void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed);
+
+    /**
+     * This render method ica called after super.drawScreen() is called in the GUI
+     */
+    @SideOnly(Side.CLIENT)
+    public abstract void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed);
+
+    /**
+     * Equivalent to updateScreen() in GuiScreen
+     */
+    @SideOnly(Side.CLIENT)
+    public abstract void updateScreen(int ticksElapsed);
+
+    /**
+     * Gets the ItemStacks that are part of or displayed on this page (for NEI Handler, right-click function etc.)
+     */
+    public abstract ItemStack[] getItemStacksForPage();
+
+    /**
+     * Gets the text that is displayed when an Item is hovered over that can be clicked on to go to its page
+     */
+    public abstract String getClickToSeeRecipeString();
+
+    public IBookletChapter getChapter(){
+        return this.chapter;
+    }
+
+    public void setChapter(IBookletChapter chapter){
+        this.chapter = chapter;
+    }
+
+    /**
+     * Sets the stacks on the page to be wildcard, meaning the metadata doesn't matter
+     * This applies for all stacks at once
+     */
+    public BookletPage setPageStacksWildcard(){
+        this.arePageStacksWildcard = true;
+        return this;
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java

@@ -0,0 +1,29 @@
+/*
+ * This file ("IBookletChapter.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.booklet;
+
+import net.minecraft.item.ItemStack;
+
+public interface IBookletChapter{
+
+    BookletPage[] getPages();
+
+    String getUnlocalizedName();
+
+    String getLocalizedName();
+
+    String getLocalizedNameWithFormatting();
+
+    IBookletEntry getEntry();
+
+    ItemStack getDisplayItemStack();
+
+}

src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java

@@ -0,0 +1,29 @@
+/*
+ * This file ("IBookletEntry.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.booklet;
+
+import java.util.List;
+
+public interface IBookletEntry{
+
+    List<IBookletChapter> getChapters();
+
+    String getUnlocalizedName();
+
+    String getLocalizedName();
+
+    String getLocalizedNameWithFormatting();
+
+    void setChapters(List<IBookletChapter> chapters);
+
+    void addChapter(IBookletChapter chapter);
+
+}

src/main/java/de/ellpeck/actuallyadditions/api/booklet/INEIRecipeHandler.java

@@ -8,11 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.mod.nei;
+package de.ellpeck.actuallyadditions.api.booklet;
-
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 
+/**
+ * Make an NEI Recipe Handler implement this to make a button show up on the page
+ */
 public interface INEIRecipeHandler{
 
+    /**
+     * The page that will be opened when clicking the button
+     * @param neiIndex the page variable in NEI's GuiRecipe
+     */
     BookletPage getPageForInfo(int neiIndex);
 }

src/main/java/de/ellpeck/actuallyadditions/api/internal/EntrySet.java

@@ -8,29 +8,30 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.mod.booklet;
+package de.ellpeck.actuallyadditions.api.internal;
 
-import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class EntrySet{
 
     public BookletPage page;
-    public BookletChapter chapter;
+    public IBookletChapter chapter;
-    public BookletEntry entry;
+    public IBookletEntry entry;
     public int pageInIndex;
 
-    public EntrySet(BookletEntry entry){
+    public EntrySet(IBookletEntry entry){
         this(null, null, entry, 1);
     }
 
-    public EntrySet(BookletPage page, BookletChapter chapter, BookletEntry entry, int pageInIndex){
+    public EntrySet(BookletPage page, IBookletChapter chapter, IBookletEntry entry, int pageInIndex){
         this.setEntry(page, chapter, entry, pageInIndex);
     }
 
-    public void setEntry(BookletPage page, BookletChapter chapter, BookletEntry entry, int pageInIndex){
+    public void setEntry(BookletPage page, IBookletChapter chapter, IBookletEntry entry, int pageInIndex){
         this.page = page;
         this.chapter = chapter;
         this.entry = entry;
@@ -44,9 +45,9 @@ public class EntrySet{
                 int chapter = compound.getInteger("Chapter");
                 int page = compound.getInteger("Page");
 
-                BookletEntry currentEntry = entry == -1 ? null : InitBooklet.entries.get(entry);
+                IBookletEntry currentEntry = entry == -1 ? null : ActuallyAdditionsAPI.bookletEntries.get(entry);
-                BookletChapter currentChapter = chapter == -1 || entry == -1 || currentEntry.chapters.size() <= chapter ? null : currentEntry.chapters.get(chapter);
+                IBookletChapter currentChapter = chapter == -1 || entry == -1 || currentEntry.getChapters().size() <= chapter ? null : currentEntry.getChapters().get(chapter);
-                BookletPage currentPage = chapter == -1 || currentChapter == null || currentChapter.pages.length <= page-1 ? null : currentChapter.pages[page-1];
+                BookletPage currentPage = chapter == -1 || currentChapter == null || currentChapter.getPages().length <= page-1 ? null : currentChapter.getPages()[page-1];
                 int pageInIndex = compound.getInteger("PageInIndex");
 
                 return new EntrySet(currentPage, currentChapter, currentEntry, pageInIndex);
@@ -61,8 +62,8 @@ public class EntrySet{
 
     public NBTTagCompound writeToNBT(){
         NBTTagCompound compound = new NBTTagCompound();
-        compound.setInteger("Entry", entry == null ? -1 : InitBooklet.entries.indexOf(entry));
+        compound.setInteger("Entry", entry == null ? -1 : ActuallyAdditionsAPI.bookletEntries.indexOf(entry));
-        compound.setInteger("Chapter", entry == null || chapter == null ? -1 : entry.chapters.indexOf(chapter));
+        compound.setInteger("Chapter", entry == null || chapter == null ? -1 : entry.getChapters().indexOf(chapter));
         compound.setInteger("Page", page == null ? -1 : page.getID());
         compound.setInteger("PageInIndex", pageInIndex);
         return compound;

src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java

@@ -8,13 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.api.lens;
+package de.ellpeck.actuallyadditions.api.internal;
 
 import net.minecraft.world.World;
 
 /**
  * This is a helper interface for Lens' invoke() method.
  * This is not supposed to be implemented.
+ * <p>
+ * Can be cast to TileEntity.
  */
 public interface IAtomicReconstructor{
 

src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java

@@ -0,0 +1,47 @@
+/*
+ * This file ("IBookletGui.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.internal;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import net.minecraft.item.ItemStack;
+
+/**
+ * This is a helper interface for BookletPage
+ * This is not supposed to be implemented.
+ * <p>
+ * Can be cast to GuiScreen.
+ */
+public interface IBookletGui{
+
+    /**
+     * This method should be used when drawing an ItemStack to a booklet page
+     * It displays the hoverover text of the item and also contains the "show more info"-text and clickable part
+     *
+     * @param renderTransferButton if the "show more info"-text and clickable part should exist-
+     */
+    @SuppressWarnings("unchecked")
+    @SideOnly(Side.CLIENT)
+    void renderTooltipAndTransferButton(BookletPage from, ItemStack stack, int x, int y, boolean renderTransferButton, boolean mousePressed);
+
+    int getXSize();
+
+    int getYSize();
+
+    int getGuiLeft();
+
+    int getGuiTop();
+
+    void drawTexturedModalRect(int startX, int startY, int u, int v, int xSize, int ySize);
+
+    EntrySet getCurrentEntrySet();
+}

src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.api.lens;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.Position;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import net.minecraft.item.Item;
 
 /**

src/main/java/de/ellpeck/actuallyadditions/api/package-info.java

@@ -7,7 +7,7 @@
  *
  * © 2016 Ellpeck
  */
-@API(owner = "ActuallyAdditions", apiVersion = "1", provides = "ActuallyAdditionsAPI")
+@API(owner = "ActuallyAdditions", apiVersion = "2", provides = "ActuallyAdditionsAPI")
 package de.ellpeck.actuallyadditions.api;
 
 import cpw.mods.fml.common.API;

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -71,6 +71,7 @@ public class ActuallyAdditions{
         InitItems.init();
         FuelHandler.init();
         UpdateChecker.init();
+        InitBooklet.preInit();
         proxy.preInit(event);
 
         ModUtil.LOGGER.info("PreInitialization Finished.");
@@ -106,7 +107,7 @@ public class ActuallyAdditions{
         LensNoneRecipeHandler.init();
         InitForeignPaxels.init();
 
-        InitBooklet.init();
+        InitBooklet.postInit();
         proxy.postInit(event);
 
         ModUtil.LOGGER.info("PostInitialization Finished.");

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java

@@ -13,9 +13,9 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand;
@@ -145,7 +145,7 @@ public class BlockBookletStand extends BlockContainerBase implements IHudDisplay
                 strg1 = set.chapter.getLocalizedName();
                 strg2 = "Page "+set.page.getID();
 
-                AssetUtil.renderStackToGui(set.chapter.displayStack != null ? set.chapter.displayStack : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+10, 1F);
+                AssetUtil.renderStackToGui(set.chapter.getDisplayItemStack() != null ? set.chapter.getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2+10, 1F);
             }
             minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg1, resolution.getScaledWidth()/2+25, resolution.getScaledHeight()/2+8, StringUtil.DECIMAL_COLOR_WHITE);
             minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg2, resolution.getScaledWidth()/2+25, resolution.getScaledHeight()/2+18, StringUtil.DECIMAL_COLOR_WHITE);

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java

@@ -10,14 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet;
 
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
 import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
-import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
 import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.util.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -28,6 +29,7 @@ import net.minecraft.util.EnumChatFormatting;
 import java.awt.*;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 public class BookletUtils{
@@ -114,7 +116,7 @@ public class BookletUtils{
         }
 
         ArrayList<String> infoList = null;
-        for(BookletPage page : booklet.currentEntrySet.chapter.pages){
+        for(BookletPage page : booklet.currentEntrySet.chapter.getPages()){
             if(page != null && page.getItemStacksForPage() != null){
                 for(ItemStack stack : page.getItemStacksForPage()){
                     if(stack != null){
@@ -157,7 +159,7 @@ public class BookletUtils{
         if(booklet.currentEntrySet.entry != null){
             //Renders Booklet Page Number and Content
             if(booklet.currentEntrySet.chapter != null && booklet.currentEntrySet.page != null){
-                booklet.drawCenteredString(booklet.getFontRenderer(), booklet.currentEntrySet.page.getID()+"/"+booklet.currentEntrySet.chapter.pages.length, booklet.guiLeft+booklet.xSize/2, booklet.guiTop+172, StringUtil.DECIMAL_COLOR_WHITE);
+                booklet.drawCenteredString(booklet.getFontRenderer(), booklet.currentEntrySet.page.getID()+"/"+booklet.currentEntrySet.chapter.getPages().length, booklet.guiLeft+booklet.xSize/2, booklet.guiTop+172, StringUtil.DECIMAL_COLOR_WHITE);
                 booklet.currentEntrySet.page.renderPre(booklet, mouseX, mouseY, ticksElapsed, mousePressed);
             }
             //Renders Chapter Page Number
@@ -203,32 +205,27 @@ public class BookletUtils{
             if(booklet.searchField.getText() != null && !booklet.searchField.getText().isEmpty()){
                 currentEntry.chapters.clear();
 
-                for(BookletChapter chapter : currentEntry.allChapters){
+                for(IBookletChapter chapter : currentEntry.allChapters){
                     if(chapter.getLocalizedName().toLowerCase(Locale.ROOT).contains(booklet.searchField.getText().toLowerCase(Locale.ROOT))){
                         currentEntry.chapters.add(chapter);
                     }
                 }
             }
             else{
-                currentEntry.chapters = (ArrayList<BookletChapter>)currentEntry.allChapters.clone();
+                currentEntry.setChapters((ArrayList<IBookletChapter>)currentEntry.allChapters.clone());
             }
             openIndexEntry(booklet, booklet.currentEntrySet.entry, booklet.currentEntrySet.pageInIndex, false);
         }
     }
 
-    /**
-     * Opens an index entry in the booklet.
-     *
-     * @param resetTextField will clear the text in the searchField and reset the search entry's data
-     */
     @SuppressWarnings("unchecked")
-    public static void openIndexEntry(GuiBooklet booklet, BookletEntry entry, int page, boolean resetTextField){
+    public static void openIndexEntry(GuiBooklet booklet, IBookletEntry entry, int page, boolean resetTextField){
         booklet.searchField.setVisible(entry instanceof BookletEntryAllSearch);
         booklet.searchField.setFocused(entry instanceof BookletEntryAllSearch);
         if(resetTextField){
             booklet.searchField.setText("");
             if(entry instanceof BookletEntryAllSearch){
-                entry.chapters = (ArrayList<BookletChapter>)((BookletEntryAllSearch)entry).allChapters.clone();
+                entry.setChapters((List<IBookletChapter>)((BookletEntryAllSearch)entry).allChapters.clone());
             }
         }
 
@@ -236,7 +233,7 @@ public class BookletUtils{
         booklet.currentEntrySet.chapter = null;
 
         booklet.currentEntrySet.entry = entry;
-        booklet.indexPageAmount = entry == null ? 1 : entry.chapters.size()/booklet.chapterButtons.length+1;
+        booklet.indexPageAmount = entry == null ? 1 : entry.getChapters().size()/booklet.chapterButtons.length+1;
         booklet.currentEntrySet.pageInIndex = entry == null ? 1 : (booklet.indexPageAmount <= page || page <= 0 ? booklet.indexPageAmount : page);
 
         booklet.buttonPreviousScreen.visible = entry != null;
@@ -247,10 +244,10 @@ public class BookletUtils{
             IndexButton button = (IndexButton)booklet.chapterButtons[i];
             if(entry == null){
                 if(i >= GuiBooklet.INDEX_BUTTONS_OFFSET){
-                    boolean entryExists = InitBooklet.entries.size() > i-GuiBooklet.INDEX_BUTTONS_OFFSET;
+                    boolean entryExists = ActuallyAdditionsAPI.bookletEntries.size() > i-GuiBooklet.INDEX_BUTTONS_OFFSET;
                     button.visible = entryExists;
                     if(entryExists){
-                        button.displayString = InitBooklet.entries.get(i-GuiBooklet.INDEX_BUTTONS_OFFSET).getNameWithColor();
+                        button.displayString = ActuallyAdditionsAPI.bookletEntries.get(i-GuiBooklet.INDEX_BUTTONS_OFFSET).getLocalizedNameWithFormatting();
                         button.chap = null;
                     }
                 }
@@ -259,11 +256,11 @@ public class BookletUtils{
                 }
             }
             else{
-                boolean entryExists = entry.chapters.size() > i+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length);
+                boolean entryExists = entry.getChapters().size() > i+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length);
                 button.visible = entryExists;
                 if(entryExists){
-                    BookletChapter chap = entry.chapters.get(i+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length));
+                    IBookletChapter chap = entry.getChapters().get(i+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length));
-                    button.displayString = chap.getNameWithColor();
+                    button.displayString = chap.getLocalizedNameWithFormatting();
                     button.chap = chap;
                 }
             }
@@ -278,15 +275,15 @@ public class BookletUtils{
         if(place >= 0){
             if(booklet.currentEntrySet.entry != null){
                 if(booklet.currentEntrySet.chapter == null){
-                    if(place < booklet.currentEntrySet.entry.chapters.size()){
+                    if(place < booklet.currentEntrySet.entry.getChapters().size()){
-                        BookletChapter chap = booklet.currentEntrySet.entry.chapters.get(place+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length));
+                        IBookletChapter chap = booklet.currentEntrySet.entry.getChapters().get(place+(booklet.chapterButtons.length*booklet.currentEntrySet.pageInIndex-booklet.chapterButtons.length));
-                        openChapter(booklet, chap, chap.pages[0]);
+                        openChapter(booklet, chap, chap.getPages()[0]);
                     }
                 }
             }
             else{
-                if(place-GuiBooklet.INDEX_BUTTONS_OFFSET < InitBooklet.entries.size()){
+                if(place-GuiBooklet.INDEX_BUTTONS_OFFSET < ActuallyAdditionsAPI.bookletEntries.size()){
-                    openIndexEntry(booklet, InitBooklet.entries.get(place-GuiBooklet.INDEX_BUTTONS_OFFSET), 1, true);
+                    openIndexEntry(booklet, ActuallyAdditionsAPI.bookletEntries.get(place-GuiBooklet.INDEX_BUTTONS_OFFSET), 1, true);
                 }
             }
         }
@@ -296,7 +293,7 @@ public class BookletUtils{
      * Opens a chapter in the booklet.
      * Can only be done when the chapter is not null and an index entry is opened in the booklet
      */
-    public static void openChapter(GuiBooklet booklet, BookletChapter chapter, BookletPage page){
+    public static void openChapter(GuiBooklet booklet, IBookletChapter chapter, BookletPage page){
         if(chapter == null || booklet.currentEntrySet.entry == null){
             return;
         }
@@ -306,7 +303,7 @@ public class BookletUtils{
         booklet.searchField.setText("");
 
         booklet.currentEntrySet.chapter = chapter;
-        booklet.currentEntrySet.page = page != null && doesChapterHavePage(chapter, page) ? page : chapter.pages[0];
+        booklet.currentEntrySet.page = page != null && doesChapterHavePage(chapter, page) ? page : chapter.getPages()[0];
 
         booklet.buttonForward.visible = getNextPage(chapter, booklet.currentEntrySet.page) != null;
         booklet.buttonBackward.visible = getPrevPage(chapter, booklet.currentEntrySet.page) != null;
@@ -320,8 +317,8 @@ public class BookletUtils{
     /**
      * Checks if a chapter has a certain page
      */
-    private static boolean doesChapterHavePage(BookletChapter chapter, BookletPage page){
+    private static boolean doesChapterHavePage(IBookletChapter chapter, BookletPage page){
-        for(BookletPage aPage : chapter.pages){
+        for(BookletPage aPage : chapter.getPages()){
             if(aPage == page){
                 return true;
             }
@@ -332,11 +329,11 @@ public class BookletUtils{
     /**
      * Gets the next available page in the booklet (or null if there is none)
      */
-    private static BookletPage getNextPage(BookletChapter chapter, BookletPage page){
+    private static BookletPage getNextPage(IBookletChapter chapter, BookletPage page){
-        for(int i = 0; i < chapter.pages.length; i++){
+        for(int i = 0; i < chapter.getPages().length; i++){
-            if(chapter.pages[i] == page){
+            if(chapter.getPages()[i] == page){
-                if(i+1 < chapter.pages.length){
+                if(i+1 < chapter.getPages().length){
-                    return chapter.pages[i+1];
+                    return chapter.getPages()[i+1];
                 }
             }
         }
@@ -346,11 +343,11 @@ public class BookletUtils{
     /**
      * Gets the previous available page in the booklet (or null if there is none)
      */
-    private static BookletPage getPrevPage(BookletChapter chapter, BookletPage page){
+    private static BookletPage getPrevPage(IBookletChapter chapter, BookletPage page){
-        for(int i = 0; i < chapter.pages.length; i++){
+        for(int i = 0; i < chapter.getPages().length; i++){
-            if(chapter.pages[i] == page){
+            if(chapter.getPages()[i] == page){
                 if(i-1 >= 0){
-                    return chapter.pages[i-1];
+                    return chapter.getPages()[i-1];
                 }
             }
         }
@@ -408,7 +405,7 @@ public class BookletUtils{
 
     public static ArrayList<BookletPage> getPagesForStack(ItemStack stack){
         ArrayList<BookletPage> possiblePages = new ArrayList<BookletPage>();
-        for(BookletPage page : InitBooklet.pagesWithItemStackData){
+        for(BookletPage page : ActuallyAdditionsAPI.bookletPagesWithItemStackData){
             if(ItemUtil.contains(page.getItemStacksForPage(), stack, page.arePageStacksWildcard)){
                 possiblePages.add(page);
             }

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

@@ -12,6 +12,10 @@ package de.ellpeck.actuallyadditions.mod.booklet;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
@@ -30,6 +34,7 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
@@ -42,7 +47,7 @@ import java.util.Collections;
 import java.util.List;
 
 @SideOnly(Side.CLIENT)
-public class GuiBooklet extends GuiScreen{
+public class GuiBooklet extends GuiScreen implements IBookletGui{
 
     public static final ResourceLocation resLoc = AssetUtil.getBookletGuiLocation("guiBooklet");
     public static final ResourceLocation resLocHalloween = AssetUtil.getBookletGuiLocation("guiBookletHalloween");
@@ -396,4 +401,63 @@ public class GuiBooklet extends GuiScreen{
     public boolean doesGuiPauseGame(){
         return false;
     }
+
+    @Override
+    public void renderTooltipAndTransferButton(BookletPage from, ItemStack stack, int x, int y, boolean renderTransferButton, boolean mousePressed){
+        boolean flagBefore = this.mc.fontRenderer.getUnicodeFlag();
+        this.mc.fontRenderer.setUnicodeFlag(false);
+
+        List list = stack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
+
+        for(int k = 0; k < list.size(); ++k){
+            if(k == 0){
+                list.set(k, stack.getRarity().rarityColor+(String)list.get(k));
+            }
+            else{
+                list.set(k, EnumChatFormatting.GRAY+(String)list.get(k));
+            }
+        }
+
+        if(renderTransferButton){
+            BookletPage page = BookletUtils.getFirstPageForStack(stack);
+            if(page != null && page != from){
+                list.add(from.getClickToSeeRecipeString());
+
+                if(mousePressed){
+                    BookletUtils.openIndexEntry(this, page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
+                    BookletUtils.openChapter(this, page.getChapter(), page);
+                    Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
+                }
+            }
+        }
+
+        this.drawHoveringText(list, x, y);
+
+        this.mc.fontRenderer.setUnicodeFlag(flagBefore);
+    }
+
+    @Override
+    public int getXSize(){
+        return this.xSize;
+    }
+
+    @Override
+    public int getYSize(){
+        return this.ySize;
+    }
+
+    @Override
+    public int getGuiLeft(){
+        return this.guiLeft;
+    }
+
+    @Override
+    public int getGuiTop(){
+        return this.guiTop;
+    }
+
+    @Override
+    public EntrySet getCurrentEntrySet(){
+        return this.currentEntrySet;
+    }
 }

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

@@ -10,6 +10,10 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet;
 
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
@@ -36,121 +40,120 @@ import java.util.ArrayList;
 
 public class InitBooklet{
 
-    public static ArrayList<BookletEntry> entries = new ArrayList<BookletEntry>();
-    public static ArrayList<BookletPage> pagesWithItemStackData = new ArrayList<BookletPage>();
-
     public static int wordCount;
     public static int charCount;
 
     public static BookletChapter chapterIntro;
 
-    public static BookletEntry entryGettingStarted = new BookletEntry("gettingStarted").setImportant();
+    public static void preInit(){
-    public static BookletEntry entryFunctionalNonRF = new BookletEntry("functionalNoRF");
+        ActuallyAdditionsAPI.entryGettingStarted = new BookletEntry("gettingStarted").setImportant();
-    public static BookletEntry entryFunctionalRF = new BookletEntry("functionalRF").setSpecial();
+        ActuallyAdditionsAPI.entryFunctionalNonRF = new BookletEntry("functionalNoRF");
-    public static BookletEntry entryGeneratingRF = new BookletEntry("generatingRF").setSpecial();
+        ActuallyAdditionsAPI.entryFunctionalRF = new BookletEntry("functionalRF").setSpecial();
-    public static BookletEntry entryItemsNonRF = new BookletEntry("itemsNoRF");
+        ActuallyAdditionsAPI.entryGeneratingRF = new BookletEntry("generatingRF").setSpecial();
-    public static BookletEntry entryItemsRF = new BookletEntry("itemsRF").setSpecial();
+        ActuallyAdditionsAPI.entryItemsNonRF = new BookletEntry("itemsNoRF");
-    public static BookletEntry entryMisc = new BookletEntry("misc");
+        ActuallyAdditionsAPI.entryItemsRF = new BookletEntry("itemsRF").setSpecial();
-    public static BookletEntry allAndSearch = new BookletEntryAllSearch("allAndSearch").setSpecial();
+        ActuallyAdditionsAPI.entryMisc = new BookletEntry("misc");
+        ActuallyAdditionsAPI.allAndSearch = new BookletEntryAllSearch("allAndSearch").setSpecial();
+    }
     
-    public static void init(){
+    public static void postInit(){
         initChapters();
         countWords();
     }
 
     private static void initChapters(){
         //Getting Started
-        chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3));
+        chapterIntro = new BookletChapter("intro", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3));
-        new BookletChapter("bookTutorial", entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook));
+        new BookletChapter("bookTutorial", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook));
-        new BookletChapter("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial();
+        new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial();
-        new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", TileEntityCoalGenerator.PRODUCE));
+        new BookletChapter("coalGen", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", TileEntityCoalGenerator.PRODUCE));
-        new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(7, ItemCrafting.recipeRing).setNoText(), new PageCrafting(8, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(11, ItemCrafting.recipeDough).setNoText(), new PageCrafting(12, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(13, BlockCrafting.recipeIronCase).setNoText()).setImportant();
+        new BookletChapter("craftingIngs", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(7, ItemCrafting.recipeRing).setNoText(), new PageCrafting(8, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(11, ItemCrafting.recipeDough).setNoText(), new PageCrafting(12, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(13, BlockCrafting.recipeIronCase).setNoText()).setImportant();
-        new BookletChapter("rf", entryGettingStarted, new ItemStack(Items.redstone), new PageTextOnly(1));
+        new BookletChapter("rf", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(Items.redstone), new PageTextOnly(1));
 
         //Miscellaneous
-        new BookletChapter("reconstructorLenses", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeLens).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeColorLens), new PageReconstructor(4, LensNoneRecipeHandler.recipeExplosionLens), new PageReconstructor(5, LensNoneRecipeHandler.recipeDamageLens), new PageReconstructor(6, LensNoneRecipeHandler.recipeSoulSand).setNoText(), new PageReconstructor(7, LensNoneRecipeHandler.recipeLeather).setNoText()).setImportant();
+        new BookletChapter("reconstructorLenses", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeLens).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeColorLens), new PageReconstructor(4, LensNoneRecipeHandler.recipeExplosionLens), new PageReconstructor(5, LensNoneRecipeHandler.recipeDamageLens), new PageReconstructor(6, LensNoneRecipeHandler.recipeSoulSand).setNoText(), new PageReconstructor(7, LensNoneRecipeHandler.recipeLeather).setNoText()).setImportant();
-        new BookletChapter("miscDecorStuffsAndThings", entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensNoneRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeGreenWall).setNoText());
+        new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensNoneRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeGreenWall).setNoText());
-        new BookletChapter("bookStand", entryMisc, new ItemStack(InitBlocks.blockBookletStand), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBookStand).setPageStacksWildcard());
+        new BookletChapter("bookStand", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockBookletStand), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBookStand).setPageStacksWildcard());
-        new BookletChapter("quartz", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("<lowest>", OreGen.QUARTZ_MIN).addTextReplacement("<highest>", OreGen.QUARTZ_MAX), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText());
+        new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("<lowest>", OreGen.QUARTZ_MIN).addTextReplacement("<highest>", OreGen.QUARTZ_MAX), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText());
-        new BookletChapter("cloud", entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial();
+        new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial();
-        new BookletChapter("coalStuff", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());
+        new BookletChapter("coalStuff", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());
         ArrayList<BookletPage> lampPages = new ArrayList<BookletPage>();
         lampPages.add(new PageTextOnly(lampPages.size()+1));
         lampPages.add(new PageCrafting(lampPages.size()+1, BlockCrafting.recipePowerer).setNoText());
         for(IRecipe recipe : BlockCrafting.recipesLamps){
             lampPages.add(new PageCrafting(lampPages.size()+1, recipe).setNoText());
         }
-        new BookletChapter("lamps", entryMisc, new ItemStack(InitBlocks.blockColoredLampOn, 1, TheColoredLampColors.GREEN.ordinal()), lampPages.toArray(new BookletPage[lampPages.size()]));
+        new BookletChapter("lamps", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockColoredLampOn, 1, TheColoredLampColors.GREEN.ordinal()), lampPages.toArray(new BookletPage[lampPages.size()]));
 
-        new BookletChapter("treasureChest", entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "pageTreasureChest", 150).setStack(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial();
+        new BookletChapter("treasureChest", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "pageTreasureChest", 150).setStack(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial();
-        new BookletChapter("hairBalls", entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "pageFurBalls", 110).setStack(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial();
+        new BookletChapter("hairBalls", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "pageFurBalls", 110).setStack(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial();
-        new BookletChapter("blackLotus", entryMisc, new ItemStack(InitBlocks.blockBlackLotus), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockBlackLotus)), new PageCrafting(2, ItemCrafting.recipeBlackDye));
+        new BookletChapter("blackLotus", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockBlackLotus), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockBlackLotus)), new PageCrafting(2, ItemCrafting.recipeBlackDye));
 
         //No RF Using Blocks
-        new BookletChapter("breaker", entryFunctionalNonRF, new ItemStack(InitBlocks.blockBreaker), new PageCrafting(1, BlockCrafting.recipeBreaker).setPageStacksWildcard(), new PageCrafting(2, BlockCrafting.recipePlacer).setPageStacksWildcard(), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer).setPageStacksWildcard(), new PageCrafting(4, BlockCrafting.recipeLiquidCollector).setPageStacksWildcard());
+        new BookletChapter("breaker", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockBreaker), new PageCrafting(1, BlockCrafting.recipeBreaker).setPageStacksWildcard(), new PageCrafting(2, BlockCrafting.recipePlacer).setPageStacksWildcard(), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer).setPageStacksWildcard(), new PageCrafting(4, BlockCrafting.recipeLiquidCollector).setPageStacksWildcard());
-        new BookletChapter("dropper", entryFunctionalNonRF, new ItemStack(InitBlocks.blockDropper), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeDropper).setNoText());
+        new BookletChapter("dropper", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockDropper), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeDropper).setNoText());
-        new BookletChapter("phantomfaces", entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomLiquiface), new PageTextOnly(1).addTextReplacement("<range>", TileEntityPhantomface.RANGE), new PageTextOnly(2), new PageCrafting(3, BlockCrafting.recipePhantomface), new PageCrafting(4, BlockCrafting.recipeLiquiface), new PageCrafting(5, BlockCrafting.recipeEnergyface), new PageCrafting(6, ItemCrafting.recipePhantomConnector).setNoText(), new PageCrafting(7, BlockCrafting.recipePhantomBooster)).setImportant();
+        new BookletChapter("phantomfaces", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomLiquiface), new PageTextOnly(1).addTextReplacement("<range>", TileEntityPhantomface.RANGE), new PageTextOnly(2), new PageCrafting(3, BlockCrafting.recipePhantomface), new PageCrafting(4, BlockCrafting.recipeLiquiface), new PageCrafting(5, BlockCrafting.recipeEnergyface), new PageCrafting(6, ItemCrafting.recipePhantomConnector).setNoText(), new PageCrafting(7, BlockCrafting.recipePhantomBooster)).setImportant();
-        new BookletChapter("phantomBreaker", entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomBreaker), new PageTextOnly(1).addTextReplacement("<range>", TileEntityPhantomPlacer.RANGE), new PageCrafting(2, BlockCrafting.recipePhantomPlacer).setNoText(), new PageCrafting(3, BlockCrafting.recipePhantomBreaker).setNoText());
+        new BookletChapter("phantomBreaker", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomBreaker), new PageTextOnly(1).addTextReplacement("<range>", TileEntityPhantomPlacer.RANGE), new PageCrafting(2, BlockCrafting.recipePhantomPlacer).setNoText(), new PageCrafting(3, BlockCrafting.recipePhantomBreaker).setNoText());
-        new BookletChapter("esd", entryFunctionalNonRF, new ItemStack(InitBlocks.blockInputterAdvanced), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeESD).setNoText(), new PageCrafting(3, BlockCrafting.recipeAdvancedESD).setNoText()).setSpecial();
+        new BookletChapter("esd", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockInputterAdvanced), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeESD).setNoText(), new PageCrafting(3, BlockCrafting.recipeAdvancedESD).setNoText()).setSpecial();
-        new BookletChapter("xpSolidifier", entryFunctionalNonRF, new ItemStack(InitBlocks.blockXPSolidifier), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemSolidifiedExperience)), new PageCrafting(2, BlockCrafting.recipeSolidifier).setNoText()).setSpecial();
+        new BookletChapter("xpSolidifier", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockXPSolidifier), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemSolidifiedExperience)), new PageCrafting(2, BlockCrafting.recipeSolidifier).setNoText()).setSpecial();
-        new BookletChapter("greenhouseGlass", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass));
+        new BookletChapter("greenhouseGlass", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass));
-        new BookletChapter("fishingNet", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText());
+        new BookletChapter("fishingNet", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText());
-        new BookletChapter("feeder", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText());
+        new BookletChapter("feeder", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText());
-        new BookletChapter("compost", entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("<num>", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood));
+        new BookletChapter("compost", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("<num>", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood));
-        new BookletChapter("crate", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeCrateKeeper), new PageCrafting(3, ItemCrafting.recipeChestToCrateUpgrade));
+        new BookletChapter("crate", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeCrateKeeper), new PageCrafting(3, ItemCrafting.recipeChestToCrateUpgrade));
-        new BookletChapter("rangedCollector", entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("<range>", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText());
+        new BookletChapter("rangedCollector", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("<range>", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText());
 
         //RF Using Blocks
-        new BookletChapter("fireworkBox", entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial();
+        new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial();
-        new BookletChapter("laserRelays", entryFunctionalRF, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1).addTextReplacement("<range>", TileEntityLaserRelay.MAX_DISTANCE).addTextReplacement("<loss>", ConfigIntValues.LASER_RELAY_LOSS.getValue()), new PagePicture(2, "pageLaserRelay", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLaserRelay).setNoText().setPageStacksWildcard(), new PageCrafting(4, ItemCrafting.recipeLaserWrench).setNoText()).setImportant();
+        new BookletChapter("laserRelays", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1).addTextReplacement("<range>", TileEntityLaserRelay.MAX_DISTANCE).addTextReplacement("<loss>", ConfigIntValues.LASER_RELAY_LOSS.getValue()), new PagePicture(2, "pageLaserRelay", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLaserRelay).setNoText().setPageStacksWildcard(), new PageCrafting(4, ItemCrafting.recipeLaserWrench).setNoText()).setImportant();
-        new BookletChapter("miner", entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", TileEntityMiner.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial();
+        new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", TileEntityMiner.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial();
-        new BookletChapterCoffee("coffeeMachine", entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("<rf>", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("<coffee>", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("<water>", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "pageCoffeeMachine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setNoText().setPageStacksWildcard(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant();
+        new BookletChapterCoffee("coffeeMachine", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("<rf>", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("<coffee>", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("<water>", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "pageCoffeeMachine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setNoText().setPageStacksWildcard(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant();
-        new BookletChapterCrusher("crusher", entryFunctionalRF, new ItemStack(InitBlocks.blockGrinderDouble), new PageTextOnly(1).addTextReplacement("<rf1>", TileEntityGrinder.getEnergyUse(false)).addTextReplacement("<rf2>", TileEntityGrinder.getEnergyUse(true)), new PageCrafting(2, BlockCrafting.recipeCrusher).setNoText().setPageStacksWildcard(), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher).setNoText().setPageStacksWildcard(), new PageCrusherRecipe(4, CrusherCrafting.recipeIronHorseArmor).setNoText(), new PageCrusherRecipe(5, CrusherCrafting.recipeGoldHorseArmor).setNoText(), new PageCrusherRecipe(6, CrusherCrafting.recipeDiamondHorseArmor).setNoText());
+        new BookletChapterCrusher("crusher", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockGrinderDouble), new PageTextOnly(1).addTextReplacement("<rf1>", TileEntityGrinder.getEnergyUse(false)).addTextReplacement("<rf2>", TileEntityGrinder.getEnergyUse(true)), new PageCrafting(2, BlockCrafting.recipeCrusher).setNoText().setPageStacksWildcard(), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher).setNoText().setPageStacksWildcard(), new PageCrusherRecipe(4, CrusherCrafting.recipeIronHorseArmor).setNoText(), new PageCrusherRecipe(5, CrusherCrafting.recipeGoldHorseArmor).setNoText(), new PageCrusherRecipe(6, CrusherCrafting.recipeDiamondHorseArmor).setNoText());
-        new BookletChapter("furnaceDouble", entryFunctionalRF, new ItemStack(InitBlocks.blockFurnaceDouble), new PageCrafting(1, BlockCrafting.recipeFurnace).addTextReplacement("<rf>", TileEntityFurnaceDouble.ENERGY_USE));
+        new BookletChapter("furnaceDouble", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFurnaceDouble), new PageCrafting(1, BlockCrafting.recipeFurnace).addTextReplacement("<rf>", TileEntityFurnaceDouble.ENERGY_USE));
-        new BookletChapter("lavaFactory", entryFunctionalRF, new ItemStack(InitBlocks.blockLavaFactoryController), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityLavaFactoryController.ENERGY_USE), new PagePicture(2, "pageLavaFactory", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLavaFactory).setNoText(), new PageCrafting(4, BlockCrafting.recipeCasing).setNoText());
+        new BookletChapter("lavaFactory", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockLavaFactoryController), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityLavaFactoryController.ENERGY_USE), new PagePicture(2, "pageLavaFactory", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLavaFactory).setNoText(), new PageCrafting(4, BlockCrafting.recipeCasing).setNoText());
-        new BookletChapter("energizer", entryFunctionalRF, new ItemStack(InitBlocks.blockEnergizer), new PageCrafting(1, BlockCrafting.recipeEnergizer), new PageCrafting(2, BlockCrafting.recipeEnervator));
+        new BookletChapter("energizer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockEnergizer), new PageCrafting(1, BlockCrafting.recipeEnergizer), new PageCrafting(2, BlockCrafting.recipeEnervator));
-        new BookletChapter("repairer", entryFunctionalRF, new ItemStack(InitBlocks.blockItemRepairer), new PageCrafting(1, BlockCrafting.recipeRepairer).addTextReplacement("<rf>", TileEntityItemRepairer.ENERGY_USE));
+        new BookletChapter("repairer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockItemRepairer), new PageCrafting(1, BlockCrafting.recipeRepairer).addTextReplacement("<rf>", TileEntityItemRepairer.ENERGY_USE));
-        new BookletChapter("longRangeBreaker", entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("<range>", TileEntityDirectionalBreaker.RANGE), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker).setPageStacksWildcard());
+        new BookletChapter("longRangeBreaker", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("<range>", TileEntityDirectionalBreaker.RANGE), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker).setPageStacksWildcard());
 
         //RF Generating Blocks
-        new BookletChapter("solarPanel", entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFurnaceSolar.PRODUCE), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText());
+        new BookletChapter("solarPanel", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFurnaceSolar.PRODUCE), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText());
-        new BookletChapter("heatCollector", entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityHeatCollector.ENERGY_PRODUCE).addTextReplacement("<min>", TileEntityHeatCollector.BLOCKS_NEEDED), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText());
+        new BookletChapter("heatCollector", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityHeatCollector.ENERGY_PRODUCE).addTextReplacement("<min>", TileEntityHeatCollector.BLOCKS_NEEDED), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText());
-        new BookletChapter("canola", entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addTextReplacement("<pressRF>", TileEntityCanolaPress.ENERGY_USE).addTextReplacement("<canola>", TileEntityCanolaPress.PRODUCE).addTextReplacement("<rf>", TileEntityOilGenerator.ENERGY_PRODUCED), new PageCrafting(2, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(3, BlockCrafting.recipeFermentingBarrel).setNoText(), new PageCrafting(4, BlockCrafting.recipeOilGen).setNoText());
+        new BookletChapter("canola", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addTextReplacement("<pressRF>", TileEntityCanolaPress.ENERGY_USE).addTextReplacement("<canola>", TileEntityCanolaPress.PRODUCE).addTextReplacement("<rf>", TileEntityOilGenerator.ENERGY_PRODUCED), new PageCrafting(2, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(3, BlockCrafting.recipeFermentingBarrel).setNoText(), new PageCrafting(4, BlockCrafting.recipeOilGen).setNoText());
-        new BookletChapter("leafGen", entryGeneratingRF, new ItemStack(InitBlocks.blockLeafGenerator), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityLeafGenerator.ENERGY_PRODUCED).addTextReplacement("<range>", TileEntityLeafGenerator.RANGE), new PageCrafting(2, BlockCrafting.recipeLeafGen)).setImportant();
+        new BookletChapter("leafGen", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockLeafGenerator), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityLeafGenerator.ENERGY_PRODUCED).addTextReplacement("<range>", TileEntityLeafGenerator.RANGE), new PageCrafting(2, BlockCrafting.recipeLeafGen)).setImportant();
 
         //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("wings", ActuallyAdditionsAPI.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.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("foods", ActuallyAdditionsAPI.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();
+        new BookletChapter("leafBlower", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemLeafBlowerAdvanced), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeLeafBlower).setNoText(), new PageCrafting(3, ItemCrafting.recipeLeafBlowerAdvanced).setNoText()).setImportant();
         ArrayList<BookletPage> aiotPages = new ArrayList<BookletPage>();
         aiotPages.add(new PageTextOnly(aiotPages.size()+1));
         for(IRecipe recipe : ToolCrafting.recipesPaxels){
             aiotPages.add(new PageCrafting(aiotPages.size()+1, recipe).setNoText().setPageStacksWildcard());
         }
-        new BookletChapter("aiots", entryItemsNonRF, new ItemStack(InitItems.emeraldPaxel), aiotPages.toArray(new BookletPage[aiotPages.size()])).setImportant();
+        new BookletChapter("aiots", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.emeraldPaxel), aiotPages.toArray(new BookletPage[aiotPages.size()])).setImportant();
 
-        new BookletChapter("jams", entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3));
+        new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3));
 
         ArrayList<BookletPage> potionRingPages = new ArrayList<BookletPage>();
         potionRingPages.add(new PageTextOnly(potionRingPages.size()+1));
         for(IRecipe recipe : ItemCrafting.recipesPotionRings){
             potionRingPages.add(new PageCrafting(potionRingPages.size()+1, recipe).setNoText());
         }
-        new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()]));
+        new BookletChapter("potionRings", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()]));
 
         //RF Using Items
-        new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill, 1, TheColoredLampColors.LIGHT_BLUE.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipesDrillColoring), new PageCrafting(4, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(13, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
+        new BookletChapter("drill", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemDrill, 1, TheColoredLampColors.LIGHT_BLUE.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipesDrillColoring), new PageCrafting(4, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(13, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
-        new BookletChapter("staff", entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant();
+        new BookletChapter("staff", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant();
-        new BookletChapter("magnetRing", entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing));
+        new BookletChapter("magnetRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing));
-        new BookletChapter("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));
+        new BookletChapter("growthRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));
-        new BookletChapter("waterRemovalRing", entryItemsRF, new ItemStack(InitItems.itemWaterRemovalRing), new PageCrafting(1, ItemCrafting.recipeWaterRing));
+        new BookletChapter("waterRemovalRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemWaterRemovalRing), new PageCrafting(1, ItemCrafting.recipeWaterRing));
-        new BookletChapter("batteries", entryItemsRF, new ItemStack(InitItems.itemBatteryTriple), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeBattery).setNoText(), new PageCrafting(3, ItemCrafting.recipeBatteryDouble).setNoText(), new PageCrafting(4, ItemCrafting.recipeBatteryTriple).setNoText(), new PageCrafting(5, ItemCrafting.recipeBatteryQuadruple).setNoText(), new PageCrafting(6, ItemCrafting.recipeBatteryQuintuple).setNoText());
+        new BookletChapter("batteries", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemBatteryTriple), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeBattery).setNoText(), new PageCrafting(3, ItemCrafting.recipeBatteryDouble).setNoText(), new PageCrafting(4, ItemCrafting.recipeBatteryTriple).setNoText(), new PageCrafting(5, ItemCrafting.recipeBatteryQuadruple).setNoText(), new PageCrafting(6, ItemCrafting.recipeBatteryQuintuple).setNoText());
     }
 
     private static void countWords(){
-        for(BookletEntry entry : entries){
+        for(IBookletEntry entry : ActuallyAdditionsAPI.bookletEntries){
-            for(BookletChapter chapter : entry.chapters){
+            for(IBookletChapter chapter : entry.getChapters()){
-                for(BookletPage page : chapter.pages){
+                for(BookletPage page : chapter.getPages()){
                     if(page.getText() != null){
                         wordCount += page.getText().split(" ").length;
                         charCount += page.getText().length();

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java

@@ -10,8 +10,8 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
 
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
@@ -73,7 +73,7 @@ public class BookmarkButton extends GuiButton{
 
             if(this.assignedEntry.entry != null){
                 GL11.glPushMatrix();
-                AssetUtil.renderStackToGui(this.assignedEntry.chapter != null && this.assignedEntry.chapter.displayStack != null ? this.assignedEntry.chapter.displayStack : new ItemStack(InitItems.itemBooklet), this.xPosition+2, this.yPosition+1, 0.725F);
+                AssetUtil.renderStackToGui(this.assignedEntry.chapter != null && this.assignedEntry.chapter.getDisplayItemStack() != null ? this.assignedEntry.chapter.getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), this.xPosition+2, this.yPosition+1, 0.725F);
                 GL11.glPopMatrix();
             }
         }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java

@@ -10,8 +10,8 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
 
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11;
 
 public class IndexButton extends GuiButton{
 
-    public BookletChapter chap;
+    public IBookletChapter chap;
     private GuiBooklet gui;
 
     public IndexButton(int id, int x, int y, int width, int height, String text, GuiBooklet gui){
@@ -40,9 +40,9 @@ public class IndexButton extends GuiButton{
 
             int textOffsetX = 0;
             if(this.chap != null){
-                if(this.chap.displayStack != null){
+                if(this.chap.getDisplayItemStack() != null){
                     GL11.glPushMatrix();
-                    AssetUtil.renderStackToGui(this.chap.displayStack, this.xPosition-4, this.yPosition, 0.725F);
+                    AssetUtil.renderStackToGui(this.chap.getDisplayItemStack(), this.xPosition-4, this.yPosition, 0.725F);
                     GL11.glPopMatrix();
                     textOffsetX = 10;
                 }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java

@@ -10,28 +10,29 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
 
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-public class BookletChapter{
+public class BookletChapter implements IBookletChapter{
 
     public final BookletPage[] pages;
-    public final BookletEntry entry;
+    public final IBookletEntry entry;
     public final ItemStack displayStack;
     private final String unlocalizedName;
     public EnumChatFormatting color;
 
-    public BookletChapter(String unlocalizedName, BookletEntry entry, ItemStack displayStack, BookletPage... pages){
+    public BookletChapter(String unlocalizedName, IBookletEntry entry, ItemStack displayStack, BookletPage... pages){
         this.pages = pages.clone();
 
         this.unlocalizedName = unlocalizedName;
         entry.addChapter(this);
-        InitBooklet.allAndSearch.addChapter(this);
+        ActuallyAdditionsAPI.allAndSearch.addChapter(this);
         this.entry = entry;
         this.displayStack = displayStack;
 
@@ -42,16 +43,34 @@ public class BookletChapter{
         this.color = EnumChatFormatting.RESET;
     }
 
+    @Override
+    public BookletPage[] getPages(){
+        return this.pages;
+    }
+
+    @Override
     public String getUnlocalizedName(){
         return this.unlocalizedName;
     }
 
-    public String getNameWithColor(){
+    @Override
+    public String getLocalizedName(){
+        return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.unlocalizedName+".name");
+    }
+
+    @Override
+    public String getLocalizedNameWithFormatting(){
         return this.color+this.getLocalizedName();
     }
 
-    public String getLocalizedName(){
+    @Override
-        return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.unlocalizedName+".name");
+    public IBookletEntry getEntry(){
+        return this.entry;
+    }
+
+    @Override
+    public ItemStack getDisplayItemStack(){
+        return this.displayStack;
     }
 
     public BookletChapter setImportant(){

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java

@@ -11,9 +11,10 @@
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient;
-import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPageAA;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.booklet.page.PageCoffeeRecipe;
 import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
 import net.minecraft.item.ItemStack;
@@ -23,7 +24,7 @@ import java.util.Arrays;
 
 public class BookletChapterCoffee extends BookletChapter{
 
-    public BookletChapterCoffee(String unlocalizedName, BookletEntry entry, ItemStack displayStack, BookletPage... pages){
+    public BookletChapterCoffee(String unlocalizedName, IBookletEntry entry, ItemStack displayStack, BookletPage... pages){
         super(unlocalizedName, entry, displayStack, getPages(pages));
     }
 
@@ -33,7 +34,7 @@ public class BookletChapterCoffee extends BookletChapter{
         allPages.addAll(Arrays.asList(pages));
 
         for(CoffeeIngredient ingredient : ActuallyAdditionsAPI.coffeeMachineIngredients){
-            BookletPage page = new PageCoffeeRecipe(allPages.size()+1, ingredient);
+            BookletPageAA page = new PageCoffeeRecipe(allPages.size()+1, ingredient);
             if(!(ingredient instanceof ItemCoffee.MilkIngredient)){
                 page.setNoText();
             }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java

@@ -10,9 +10,9 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
 
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
-import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.booklet.page.PageCrusherRecipe;
 import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting;
 import net.minecraft.item.ItemStack;
@@ -22,7 +22,7 @@ import java.util.Arrays;
 
 public class BookletChapterCrusher extends BookletChapter{
 
-    public BookletChapterCrusher(String unlocalizedName, BookletEntry entry, ItemStack displayStack, BookletPage... pages){
+    public BookletChapterCrusher(String unlocalizedName, IBookletEntry entry, ItemStack displayStack, BookletPage... pages){
         super(unlocalizedName, entry, displayStack, getPages(pages));
     }
 

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java

@@ -10,39 +10,60 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.entry;
 
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.ArrayList;
+import java.util.List;
 
-public class BookletEntry{
+public class BookletEntry implements IBookletEntry{
 
     private final String unlocalizedName;
-    public ArrayList<BookletChapter> chapters = new ArrayList<BookletChapter>();
+    public List<IBookletChapter> chapters = new ArrayList<IBookletChapter>();
     private EnumChatFormatting color;
 
     public BookletEntry(String unlocalizedName){
         this.unlocalizedName = unlocalizedName;
-        InitBooklet.entries.add(this);
+        ActuallyAdditionsAPI.addBookletEntry(this);
 
         this.color = EnumChatFormatting.RESET;
     }
 
+    @Override
     public String getUnlocalizedName(){
         return this.unlocalizedName;
     }
 
+    @Override
+    public List<IBookletChapter> getChapters(){
+        return this.chapters;
+    }
+
     public void addChapter(BookletChapter chapter){
         this.chapters.add(chapter);
     }
 
-    public String getNameWithColor(){
+    @Override
+    public String getLocalizedNameWithFormatting(){
         return this.color+this.getLocalizedName();
     }
 
+    @Override
+    public void setChapters(List<IBookletChapter> chapters){
+        this.chapters = chapters;
+    }
+
+    @Override
+    public void addChapter(IBookletChapter chapter){
+        this.chapters.add(chapter);
+    }
+
+    @Override
     public String getLocalizedName(){
         return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".indexEntry."+this.unlocalizedName+".name");
     }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java

@@ -10,13 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.entry;
 
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
 import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class BookletEntryAllSearch extends BookletEntry{
 
-    public ArrayList<BookletChapter> allChapters = new ArrayList<BookletChapter>();
+    public ArrayList<IBookletChapter> allChapters = new ArrayList<IBookletChapter>();
 
     public BookletEntryAllSearch(String unlocalizedName){
         super(unlocalizedName);
@@ -26,6 +28,11 @@ public class BookletEntryAllSearch extends BookletEntry{
     @Override
     public void addChapter(BookletChapter chapter){
         this.allChapters.add(chapter);
-        this.chapters = (ArrayList<BookletChapter>)this.allChapters.clone();
+        this.chapters = (ArrayList<IBookletChapter>)this.allChapters.clone();
+    }
+
+    @Override
+    public void setChapters(List<IBookletChapter> chapters){
+        this.allChapters = (ArrayList<IBookletChapter>)chapters;
     }
 }

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

@@ -1,163 +0,0 @@
-/*
- * This file ("BookletPage.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2016 Ellpeck
- */
-
-package de.ellpeck.actuallyadditions.mod.booklet.page;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class BookletPage{
-
-    public boolean arePageStacksWildcard;
-    protected int localizationKey;
-    protected BookletChapter chapter;
-    private HashMap<String, String> textReplacements = new HashMap<String, String>();
-    private boolean hasNoText;
-
-    public BookletPage(int localizationKey){
-        this.localizationKey = localizationKey;
-    }
-
-    public void addToPagesWithItemStackData(){
-        if(!InitBooklet.pagesWithItemStackData.contains(this)){
-            ItemStack[] stacks = this.getItemStacksForPage();
-            if(stacks != null && stacks.length > 0){
-                //Ensure that there is at least one ItemStack
-                for(ItemStack stack : stacks){
-                    if(stack != null){
-                        InitBooklet.pagesWithItemStackData.add(this);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    public ItemStack[] getItemStacksForPage(){
-        return null;
-    }
-
-    public BookletPage setNoText(){
-        this.hasNoText = true;
-        return this;
-    }
-
-    public int getID(){
-        return Util.arrayContains(this.chapter.pages, this)+1;
-    }
-
-    public final String getText(){
-        if(this.hasNoText){
-            return null;
-        }
-
-        String base = StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.localizationKey);
-        base = base.replaceAll("<imp>", EnumChatFormatting.DARK_GREEN+"");
-        base = base.replaceAll("<item>", EnumChatFormatting.BLUE+"");
-        base = base.replaceAll("<r>", EnumChatFormatting.BLACK+"");
-        base = base.replaceAll("<n>", "\n");
-        base = base.replaceAll("<i>", EnumChatFormatting.ITALIC+"");
-        base = base.replaceAll("<tifisgrin>", EnumChatFormatting.DARK_RED+""+EnumChatFormatting.UNDERLINE); //This is fucking important so go read it now
-
-        for(Object o : this.textReplacements.entrySet()){
-            Map.Entry e = (Map.Entry)o;
-            base = base.replaceAll((String)e.getKey(), (String)e.getValue());
-        }
-        return base;
-    }
-
-    public BookletPage addTextReplacement(String text, int replacement){
-        return this.addTextReplacement(text, Integer.toString(replacement));
-    }
-
-    public BookletPage addTextReplacement(String text, String replacement){
-        this.textReplacements.put(text, replacement);
-        return this;
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
-
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
-
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void updateScreen(int ticksElapsed){
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @SideOnly(Side.CLIENT)
-    protected void renderTooltipAndTransfer(GuiBooklet gui, ItemStack stack, int x, int y, boolean checkAndTransfer, boolean mousePressed){
-        boolean flagBefore = gui.mc.fontRenderer.getUnicodeFlag();
-        gui.mc.fontRenderer.setUnicodeFlag(false);
-
-        List list = stack.getTooltip(gui.mc.thePlayer, gui.mc.gameSettings.advancedItemTooltips);
-
-        for(int k = 0; k < list.size(); ++k){
-            if(k == 0){
-                list.set(k, stack.getRarity().rarityColor+(String)list.get(k));
-            }
-            else{
-                list.set(k, EnumChatFormatting.GRAY+(String)list.get(k));
-            }
-        }
-
-        if(checkAndTransfer){
-            BookletPage page = BookletUtils.getFirstPageForStack(stack);
-            if(page != null && page != this){
-                list.add(EnumChatFormatting.GOLD+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".clickToSeeRecipe"));
-
-                if(mousePressed){
-                    BookletUtils.openIndexEntry(gui, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
-                    BookletUtils.openChapter(gui, page.getChapter(), page);
-                    Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
-                }
-            }
-        }
-
-        gui.drawHoveringText(list, x, y);
-
-        gui.mc.fontRenderer.setUnicodeFlag(flagBefore);
-    }
-
-    public BookletChapter getChapter(){
-        return this.chapter;
-    }
-
-    public void setChapter(BookletChapter chapter){
-        this.chapter = chapter;
-    }
-
-    public BookletPage setPageStacksWildcard(){
-        this.arePageStacksWildcard = true;
-        return this;
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java

@@ -0,0 +1,114 @@
+/*
+ * This file ("BookletPage.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.mod.booklet.page;
+
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BookletPageAA extends BookletPage{
+
+    protected int localizationKey;
+    private HashMap<String, String> textReplacements = new HashMap<String, String>();
+    private boolean hasNoText;
+
+    public BookletPageAA(int localizationKey){
+        this.localizationKey = localizationKey;
+    }
+
+    @Override
+    public ItemStack[] getItemStacksForPage(){
+        return null;
+    }
+
+    @Override
+    public String getClickToSeeRecipeString(){
+        return EnumChatFormatting.GOLD+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".clickToSeeRecipe");
+    }
+
+    @Override
+    public int getID(){
+        return Util.arrayContains(this.chapter.getPages(), this)+1;
+    }
+
+    public BookletPage setNoText(){
+        this.hasNoText = true;
+        return this;
+    }
+
+    @Override
+    public final String getText(){
+        if(this.hasNoText){
+            return null;
+        }
+
+        String base = StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.localizationKey);
+        base = base.replaceAll("<imp>", EnumChatFormatting.DARK_GREEN+"");
+        base = base.replaceAll("<item>", EnumChatFormatting.BLUE+"");
+        base = base.replaceAll("<r>", EnumChatFormatting.BLACK+"");
+        base = base.replaceAll("<n>", "\n");
+        base = base.replaceAll("<i>", EnumChatFormatting.ITALIC+"");
+        base = base.replaceAll("<tifisgrin>", EnumChatFormatting.DARK_RED+""+EnumChatFormatting.UNDERLINE); //This is fucking important so go read it now
+
+        for(Object o : this.textReplacements.entrySet()){
+            Map.Entry e = (Map.Entry)o;
+            base = base.replaceAll((String)e.getKey(), (String)e.getValue());
+        }
+        return base;
+    }
+
+    @Override
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+
+    }
+
+    @Override
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+
+    }
+
+    @Override
+    public void updateScreen(int ticksElapsed){
+
+    }
+
+    public BookletPageAA addTextReplacement(String text, int replacement){
+        return this.addTextReplacement(text, Integer.toString(replacement));
+    }
+
+    public BookletPageAA addTextReplacement(String text, String replacement){
+        this.textReplacements.put(text, replacement);
+        return this;
+    }
+
+    public void addToPagesWithItemStackData(){
+        if(!ActuallyAdditionsAPI.bookletPagesWithItemStackData.contains(this)){
+            ItemStack[] stacks = this.getItemStacksForPage();
+            if(stacks != null && stacks.length > 0){
+                //Ensure that there is at least one ItemStack
+                for(ItemStack stack : stacks){
+                    if(stack != null){
+                        ActuallyAdditionsAPI.addPageWithItemStackData(this);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing;
 import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
@@ -21,9 +22,10 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 
-public class PageCoffeeRecipe extends BookletPage{
+public class PageCoffeeRecipe extends BookletPageAA{
 
     public CoffeeIngredient ingredient;
 
@@ -34,25 +36,25 @@ public class PageCoffeeRecipe extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
-        gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
+        Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
-        gui.drawTexturedModalRect(gui.guiLeft+19, gui.guiTop+20, 146, 94, 99, 60);
+        gui.drawTexturedModalRect(gui.getGuiLeft()+19, gui.getGuiTop()+20, 146, 94, 99, 60);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         String strg = "Coffee Machine Recipe";
-        gui.mc.fontRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.mc.fontRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+        Minecraft.getMinecraft().fontRenderer.drawString(strg, gui.getGuiLeft()+gui.getXSize()/2-Minecraft.getMinecraft().fontRenderer.getStringWidth(strg)/2, gui.getGuiTop()+10, 0);
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+100, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+100, 115, 0, false);
         }
 
         if(this.ingredient.maxAmplifier > 0){
-            gui.mc.fontRenderer.drawString("Maximum Amplifier: "+this.ingredient.maxAmplifier, gui.guiLeft+19+5, gui.guiTop+20+60, 0);
+            Minecraft.getMinecraft().fontRenderer.drawString("Maximum Amplifier: "+this.ingredient.maxAmplifier, gui.getGuiLeft()+19+5, gui.getGuiTop()+20+60, 0);
         }
 
         for(int i = 0; i < 2; i++){
@@ -92,14 +94,14 @@ public class PageCoffeeRecipe extends BookletPage{
 
                     boolean tooltip = i == 1;
 
-                    int xShow = gui.guiLeft+19+coordsOffsetX;
+                    int xShow = gui.getGuiLeft()+19+coordsOffsetX;
-                    int yShow = gui.guiTop+20+coordsOffsetY;
+                    int yShow = gui.getGuiTop()+20+coordsOffsetY;
                     if(!tooltip){
                         AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F);
                     }
                     else{
                         if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
-                            this.renderTooltipAndTransfer(gui, stack, mouseX, mouseY, j != 2, mousePressed);
+                            gui.renderTooltipAndTransferButton(this, stack, mouseX, mouseY, j != 2, mousePressed);
                         }
                     }
                 }

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

@@ -13,12 +13,14 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapedRecipes;
@@ -30,7 +32,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import java.util.ArrayList;
 
 
-public class PageCrafting extends BookletPage{
+public class PageCrafting extends BookletPageAA{
 
     private final IRecipe[] recipes;
     private int recipePos;
@@ -71,30 +73,30 @@ public class PageCrafting extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         if(this.recipes[this.recipePos] != null){
-            gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
-            gui.drawTexturedModalRect(gui.guiLeft+27, gui.guiTop+20, 146, 20, 99, 60);
+            gui.drawTexturedModalRect(gui.getGuiLeft()+27, gui.getGuiTop()+20, 146, 20, 99, 60);
         }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         IRecipe recipe = this.recipes[this.recipePos];
 
         if(recipe == null){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.getGuiLeft()+14, gui.getGuiTop()+15, 115, 0, false);
         }
         else{
             String strg = StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+"."+(recipe instanceof ShapedRecipes ? "shapedRecipe" : (recipe instanceof ShapelessRecipes ? "shapelessRecipe" : (recipe instanceof ShapelessOreRecipe ? "shapelessOreRecipe" : "shapedOreRecipe"))));
-            gui.mc.fontRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.mc.fontRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+            Minecraft.getMinecraft().fontRenderer.drawString(strg, gui.getGuiLeft()+gui.getXSize()/2-Minecraft.getMinecraft().fontRenderer.getStringWidth(strg)/2, gui.getGuiTop()+10, 0);
         }
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+90, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+90, 115, 0, false);
         }
 
         if(recipe != null){
@@ -134,8 +136,8 @@ public class PageCrafting extends BookletPage{
                 }
             }
 
-            int xShowOutput = gui.guiLeft+27+82;
+            int xShowOutput = gui.getGuiLeft()+27+82;
-            int yShowOutput = gui.guiTop+20+22;
+            int yShowOutput = gui.getGuiTop()+20+22;
             AssetUtil.renderStackToGui(recipe.getRecipeOutput(), xShowOutput, yShowOutput, 1.0F);
             for(int i = 0; i < 2; i++){
                 boolean tooltip = i == 1;
@@ -147,14 +149,14 @@ public class PageCrafting extends BookletPage{
                             if(stack.getItemDamage() == Util.WILDCARD){
                                 stack.setItemDamage(0);
                             }
-                            int xShow = gui.guiLeft+27+4+x*18;
+                            int xShow = gui.getGuiLeft()+27+4+x*18;
-                            int yShow = gui.guiTop+20+4+y*18;
+                            int yShow = gui.getGuiTop()+20+4+y*18;
                             if(!tooltip){
                                 AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F);
                             }
                             else{
                                 if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
-                                    this.renderTooltipAndTransfer(gui, stack, mouseX, mouseY, true, mousePressed);
+                                    gui.renderTooltipAndTransferButton(this, stack, mouseX, mouseY, true, mousePressed);
                                 }
                             }
                         }
@@ -162,7 +164,7 @@ public class PageCrafting extends BookletPage{
                 }
             }
             if(mouseX >= xShowOutput && mouseX <= xShowOutput+16 && mouseY >= yShowOutput && mouseY <= yShowOutput+16){
-                this.renderTooltipAndTransfer(gui, recipe.getRecipeOutput(), mouseX, mouseY, false, mousePressed);
+                gui.renderTooltipAndTransferButton(this, recipe.getRecipeOutput(), mouseX, mouseY, false, mousePressed);
             }
         }
     }

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

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
@@ -19,13 +20,14 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.List;
 
 
-public class PageCrusherRecipe extends BookletPage{
+public class PageCrusherRecipe extends BookletPageAA{
 
     public CrusherRecipe recipe;
 
@@ -44,33 +46,33 @@ public class PageCrusherRecipe extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         if(recipe != null){
-            gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
-            gui.drawTexturedModalRect(gui.guiLeft+37, gui.guiTop+20, 60, 180, 60, 60);
+            gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 60, 180, 60, 60);
         }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         if(recipe == null){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.getGuiLeft()+14, gui.getGuiTop()+15, 115, 0, false);
         }
         else{
             String strg = "Crusher Recipe";
-            gui.mc.fontRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.mc.fontRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+            Minecraft.getMinecraft().fontRenderer.drawString(strg, gui.getGuiLeft()+gui.getXSize()/2-Minecraft.getMinecraft().fontRenderer.getStringWidth(strg)/2, gui.getGuiTop()+10, 0);
         }
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+100, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+100, 115, 0, false);
         }
 
         if(recipe != null){
             if(recipe.outputTwoChance > 0){
-                gui.mc.fontRenderer.drawString(recipe.outputTwoChance+"%", gui.guiLeft+37+62, gui.guiTop+20+33, 0);
+                Minecraft.getMinecraft().fontRenderer.drawString(recipe.outputTwoChance+"%", gui.getGuiLeft()+37+62, gui.getGuiTop()+20+33, 0);
             }
 
             if(recipe.getRecipeOutputOnes() != null){
@@ -97,14 +99,14 @@ public class PageCrusherRecipe extends BookletPage{
 
                             boolean tooltip = i == 1;
 
-                            int xShow = gui.guiLeft+37+(j == 0 ? 1 : (j == 1 ? 43 : (j == 2 ? 43 : 0)));
+                            int xShow = gui.getGuiLeft()+37+(j == 0 ? 1 : (j == 1 ? 43 : (j == 2 ? 43 : 0)));
-                            int yShow = gui.guiTop+20+(j == 0 ? 21 : (j == 1 ? 11 : (j == 2 ? 29 : 0)));
+                            int yShow = gui.getGuiTop()+20+(j == 0 ? 21 : (j == 1 ? 11 : (j == 2 ? 29 : 0)));
                             if(!tooltip){
                                 AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F);
                             }
                             else{
                                 if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
-                                    this.renderTooltipAndTransfer(gui, stack, mouseX, mouseY, j == 0, mousePressed);
+                                    gui.renderTooltipAndTransferButton(this, stack, mouseX, mouseY, j == 0, mousePressed);
                                 }
                             }
                         }

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

@@ -12,19 +12,21 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.Map;
 
-public class PageFurnace extends BookletPage{
+public class PageFurnace extends BookletPageAA{
 
     private final ItemStack result;
     private final ItemStack input;
@@ -47,29 +49,29 @@ public class PageFurnace extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         if(this.input != null || this.getInputForOutput(this.result) != null){
-            gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
-            gui.drawTexturedModalRect(gui.guiLeft+37, gui.guiTop+20, 0, 180, 60, 60);
+            gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 0, 180, 60, 60);
         }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         ItemStack input = this.input != null ? this.input : this.getInputForOutput(this.result);
         if(input == null){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.getGuiLeft()+14, gui.getGuiTop()+15, 115, 0, false);
         }
         else{
             String strg = "Furnace Recipe";
-            gui.mc.fontRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.mc.fontRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+            Minecraft.getMinecraft().fontRenderer.drawString(strg, gui.getGuiLeft()+gui.getXSize()/2-Minecraft.getMinecraft().fontRenderer.getStringWidth(strg)/2, gui.getGuiTop()+10, 0);
         }
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+100, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+100, 115, 0, false);
         }
 
         if(input != null){
@@ -81,14 +83,14 @@ public class PageFurnace extends BookletPage{
                     }
                     boolean tooltip = i == 1;
 
-                    int xShow = gui.guiLeft+37+1+x*42;
+                    int xShow = gui.getGuiLeft()+37+1+x*42;
-                    int yShow = gui.guiTop+20+21;
+                    int yShow = gui.getGuiTop()+20+21;
                     if(!tooltip){
                         AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F);
                     }
                     else{
                         if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
-                            this.renderTooltipAndTransfer(gui, stack, mouseX, mouseY, x == 0, mousePressed);
+                            gui.renderTooltipAndTransferButton(this, stack, mouseX, mouseY, x == 0, mousePressed);
                         }
                     }
                 }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java

@@ -12,9 +12,10 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import net.minecraft.client.Minecraft;
 import net.minecraft.util.ResourceLocation;
 
 public class PagePicture extends PageTextOnly{
@@ -30,13 +31,13 @@ public class PagePicture extends PageTextOnly{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
-        gui.mc.getTextureManager().bindTexture(this.resLoc);
+        Minecraft.getMinecraft().getTextureManager().bindTexture(this.resLoc);
-        gui.drawTexturedModalRect(gui.guiLeft, gui.guiTop, 0, 0, gui.xSize, gui.ySize);
+        gui.drawTexturedModalRect(gui.getGuiLeft(), gui.getGuiTop(), 0, 0, gui.getXSize(), gui.getYSize());
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+textStartY, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+textStartY, 115, 0, false);
         }
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
@@ -20,13 +21,14 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class PageReconstructor extends BookletPage{
+public class PageReconstructor extends BookletPageAA{
 
     private LensNoneRecipe[] recipes;
     private int recipePos;
@@ -57,33 +59,33 @@ public class PageReconstructor extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         if(this.recipes[this.recipePos] != null){
-            gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
-            gui.drawTexturedModalRect(gui.guiLeft+37, gui.guiTop+20, 188, 154, 60, 60);
+            gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 188, 154, 60, 60);
         }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @SideOnly(Side.CLIENT)
-    public void render(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void render(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
         LensNoneRecipe recipe = this.recipes[this.recipePos];
         if(recipe == null){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.guiLeft+14, gui.guiTop+15, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, EnumChatFormatting.DARK_RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".recipeDisabled"), gui.getGuiLeft()+14, gui.getGuiTop()+15, 115, 0, false);
         }
         else{
             String strg = "Atomic Reconstructor";
-            gui.mc.fontRenderer.drawString(strg, gui.guiLeft+gui.xSize/2-gui.mc.fontRenderer.getStringWidth(strg)/2, gui.guiTop+10, 0);
+            Minecraft.getMinecraft().fontRenderer.drawString(strg, gui.getGuiLeft()+gui.getXSize()/2-Minecraft.getMinecraft().fontRenderer.getStringWidth(strg)/2, gui.getGuiTop()+10, 0);
         }
 
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+100, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+100, 115, 0, false);
         }
 
         if(recipe != null){
-            AssetUtil.renderStackToGui(new ItemStack(InitBlocks.blockAtomicReconstructor), gui.guiLeft+37+22, gui.guiTop+20+21, 1.0F);
+            AssetUtil.renderStackToGui(new ItemStack(InitBlocks.blockAtomicReconstructor), gui.getGuiLeft()+37+22, gui.getGuiTop()+20+21, 1.0F);
             for(int i = 0; i < 2; i++){
                 for(int x = 0; x < 2; x++){
                     List<ItemStack> stacks = x == 0 ? recipe.getInputs() : recipe.getOutputs();
@@ -95,14 +97,14 @@ public class PageReconstructor extends BookletPage{
                         }
                         boolean tooltip = i == 1;
 
-                        int xShow = gui.guiLeft+37+1+x*42;
+                        int xShow = gui.getGuiLeft()+37+1+x*42;
-                        int yShow = gui.guiTop+20+21;
+                        int yShow = gui.getGuiTop()+20+21;
                         if(!tooltip){
                             AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F);
                         }
                         else{
                             if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
-                                this.renderTooltipAndTransfer(gui, stack, mouseX, mouseY, x == 0, mousePressed);
+                                gui.renderTooltipAndTransferButton(this, stack, mouseX, mouseY, x == 0, mousePressed);
                             }
                         }
                     }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java

@@ -12,11 +12,12 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
+import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 
-public class PageTextOnly extends BookletPage{
+public class PageTextOnly extends BookletPageAA{
 
     private ItemStack stack;
 
@@ -37,10 +38,10 @@ public class PageTextOnly extends BookletPage{
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
+    public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
-        String text = gui.currentEntrySet.page.getText();
+        String text = gui.getCurrentEntrySet().page.getText();
         if(text != null && !text.isEmpty()){
-            StringUtil.drawSplitString(gui.mc.fontRenderer, text, gui.guiLeft+14, gui.guiTop+9, 115, 0, false);
+            StringUtil.drawSplitString(Minecraft.getMinecraft().fontRenderer, text, gui.getGuiLeft()+14, gui.getGuiTop()+9, 115, 0, false);
         }
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
@@ -70,7 +70,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
                 BookletPage page = BookletUtils.getFirstPageForStack(blockStack);
                 if(page != null){
                     if(world.isRemote){
-                        forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1);
+                        forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1);
                     }
                     this.onItemRightClick(stack, world, player);
                     return true;
@@ -118,7 +118,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
                             String strg2 = "Page "+page.getID();
                             String strg3 = "Right-Click to open...";
 
-                            AssetUtil.renderStackToGui(page.getChapter().displayStack != null ? page.getChapter().displayStack : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2-10, height+41, 1F);
+                            AssetUtil.renderStackToGui(page.getChapter().getDisplayItemStack() != null ? page.getChapter().getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2-10, height+41, 1F);
                             minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg1, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg1)/2, height+20, StringUtil.DECIMAL_COLOR_WHITE);
                             minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg2, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg2)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE);
                             minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.GOLD+strg3, resolution.getScaledWidth()/2-minecraft.fontRenderer.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java

@@ -11,7 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.items.lens;
 
 import de.ellpeck.actuallyadditions.api.Position;
-import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.util.Util;

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java

@@ -11,7 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.items.lens;
 
 import de.ellpeck.actuallyadditions.api.Position;
-import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.mod.misc.DamageSources;
 import net.minecraft.entity.EntityLivingBase;

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java

@@ -11,7 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.items.lens;
 
 import de.ellpeck.actuallyadditions.api.Position;
-import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 
 public class LensDetonation extends Lens{

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java

@@ -11,7 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.items.lens;
 
 import de.ellpeck.actuallyadditions.api.Position;
-import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
 import net.minecraft.block.Block;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java

@@ -14,10 +14,11 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
@@ -54,7 +55,7 @@ public class NEIBookletRecipe extends TemplateRecipeHandler implements INEIRecip
     @Override
     public void loadCraftingRecipes(String outputId, Object... results){
         if(outputId.equals(NAME) && getClass() == NEIBookletRecipe.class){
-            for(BookletPage page : InitBooklet.pagesWithItemStackData){
+            for(BookletPage page : ActuallyAdditionsAPI.bookletPagesWithItemStackData){
                 ItemStack[] stacks = page.getItemStacksForPage();
 
                 //So that you don't see things like Mashed Food more than once
@@ -112,8 +113,8 @@ public class NEIBookletRecipe extends TemplateRecipeHandler implements INEIRecip
             }
 
             int maxLines = 5;
-            BookletChapter chapter = stack.thePage.getChapter();
+            IBookletChapter chapter = stack.thePage.getChapter();
-            String aText = (chapter.pages[0] instanceof PagePicture && chapter.pages.length > 1 ? chapter.pages[1] : chapter.pages[0]).getText();
+            String aText = (chapter.getPages()[0] instanceof PagePicture && chapter.getPages().length > 1 ? chapter.getPages()[1] : chapter.getPages()[0]).getText();
             List text = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(aText != null ? aText : EnumChatFormatting.DARK_RED+StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".booklet.noText"), 165);
             for(int i = 0; i < Math.min(maxLines, text.size()); i++){
                 GuiDraw.drawString(text.get(i)+(i == maxLines-1 && text.size() > maxLines ? EnumChatFormatting.RESET+""+EnumChatFormatting.BLACK+"..." : ""), 0, 18+25+i*(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT+1), 0, false);

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java

@@ -16,11 +16,12 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing;
 import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoffeeMachine;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java

@@ -15,9 +15,10 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java

@@ -15,10 +15,11 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGrinder;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java

@@ -15,9 +15,10 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java

@@ -16,9 +16,10 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java

@@ -15,10 +15,11 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.lens.LensColor;
 import de.ellpeck.actuallyadditions.mod.util.*;

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java

@@ -13,11 +13,12 @@ package de.ellpeck.actuallyadditions.mod.nei;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.IRecipeHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
 import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.client.Minecraft;
@@ -70,7 +71,7 @@ public class NEIScreenEvents{
                 if(page != null){
                     GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen, false, true);
                     Minecraft.getMinecraft().displayGuiScreen(book);
-                    BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
+                    BookletUtils.openIndexEntry(book, page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
                     BookletUtils.openChapter(book, page.getChapter(), page);
                 }
             }

src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java

@@ -16,10 +16,11 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
+import de.ellpeck.actuallyadditions.api.booklet.INEIRecipeHandler;
 import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.client.gui.inventory.GuiContainer;

src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketBookletStandButton.java

@@ -13,8 +13,8 @@ package de.ellpeck.actuallyadditions.mod.network;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayer;
@@ -49,8 +49,8 @@ public class PacketBookletStandButton implements IMessage{
         this.worldID = world.provider.dimensionId;
         this.playerID = player.getEntityId();
 
-        this.entryID = set.entry == null ? -1 : InitBooklet.entries.indexOf(set.entry);
+        this.entryID = set.entry == null ? -1 : ActuallyAdditionsAPI.bookletEntries.indexOf(set.entry);
-        this.chapterID = set.entry == null || set.chapter == null ? -1 : set.entry.chapters.indexOf(set.chapter);
+        this.chapterID = set.entry == null || set.chapter == null ? -1 : set.entry.getChapters().indexOf(set.chapter);
         this.pageID = set.page == null ? -1 : set.page.getID();
         this.pageInIndex = set.pageInIndex;
     }
@@ -94,9 +94,9 @@ public class PacketBookletStandButton implements IMessage{
             if(tile instanceof TileEntityBookletStand){
                 if(Objects.equals(player.getCommandSenderName(), ((TileEntityBookletStand)tile).assignedPlayer)){
                     EntrySet theSet = ((TileEntityBookletStand)tile).assignedEntry;
-                    theSet.entry = message.entryID == -1 ? null : InitBooklet.entries.get(message.entryID);
+                    theSet.entry = message.entryID == -1 ? null : ActuallyAdditionsAPI.bookletEntries.get(message.entryID);
-                    theSet.chapter = message.chapterID == -1 || message.entryID == -1 || theSet.entry.chapters.size() <= message.chapterID ? null : theSet.entry.chapters.get(message.chapterID);
+                    theSet.chapter = message.chapterID == -1 || message.entryID == -1 || theSet.entry.getChapters().size() <= message.chapterID ? null : theSet.entry.getChapters().get(message.chapterID);
-                    theSet.page = message.chapterID == -1 || theSet.chapter == null || theSet.chapter.pages.length <= message.pageID-1 ? null : theSet.chapter.pages[message.pageID-1];
+                    theSet.page = message.chapterID == -1 || theSet.chapter == null || theSet.chapter.getPages().length <= message.pageID-1 ? null : theSet.chapter.getPages()[message.pageID-1];
                     theSet.pageInIndex = message.pageInIndex;
                     ((TileEntityBookletStand)tile).sendUpdate();
                 }

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java

@@ -16,7 +16,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.ellpeck.actuallyadditions.api.Position;
-import de.ellpeck.actuallyadditions.api.lens.IAtomicReconstructor;
+import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.ILensItem;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.api.tile.IEnergyDisplay;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBookletStand.java

@@ -10,7 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class TileEntityBookletStand extends TileEntityBase{

src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java

@@ -12,8 +12,8 @@ package de.ellpeck.actuallyadditions.mod.util.playerdata;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import de.ellpeck.actuallyadditions.api.internal.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;