Added just a butt ton of stuff, also thanks to pau101 for helping me with the Hand Pedestal animation :)

1 files changed, 53 insertions, 111 deletions

diff --git a/java/darkknight/jewelrycraft/container/GuiTabItems.java b/java/darkknight/jewelrycraft/container/GuiTabItems.java
index 5950218..03069b9 100644
--- a/java/darkknight/jewelrycraft/container/GuiTabItems.java
+++ b/java/darkknight/jewelrycraft/container/GuiTabItems.java
@@ -2,8 +2,6 @@ package darkknight.jewelrycraft.container;
 
 import java.awt.Desktop;
 import java.net.URL;
-import java.util.ArrayList;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -17,43 +15,43 @@ import darkknight.jewelrycraft.util.JewelrycraftUtil;
 public class GuiTabItems extends GuiTab
 {
     
+    /**
+     * @param id
+     */
     public GuiTabItems(int id)
     {
         super("Items", id);
     }
     
+    /**
+     * @return
+     */
+    @Override
     public ItemStack getIcon()
     {
         return new ItemStack(ItemList.thiefGloves);
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param page
+     */
     @Override
     public void drawBackground(GuiGuide gui, int x, int y, int page)
     {
         String text = "";
-        ArrayList<ItemStack> items = new ArrayList<ItemStack>();
-        int xPos = (page % 2 == 0) ? 107 : -35;
-        switch (page)
+        int xPos = page % 2 == 0 ? 107 : -35;
+        switch(page)
         {
             case 1:
-                text = "Shadow ingots are obtained by smelting shadow ore. They are used in a few recipes and an important key for making some jewellery work.";
-                items.add(new ItemStack(BlockList.shadowOre));
-                items.add(new ItemStack(ItemList.shadowIngot));
-                Page.addSmeltingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text, items, x, y);
+                text = "Shadow ingots are obtained by smelting shadow ore. They are used in a few recipes and an important key for making some jewelry work.";
+                Page.addSmeltingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text, x, y, new ItemStack(BlockList.shadowOre), new ItemStack(ItemList.shadowIngot));
                 break;
             case 2:
                 text = "These gloves give you the chance to steal the trades those pesky Testificates have to offer. To use these simply open their gui at least once, then Crouch and";
-                items.add(new ItemStack(ItemList.thiefGloves));
-                items.add(new ItemStack(ItemList.shadowIngot));
-                items.add(null);
-                items.add(new ItemStack(ItemList.shadowIngot));
-                items.add(new ItemStack(Blocks.wool, 1, 15));
-                items.add(new ItemStack(ItemList.shadowIngot));
-                items.add(new ItemStack(Blocks.wool, 1, 15));
-                items.add(new ItemStack(Blocks.wool, 1, 15));
-                items.add(new ItemStack(ItemList.shadowIngot));
-                items.add(new ItemStack(Blocks.wool, 1, 15));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.thiefGloves), new ItemStack(ItemList.shadowIngot), null, new ItemStack(ItemList.shadowIngot), new ItemStack(Blocks.wool, 1, 15), new ItemStack(ItemList.shadowIngot), new ItemStack(Blocks.wool, 1, 15), new ItemStack(Blocks.wool, 1, 15), new ItemStack(ItemList.shadowIngot), new ItemStack(Blocks.wool, 1, 15));
                 break;
             case 3:
                 text = "right click on the them to hopefully steal the trades. If you traded with him before, then you have a chance of getting the traded emeralds back as well. This has a maximum of 10 uses before it breaks.";
@@ -61,105 +59,43 @@ public class GuiTabItems extends GuiTab
                 break;
             case 4:
                 text = "In order to get the ingot back from the smelter you need a mold for it. However, this mold can't be used. It is too soft. It needs to be hardened in order for it to be used.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, 0));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, x, y, new ItemStack(ItemList.clayMolds, 1, 0), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball));
                 break;
             case 5:
                 text = "To create a ring you need a mold for it. However, this one is too soft to be used. It needs to be hardened in order for it to be used.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, 1));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.clayMolds, 1, 1), null, new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null);
                 break;
             case 6:
                 text = "To create a necklace you need a mold for it. However, this one can't be used. It is too soft. It needs to be hardened in order for it to be used.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, 2));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.clayMolds, 1, 2), new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null);
                 break;
             case 7:
                 text = "To create a bracelet you need a mold for it. However, this one can't be used. It is too soft. It needs to be hardened in order for it to be used.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, 3));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(new ItemStack(Items.clay_ball));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.clayMolds, 1, 3), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball), new ItemStack(Items.clay_ball));
                 break;
             case 8:
                 text = "To create a necklace you need a mold for it. However, this one can't be used. It is too soft. It needs to be hardened in order for it to be used.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, 4));
-                items.add(null);
-                items.add(null);
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(new ItemStack(Items.clay_ball));
-                items.add(null);
-                items.add(null);
-                items.add(null);
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.clayMolds, 1, 4), null, null, null, new ItemStack(Items.clay_ball), null, new ItemStack(Items.clay_ball), null, null, null);
                 break;
             case 9:
                 if (del == 0) values++;
                 del++;
                 if (del >= 300) del = 0;
                 if (values > 4) values = 0;
-                text = "By smelting a clay mold you get a harder version which can be used to create jewellery. Simply right click with this on a molder to attach it and you're ready to go.";
-                items.add(new ItemStack(ItemList.clayMolds, 1, values));
-                items.add(new ItemStack(ItemList.molds, 1, values));
-                Page.addSmeltingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text, items, x, y);
+                text = "By smelting a clay mold you get a harder version which can be used to create jewelry. Simply right click with this on a molder to attach it and you're ready to go.";
+                Page.addSmeltingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text, x, y, new ItemStack(ItemList.clayMolds, 1, values), new ItemStack(ItemList.molds, 1, values));
                 break;
             case 10:
-                text = "Crystals don't do much as of yet. They can be dyed in any color and used as gems to create a nice jewellery.";
-                items.add(new ItemStack(ItemList.crystal, 1, 15));
-                items.add(null);
-                items.add(new ItemStack(Blocks.glass));
-                items.add(null);
-                items.add(new ItemStack(Blocks.glass));
-                items.add(null);
-                items.add(new ItemStack(Blocks.glass));
-                items.add(null);
-                items.add(new ItemStack(Blocks.glass));
-                items.add(null);
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, items, x, y);
+                text = "Crystals don't do much as of yet. They can be dyed in any color and used as gems to create a nice jewelry.";
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), false, text, x, y, new ItemStack(ItemList.crystal, 1, 15), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null);
                 break;
             case 11:
                 if (del == 0) values++;
                 del++;
                 if (del >= 300) del = 0;
                 if (values >= 15) values = 0;
-                items.add(new ItemStack(ItemList.crystal, 1, values));
-                items.add(new ItemStack(Items.dye, 1, values));
-                items.add(new ItemStack(ItemList.crystal, 1, 15));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, items, x, y);
-                items.removeAll(items);
-                items.add(new ItemStack(ItemList.crystal, 1, 15));
-                items.add(new ItemStack(Items.dye, 1, 15));
-                items.add(new ItemStack(ItemList.crystal, 1, values));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop() + 60, true, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, x, y, new ItemStack(ItemList.crystal, 1, values), new ItemStack(Items.dye, 1, values), new ItemStack(ItemList.crystal, 1, 15));
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop() + 60, true, text, x, y, new ItemStack(ItemList.crystal, 1, 15), new ItemStack(Items.dye, 1, 15), new ItemStack(ItemList.crystal, 1, values));
                 break;
             case 12:
                 if (del == 0) values++;
@@ -167,10 +103,7 @@ public class GuiTabItems extends GuiTab
                 if (del >= 300) del = 0;
                 if (values > 4) values = 0;
                 text = "It's this exact guide. I don't even know why you're reading this. I added this recipe in case you lose the original. Even if this is more helpful than NEI, I do suggest";
-                items.add(new ItemStack(ItemList.guide));
-                items.add(new ItemStack(ItemList.molds, 1, values));
-                items.add(new ItemStack(Items.book));
-                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, items, x, y);
+                Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, x, y, new ItemStack(ItemList.guide), new ItemStack(ItemList.molds, 1, values), new ItemStack(Items.book));
                 break;
             case 13:
                 String link = "HERE";
@@ -183,11 +116,11 @@ public class GuiTabItems extends GuiTab
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 15:
-                ItemStack item = new ItemStack(ItemList.bucket); 
+                ItemStack item = new ItemStack(ItemList.bucket);
                 if (del == 0) values++;
                 del++;
                 if (del >= 300) del = 0;
-                if (values > JewelrycraftUtil.metal.size() - 1) values = 0;               
+                if (values > JewelrycraftUtil.metal.size() - 1) values = 0;
                 JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values).copy());
                 text = "These buckets contain molten metal. To obtain one simply Right Click a full Smelter to get a bucket. You can pour the metal, other than that it has no use. You can place the molten metal back in a Smelter by Right Clicking one with it.";
                 Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop() - 5, item, text, 40f, 0, 0, true, 45, 10);
@@ -197,28 +130,37 @@ public class GuiTabItems extends GuiTab
         }
     }
     
+    /**
+     * @return
+     */
+    @Override
     public int getMaxPages()
     {
         return 15;
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param button
+     */
+    @Override
     public void mouseClick(GuiGuide gui, int x, int y, int button)
     {
-        if (gui.page == 13 && x >= gui.getLeft() && x <= gui.getLeft() + 30 && y >= gui.getTop() + 104 && y <= gui.getTop() + 124)
-        {
-            try
-            {
-                Desktop.getDesktop().browse(new URL("http://www.minecraftforum.net/topic/2210959-164smp-ssp-jewelrycraft-version-12/").toURI());
-            }
-            catch (Exception e)
-            {
-            }
+        if (gui.page == 13 && x >= gui.getLeft() && x <= gui.getLeft() + 30 && y >= gui.getTop() + 104 && y <= gui.getTop() + 124) try{
+            Desktop.getDesktop().browse(new URL("http://www.minecraftforum.net/topic/2210959-164smp-ssp-jewelrycraft-version-12/").toURI());
         }
+        catch(Exception e){}
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param page
+     */
     @Override
     public void drawForeground(GuiGuide gui, int x, int y, int page)
-    {
-    }
-    
+    {}
 }