Manual description & Purple Drill (/cc xdjackiexd)

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

@@ -125,7 +125,7 @@ public class InitBooklet{
         new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()]));
 
         //RF Using Items
-        new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill, ItemCrafting.recipeDrillEmerald).setPageStacksWildcard(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
+        new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill, ItemCrafting.recipeDrillEmerald, ItemCrafting.recipeDrillPurple).setPageStacksWildcard(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
         new BookletChapter("staff", 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("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));

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

@@ -66,7 +66,6 @@ public class BookletPage{
         RenderHelper.enableGUIStandardItemLighting();
         GL11.glEnable(GL11.GL_DEPTH_TEST);
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        GL11.glPushMatrix();
         GL11.glTranslated(x, y, 0);
         GL11.glScalef(scale, scale, scale);
 
@@ -76,8 +75,10 @@ public class BookletPage{
         RenderItem.getInstance().renderItemOverlayIntoGUI(gui.mc.fontRenderer, gui.mc.getTextureManager(), stack, 0, 0);
         gui.mc.fontRenderer.setUnicodeFlag(flagBefore);
 
-        GL11.glPopMatrix();
+        //GL+MC+NEI suck
-        //RenderHelper.disableStandardItemLighting();
+        if(gui instanceof GuiBooklet){
+            RenderHelper.disableStandardItemLighting();
+        }
         GL11.glPopMatrix();
 
     }

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

@@ -43,6 +43,7 @@ public class ItemCrafting{
     public static ArrayList<IRecipe> recipesMashedFood = new ArrayList<IRecipe>();
     public static IRecipe recipeDrill;
     public static IRecipe recipeDrillEmerald;
+    public static IRecipe recipeDrillPurple;
     public static IRecipe recipeDrillSpeedI;
     public static IRecipe recipeDrillSpeedII;
     public static IRecipe recipeDrillSpeedIII;
@@ -152,6 +153,15 @@ public class ItemCrafting{
                     'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
                     'I', "blockCrystalWhite"));
             recipeDrillEmerald = Util.GetRecipes.lastIRecipe();
+
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill, 1, 2),
+                    "DFD", "CRC", "III",
+                    'F', "blockCrystalRed",
+                    'D', "crystalLightBlue",
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
+                    'I', "blockCrystalWhite"));
+            recipeDrillPurple = Util.GetRecipes.lastIRecipe();
         }
 
         //Drill Core

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

@@ -17,6 +17,7 @@ import ellpeck.actuallyadditions.achievement.TheAchievements;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
+import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -25,6 +26,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class ItemBooklet extends Item implements IActAddItemOrBlock{
 
     public ItemBooklet(){
@@ -53,6 +56,12 @@ public class ItemBooklet extends Item implements IActAddItemOrBlock{
         this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName());
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){
+        list.add(StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+"."+this.getName()+".desc"));
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(ItemStack stack, int pass){

src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java

@@ -53,6 +53,8 @@ public class ItemDrill extends ItemEnergy{
 
     @SideOnly(Side.CLIENT)
     private IIcon emeraldIcon;
+    @SideOnly(Side.CLIENT)
+    private IIcon purpleIcon;
 
     public ItemDrill(){
         super(500000, 5000);
@@ -62,7 +64,7 @@ public class ItemDrill extends ItemEnergy{
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIconFromDamage(int par1){
-        return par1 == 0 ? this.itemIcon : this.emeraldIcon;
+        return par1 == 0 ? this.itemIcon : (par1 == 2 ? this.purpleIcon : this.emeraldIcon);
     }
 
     @Override
@@ -76,11 +78,16 @@ public class ItemDrill extends ItemEnergy{
     public void getSubItems(Item item, CreativeTabs tabs, List list){
         super.getSubItems(item, tabs, list);
 
-        ItemStack stackFull = new ItemStack(this, 1, 1);
+        this.addDrillStack(list, 1);
+        this.addDrillStack(list, 2);
+    }
+
+    private void addDrillStack(List list, int meta){
+        ItemStack stackFull = new ItemStack(this, 1, meta);
         this.setEnergy(stackFull, this.getMaxEnergyStored(stackFull));
         list.add(stackFull);
 
-        ItemStack stackEmpty = new ItemStack(this, 1, 1);
+        ItemStack stackEmpty = new ItemStack(this, 1, meta);
         this.setEnergy(stackEmpty, 0);
         list.add(stackEmpty);
     }
@@ -226,6 +233,7 @@ public class ItemDrill extends ItemEnergy{
     public void registerIcons(IIconRegister iconReg){
         this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName());
         this.emeraldIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Emerald");
+        this.purpleIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Purple");
     }
 
     @Override

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

@@ -19,6 +19,7 @@ container.nei.actuallyadditions.coffee.special=Special Feature
 container.nei.actuallyadditions.coffee.maxAmount=Max Amount
 container.nei.actuallyadditions.coffee.shift=[SHIFT]!
 container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level
+container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor
 
 container.nei.actuallyadditions.booklet.name=ActAdd Manual
 container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> reads:
@@ -329,7 +330,7 @@ tooltip.actuallyadditions.blockPhantomRange.desc=Range
 tooltip.actuallyadditions.laser.stored.desc=<Laser stored!>
 tooltip.actuallyadditions.laser.connected.desc=<Laser connected!>
 tooltip.actuallyadditions.laser.cantConnect.desc=Can't connect: The relays are either part of the same network, the stored relay doesn't exist anymore or it is too far away!
-tooltip.actuallyadditions.blockBlackLotus.desc=No, not that one, Vaz!
+tooltip.actuallyadditions.itemBooklet.desc=Or "Manual", if you will
 
 #Gui Information
 info.actuallyadditions.gui.animals=Animals
@@ -551,7 +552,7 @@ booklet.actuallyadditions.chapter.potionRings.text.1=The <item>Potion Rings<r> h
 
 booklet.actuallyadditions.chapter.drill.name=Drills
 booklet.actuallyadditions.chapter.drill.text.1=The <item>Drill<r> works like a Pickaxe and a Shovel. It uses <imp>RF<r> per block. It can be <imp>charged in an Energizer<r> and upgraded by <imp>right-clicking<r> with it in your hand. There is <imp>a lot of upgrades<r>, but here is an explanation of some of them: <n>The <item>Mining Uprgades<r> enlarge the hole which the Drill digs. <n>The <item>Placement Upgrade<r>, after you right-click it in any slot of your hotbar, will make the Drill able to <imp>place a block from that slot by right-clicking<r>. You can also put a <item>Battery<r> inside the Drill to give it more charge.
-booklet.actuallyadditions.chapter.drill.text.2=The <item>Drill<r> can be crafted from either <imp>Diamond<r> or <imp>Emerald<r>. Its color will change accordingly.
+booklet.actuallyadditions.chapter.drill.text.2=The <item>Drill<r> can be crafted from either <imp>Diamond<r>, <imp>Emerald<r> or <imp>Redstone and Diamond<r>. Its color will change accordingly.
 
 booklet.actuallyadditions.chapter.staff.name=Staff
 booklet.actuallyadditions.chapter.staff.text.1=The <item>Teleport Staff<r>, when charged in an Energizer, can be <imp>right-clicked<r> to <imp>teleport you to where you're looking<r>. When you are looking at a block, it will teleport you there, however, when you aren't looking at a block, you can only be looking upwards up to <imp>5 degrees<r>, otherwise the teleport will fail.