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

1 files changed, 93 insertions, 139 deletions

diff --git a/java/darkknight/jewelrycraft/container/Page.java b/java/darkknight/jewelrycraft/container/Page.java
index 69de204..bca21a8 100644
--- a/java/darkknight/jewelrycraft/container/Page.java
+++ b/java/darkknight/jewelrycraft/container/Page.java
@@ -1,174 +1,106 @@
 package darkknight.jewelrycraft.container;
 
 import java.util.ArrayList;
-import java.util.List;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.opengl.GL11;
-
 import darkknight.jewelrycraft.client.GuiGuide;
 
 public class Page
 {
-    public static void addCraftingRecipeTextPage(GuiGuide gui, int x, int y, boolean isSmall, String text, ArrayList<ItemStack> items, int mouseX, int mouseY)
+    static ResourceLocation pageFlipped = new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip.png");
+    
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param isSmall
+     * @param text
+     * @param mouseX
+     * @param mouseY
+     * @param items
+     */
+    public static void addCraftingRecipeTextPage(GuiGuide gui, int x, int y, boolean isSmall, String text, int mouseX, int mouseY, ItemStack ... items)
     {
         y += 5;
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + items.get(0).getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(items.get(0).getDisplayName()) / 2) - 10, y - 2, 0);
+        gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + items[0].getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(items[0].getDisplayName()) / 2) - 10, y - 2, 0);
         GL11.glColor4f(1, 1, 1, 1);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip.png"));
+        Minecraft.getMinecraft().getTextureManager().bindTexture(pageFlipped);
         ArrayList<String> name = new ArrayList<String>();
-        if (isSmall)
-        {
+        if (isSmall){
             gui.drawTexturedModalRect(x, y + 10, 145, 54, 111, 46);
-            gui.renderItem(items.get(0), x + 89, y + 22 + 10, 30f);
-            // gui.drawRect(x, y + 10, x + 111, y + 46, 325325);
-            if (items.size() > 1 && items.get(1) != null)
-            {
-                gui.renderItem(items.get(1), x + 8, y + 16 + 10, 30f);
-                List<String> list = new ArrayList<String>();
-                list.add(text);
-                if (x - gui.getLeft() >= x + 8) gui.drawHoverString(list, x, y);
-                name.add(items.get(1).getDisplayName());
-                if (mouseX >= x && mouseX <= x + 16 && mouseY >= y + 10 && mouseY <= y + 26) gui.drawHoverString(name, x - 8, y + 10);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 2 && items.get(2) != null)
-            {
-                gui.renderItem(items.get(2), x + 30, y + 16 + 10, 30f);
-                name.add(items.get(2).getDisplayName());
-                if (mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 10 && mouseY <= y + 26) gui.drawHoverString(name, x + 15, y + 10);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 3 && items.get(3) != null)
-            {
-                gui.renderItem(items.get(3), x + 8, y + 40 + 10, 30f);
-                name.add(items.get(3).getDisplayName());
-                if (mouseX >= x && mouseX <= x + 16 && mouseY >= y + 36 && mouseY <= y + 36 + 16) gui.drawHoverString(name, x - 8, y + 35);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 4 && items.get(4) != null)
-            {
-                gui.renderItem(items.get(4), x + 30, y + 40 + 10, 30f);
-                name.add(items.get(4).getDisplayName());
-                if (mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 36 && mouseY <= y + 36 + 16) gui.drawHoverString(name, x + 15, y + 35);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
+            gui.renderItem(items[0], x + 89, y + 22 + 10, 30f);
+            for(int i = 1; i <= 4; i++)
+                if (items.length > i && items[i] != null){
+                    int posX = x + 8 + (i - 1) % 2 * 22;
+                    int posY = y + 26 + (i - 1) / 2 * 22;
+                    gui.renderItem(items[i], posX, posY, 30f);
+                    name.add(items[i].getDisplayName());
+                    if (mouseX >= posX - 8 && mouseX <= posX + 8 && mouseY >= posY - 16 && mouseY <= posY) gui.drawHoverString(name, posX - 20, posY - 14);
+                    name.removeAll(name);
+                    GL11.glDisable(GL11.GL_LIGHTING);
+                }
             drawText(gui, text, x, y + 25);
-        }
-        else
-        {
+        }else{
             gui.drawTexturedModalRect(x, y + 12, 145, 0, 111, 54);
-            gui.renderItem(items.get(0), x + 91, y + 28 + 10, 30f);
-            if (items.size() > 1 && items.get(1) != null)
-            {
-                gui.renderItem(items.get(1), x + 8, y + 20, 30f);
-                name.add(items.get(1).getDisplayName());
-                if (mouseX >= x && mouseX <= x + 16 && mouseY >= y + 10 && mouseY <= y + 26) gui.drawHoverString(name, x + 8, y + 10);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 2 && items.get(2) != null)
-            {
-                gui.renderItem(items.get(2), x + 28, y + 20, 30f);
-                name.add(items.get(2).getDisplayName());
-                if (mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 10 && mouseY <= y + 26) gui.drawHoverString(name, x + 28, y + 10);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 3 && items.get(3) != null)
-            {
-                gui.renderItem(items.get(3), x + 45, y + 20, 30f);
-                name.add(items.get(3).getDisplayName());
-                if (mouseX >= x + 40 && mouseX <= x + 16 + 40 && mouseY >= y + 10 && mouseY <= y + 26) gui.drawHoverString(name, x + 45, y + 10);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 4 && items.get(4) != null)
-            {
-                gui.renderItem(items.get(4), x + 8, y + 37, 30f);
-                name.add(items.get(4).getDisplayName());
-                if (mouseX >= x && mouseX <= x + 16 && mouseY >= y + 27 && mouseY <= y + 27 + 16) gui.drawHoverString(name, x + 8, y + 27);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 5 && items.get(5) != null)
-            {
-                gui.renderItem(items.get(5), x + 28, y + 37, 30f);
-                name.add(items.get(5).getDisplayName());
-                if (mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 27 && mouseY <= y + 27 + 16) gui.drawHoverString(name, x + 28, y + 27);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 6 && items.get(6) != null)
-            {
-                gui.renderItem(items.get(6), x + 45, y + 37, 30f);
-                name.add(items.get(6).getDisplayName());
-                if (mouseX >= x + 40 && mouseX <= x + 16 + 40 && mouseY >= y + 27 && mouseY <= y + 27 + 16) gui.drawHoverString(name, x + 45, y + 27);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 7 && items.get(7) != null)
-            {
-                gui.renderItem(items.get(7), x + 8, y + 54, 30f);
-                name.add(items.get(7).getDisplayName());
-                if (mouseX >= x && mouseX <= x + 16 && mouseY >= y + 44 && mouseY <= y + 44 + 16) gui.drawHoverString(name, x + 8, y + 44);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 8 && items.get(8) != null)
-            {
-                gui.renderItem(items.get(8), x + 28, y + 54, 30f);
-                name.add(items.get(8).getDisplayName());
-                if (mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 44 && mouseY <= y + 44 + 16) gui.drawHoverString(name, x + 28, y + 44);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-            if (items.size() > 9 && items.get(9) != null)
-            {
-                gui.renderItem(items.get(9), x + 45, y + 54, 30f);
-                name.add(items.get(9).getDisplayName());
-                if (mouseX >= x + 40 && mouseX <= x + 16 + 40 && mouseY >= y + 44 && mouseY <= y + 44 + 16) gui.drawHoverString(name, x + 45, y + 44);
-                name.removeAll(name);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
+            gui.renderItem(items[0], x + 91, y + 28 + 10, 30f);
+            for(int i = 1; i <= 9; i++)
+                if (items.length > i && items[i] != null){
+                    int posX = x + 8 + (i - 1) % 3 * 19;
+                    int posY = y + 22 + (i - 1) / 3 * 17;
+                    gui.renderItem(items[i], posX, posY, 30f);
+                    name.add(items[i].getDisplayName());
+                    if (mouseX >= posX - 8 && mouseX <= posX + 8 && mouseY >= posY - 10 && mouseY <= posY) gui.drawHoverString(name, posX - 20, posY - 12);
+                    name.removeAll(name);
+                    GL11.glDisable(GL11.GL_LIGHTING);
+                }
             drawText(gui, text, x, y + 32);
             GL11.glColor4f(1, 1, 1, 1);
         }
         GL11.glDisable(GL11.GL_BLEND);
     }
     
-    public static void addSmeltingRecipeTextPage(GuiGuide gui, int x, int y, String text, ArrayList<ItemStack> items, int mouseX, int mouseY)
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param text
+     * @param mouseX
+     * @param mouseY
+     * @param items
+     */
+    public static void addSmeltingRecipeTextPage(GuiGuide gui, int x, int y, String text, int mouseX, int mouseY, ItemStack ... items)
     {
         ArrayList<String> name = new ArrayList<String>();
-        gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + items.get(1).getDisplayName(), x + 30 - items.get(0).getDisplayName().length() / 2, y + 2, 0);
+        gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + items[1].getDisplayName(), x + 30 - items[0].getDisplayName().length() / 2, y + 2, 0);
         GL11.glColor4f(1, 1, 1, 1);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip" + ".png"));
+        Minecraft.getMinecraft().getTextureManager().bindTexture(pageFlipped);
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         gui.drawTexturedModalRect(x, y + 10, 145, 100, 111, 56);
-        
-        gui.renderItem(items.get(0), x + 13, y + 20 + 10, 35f);
-        name.add(items.get(0).getDisplayName());
+        gui.renderItem(items[0], x + 13, y + 20 + 10, 35f);
+        name.add(items[0].getDisplayName());
         if (mouseX >= x && mouseX <= x + 20 && mouseY >= y + 20 && mouseY <= y + 20 + 16) gui.drawHoverString(name, x, y + 20);
         name.removeAll(name);
         GL11.glDisable(GL11.GL_LIGHTING);
-        
-        gui.renderItem(items.get(1), x + 77, y + 28 + 10, 35f);
+        gui.renderItem(items[1], x + 77, y + 28 + 10, 35f);
         drawText(gui, text, x, y + 30);
         GL11.glColor4f(1, 1, 1, 1);
         GL11.glDisable(GL11.GL_BLEND);
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param item
+     * @param text
+     * @param size
+     */
     public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, String text, float size)
     {
         y += 5;
@@ -177,10 +109,23 @@ public class Page
         gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + item.getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(item.getDisplayName()) / 2) - 10, y + 2, 0);
         GL11.glColor4f(1, 1, 1, 1);
         gui.renderItem(item, x + 13, y + 18, size);
-        drawText(gui, text, x, y);
+        drawText(gui, text, x, y - (int)(200 / size));
         GL11.glDisable(GL11.GL_BLEND);
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param item
+     * @param text
+     * @param size
+     * @param txtX
+     * @param txtY
+     * @param showName
+     * @param imgX
+     * @param imgY
+     */
     public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, String text, float size, int txtX, int txtY, boolean showName, int imgX, int imgY)
     {
         y += 5;
@@ -193,6 +138,12 @@ public class Page
         GL11.glDisable(GL11.GL_BLEND);
     }
     
+    /**
+     * @param gui
+     * @param x
+     * @param y
+     * @param text
+     */
     public static void addTextPage(GuiGuide gui, int x, int y, String text)
     {
         y -= 25;
@@ -200,22 +151,25 @@ public class Page
         GL11.glColor4f(1, 1, 1, 1);
     }
     
+    /**
+     * @param gui
+     * @param text
+     * @param x
+     * @param y
+     */
     public static void drawText(GuiGuide gui, String text, int x, int y)
     {
         String[] s = text.split(" ");
         String displayText = "";
         ArrayList<String> textLines = new ArrayList<String>();
-        for (int i = 0; i < s.length; i++)
-        {
-            if ((displayText + s[i] + " ").length() <= 24) displayText += s[i] + " ";
-            else
-            {
+        for(String element: s)
+            if ((displayText + element + " ").length() <= 24) displayText += element + " ";
+            else{
                 textLines.add(displayText.trim());
-                displayText = s[i] + " ";
+                displayText = element + " ";
             }
-        }
         textLines.add(displayText.trim());
-        for (int i = 0; i < textLines.size(); i++)
+        for(int i = 0; i < textLines.size(); i++)
             gui.getFont().drawString(textLines.get(i), x, y + 30 + i * 12, 0);
     }
 }