Added some more Item descriptions to the manual

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

@@ -10,6 +10,8 @@
 
 package ellpeck.actuallyadditions.booklet;
 
+import ellpeck.actuallyadditions.blocks.InitBlocks;
+import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.booklet.page.IBookletPage;
 import ellpeck.actuallyadditions.booklet.page.PageCrafting;
 import ellpeck.actuallyadditions.booklet.page.PageFurnace;
@@ -19,6 +21,7 @@ import ellpeck.actuallyadditions.crafting.FoodCrafting;
 import ellpeck.actuallyadditions.crafting.ItemCrafting;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.TheFoods;
+import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
 import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
 import net.minecraft.item.ItemStack;
 
@@ -33,18 +36,25 @@ public class InitBooklet{
 
     public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF");
     public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF");
+    public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF");
     public static BookletIndexEntry entryMisc = new BookletIndexEntry("misc");
     public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch");
 
     static{
         chapterIntro = new BookletChapter("intro", entryMisc, new PageText(1), new PageText(2), new PageCrafting(3, ItemCrafting.recipeBook));
 
+        new BookletChapter("craftingIngs", entryMisc, new PageText(1), new PageCrafting(2, ItemCrafting.recipeCoil), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced), new PageCrafting(4, BlockCrafting.recipeCase), new PageCrafting(5, BlockCrafting.recipeStoneCase), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock), new PageCrafting(7, BlockCrafting.recipeEnderCase));
+        new BookletChapter("quartz", entryMisc, new PageText(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock), new PageCrafting(4, BlockCrafting.recipeQuartzPillar), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled));
+        new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud));
+        new BookletChapter("foods", entryMisc, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())));
+
         new BookletChapter("breaker", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector));
         new BookletChapter("phantomfaces", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomface), new PageCrafting(3, BlockCrafting.recipeLiquiface), new PageCrafting(4, BlockCrafting.recipeEnergyface), new PageCrafting(5, ItemCrafting.recipePhantomConnector), new PageCrafting(6, BlockCrafting.recipePhantomBooster));
         new BookletChapter("phantomBreaker", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomPlacer), new PageCrafting(3, BlockCrafting.recipePhantomBreaker));
         new BookletChapter("esd", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeESD), new PageCrafting(3, BlockCrafting.recipeAdvancedESD));
         new BookletChapter("xpSolidifier", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal())), new PageCrafting(2, BlockCrafting.recipeSolidifier));
         new BookletChapter("greenhouseGlass", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeGlass));
+        new BookletChapter("fishingNet", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFisher));
 
         new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine));
         new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher));
@@ -52,9 +62,11 @@ public class InitBooklet{
         new BookletChapter("miner", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeMiner), new PageCrafting(3, BlockCrafting.recipeCasing));
         new BookletChapter("lavaFactory", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeLavaFactory));
         new BookletChapter("energizer", entryFunctionalRF, new PageCrafting(1, BlockCrafting.recipeEnergizer), new PageCrafting(2, BlockCrafting.recipeEnervator));
+        new BookletChapter("repairer", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeRepairer));
 
-        new BookletChapter("craftingIngs", entryMisc, new PageText(1), new PageCrafting(2, ItemCrafting.recipeCoil), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced), new PageCrafting(4, BlockCrafting.recipeCase), new PageCrafting(5, BlockCrafting.recipeStoneCase), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock), new PageCrafting(7, BlockCrafting.recipeEnderCase));
+        new BookletChapter("coalGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeCoalGen));
-        new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud));
+        new BookletChapter("oilGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeOilGen));
-        new BookletChapter("foods", entryMisc, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())));
+        new BookletChapter("solarPanel", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSolar));
+        new BookletChapter("heatCollector", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeHeatCollector));
     }
 }

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

@@ -56,6 +56,15 @@ public class BlockCrafting{
     public static IRecipe recipeLavaFactory;
     public static IRecipe recipeEnergizer;
     public static IRecipe recipeEnervator;
+    public static IRecipe recipeSolar;
+    public static IRecipe recipeHeatCollector;
+    public static IRecipe recipeCoalGen;
+    public static IRecipe recipeOilGen;
+    public static IRecipe recipeRepairer;
+    public static IRecipe recipeFisher;
+    public static IRecipe recipeQuartzBlock;
+    public static IRecipe recipeQuartzChiseled;
+    public static IRecipe recipeQuartzPillar;
 
     public static void init(){
 
@@ -274,6 +283,7 @@ public class BlockCrafting{
                     'C', "cobblestone",
                     'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
+            recipeOilGen = Util.lastIRecipe();
         }
 
         //Coal Generator
@@ -283,6 +293,7 @@ public class BlockCrafting{
                     'C', "cobblestone",
                     'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'B', new ItemStack(Items.coal, 1, Util.WILDCARD)));
+            recipeCoalGen = Util.lastIRecipe();
         }
 
         //Enderpearl Block
@@ -307,6 +318,7 @@ public class BlockCrafting{
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
                 "QQ", "QQ",
                 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
+        recipeQuartzBlock = Util.lastIRecipe();
 
         //Fishing Net
         if(ConfigCrafting.FISHING_NET.isEnabled()){
@@ -314,6 +326,7 @@ public class BlockCrafting{
                     "SSS", "SDS", "SSS",
                     'D', "gemDiamond",
                     'S', Items.string));
+            recipeFisher = Util.lastIRecipe();
         }
 
         //Repairer
@@ -324,6 +337,7 @@ public class BlockCrafting{
                     'I', "ingotIron",
                     'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
+            recipeRepairer = Util.lastIRecipe();
         }
 
         //Solar Panel
@@ -335,6 +349,7 @@ public class BlockCrafting{
                     'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'B', new ItemStack(Blocks.iron_bars)));
+            recipeSolar = Util.lastIRecipe();
         }
 
         //Heat Collector
@@ -347,17 +362,20 @@ public class BlockCrafting{
                     'L', new ItemStack(Items.lava_bucket),
                     'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'B', new ItemStack(Blocks.iron_bars)));
+            recipeHeatCollector = Util.lastIRecipe();
         }
 
         //Quartz Pillar
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal()),
                 "Q", "Q",
                 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
+        recipeQuartzPillar = Util.lastIRecipe();
 
         //Chiseled Quartz
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 2, TheMiscBlocks.QUARTZ_CHISELED.ordinal()),
                 "Q", "Q",
                 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
+        recipeQuartzChiseled = Util.lastIRecipe();
 
         //Inputter
         if(ConfigCrafting.INPUTTER.isEnabled()){

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

@@ -368,6 +368,7 @@ booklet.actuallyadditions.indexEntry.misc.name=Miscellaneous
 booklet.actuallyadditions.indexEntry.functionalNoRF.name=Functional Blocks (No RF use)
 booklet.actuallyadditions.indexEntry.allAndSearch.name=All Items and Search
 booklet.actuallyadditions.indexEntry.functionalRF.name=Functional Blocks (Use RF)
+booklet.actuallyadditions.indexEntry.generatingRF.name=Generating Blocks (Make RF)
 
 booklet.actuallyadditions.recipeDisabled=The crafting recipe for this item is disabled in the Config File! If you're on a server, ask the server author to enable it in the config. If you're on a client, press the 'Open Config'-Button on the top right and enable the recipe!
 booklet.actuallyadditions.clickToSeeRecipe=Click to see more Information
@@ -446,3 +447,25 @@ booklet.actuallyadditions.chapter.intro.name=An Introduction to ActAdd
 booklet.actuallyadditions.chapter.intro.text.1=<i>This book, written years ago, found by the player, used to help understand the wonders of this world, finally opened, finally looked at, full of glory, full of grace, will be used to help the player along on their journey through <imp>Actually Additions<r><i>. <n>What is <imp>Actually Additions<r><i>, you may ask. <n><imp>Actually Additions<r><i> adds blocks, items, and features to make the player's experience easier, automate the world and properly do what you've always wanted to do.
 booklet.actuallyadditions.chapter.intro.text.2=<i>This book, written by <imp>Ellpeck<r><i>, the author of everything <imp>Actually Additions<r><i> contains, often called Ellopecko, Peck or Ellpack, is easy to navigate. It has an <imp>index page<r><i> at the front from which you can choose <imp>criteria pages<r><i>. These criteria pages contain a list of every item which is part of the criteria, and clicking on that will show <imp>precise information and the crafting recipe<r><i> of the item. The page you were on previously will stay open between sessions, too! <n><rs>Go check it out!
 booklet.actuallyadditions.chapter.intro.text.3=If you, for some reason, want to craft this book again, just take a <item>piece of paper<r> and a <item>canola seed<r> which you can find randomly generated and craft them together!
+
+booklet.actuallyadditions.chapter.quartz.name=Black Quartz!
+booklet.actuallyadditions.chapter.quartz.text.1=<item>Black Quartz<r> is a semi-common ore that can be found underground. It can be used to make decor blocks, but it is also necessary to make <imp>important crafting ingredients<r> (found in the Crafting Ingredients page!).
+booklet.actuallyadditions.chapter.quartz.text.2=<item>Black Quartz<r> as an item is used to make lots of important crafting materials in the mod. It can also be, if you can't find the ore, made with one <item>Nether Quartz<r> and one <item>Coal<r>. This recipe isn't that cheap though, so you're <imp>better off just going caving<r>.
+
+booklet.actuallyadditions.chapter.fishingNet.name=Fishing Net
+booklet.actuallyadditions.chapter.fishingNet.text.1=When placing the <item>Fishing Net<r> above a puddle, a lake, or a sea of water, it will start caching <item>Fish<r> and <imp>other stuff you get from fishing<r> on its own over quite a long period of time. To store the stuff it catches, because it doesn't have an inventory, you can just place any inventory on top of it that can collect items from the bottom, and it will automatically input them into there. If you don't do this, it'll just spew out all of the items which is lovely too.
+
+booklet.actuallyadditions.chapter.repairer.name=Item Repairer
+booklet.actuallyadditions.chapter.repairer.text.1=The <item>Item Repairer<r> is used to repair tools and armor which you could usually repair in an anvil. It uses <imp>RF<r>, a lot of it, actually, to repair the item <imp>without needing any added materials<r>!
+
+booklet.actuallyadditions.chapter.coalGen.name=Coal Generator
+booklet.actuallyadditions.chapter.coalGen.text.1=This is pretty self-explanatory: You fill the <item>Coal Generator<r> up with <item>Coal<r>, and it will generate RF.
+
+booklet.actuallyadditions.chapter.oilGen.name=Oil Generator
+booklet.actuallyadditions.chapter.oilGen.text.1=The <item>Oil Generator<r> uses buckets of <imp>Oil<r> to generate much bigger amounts of <imp>RF<r> than the <item>Coal Generator<r> does.
+
+booklet.actuallyadditions.chapter.solarPanel.name=Solar Panel
+booklet.actuallyadditions.chapter.solarPanel.text.1=The <item>Solar Panel<r> is a block that is used to generate <imp>RF<r> through the power of the sun! Just plop it down under a <imp>free sky<r> and watch it generate RF slowly just by sitting there. <n>It will obviously not work at night. <imp>Obviously.
+
+booklet.actuallyadditions.chapter.heatCollector.name=Heat Collector
+booklet.actuallyadditions.chapter.heatCollector.text.1=The <item>Heat Collector<r> is one of the more complicated methods of generating <imp>RF<r> in <imp>Actually Additions<r>. It needs to have a couple of lava blocks around it to generate <imp>RF<r> in the first place, but it will sometimes absorb some of the lava, having to have it replaced before it can continue working again. <n>This could be a good combination with the Lava Factory. Maybe.