More stuff. I don't even know by this point....

1 files changed, 37 insertions, 15 deletions

diff --git a/java/darkknight/jewelrycraft/container/Page.java b/java/darkknight/jewelrycraft/container/Page.java
index bca21a8..beaa0bc 100644
--- a/java/darkknight/jewelrycraft/container/Page.java
+++ b/java/darkknight/jewelrycraft/container/Page.java
@@ -2,10 +2,12 @@ package darkknight.jewelrycraft.container;
 
 import java.util.ArrayList;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
 import darkknight.jewelrycraft.client.GuiGuide;
 
 public class Page
@@ -22,7 +24,7 @@ public class Page
      * @param mouseY
      * @param items
      */
-    public static void addCraftingRecipeTextPage(GuiGuide gui, int x, int y, boolean isSmall, String text, int mouseX, int mouseY, ItemStack ... items)
+    public static void addCraftingRecipeTextPage(GuiGuide gui, int x, int y, boolean isSmall, String text, int mouseX, int mouseY, boolean rotate, ItemStack ... items)
     {
         y += 5;
         GL11.glEnable(GL11.GL_BLEND);
@@ -33,12 +35,12 @@ public class Page
         ArrayList<String> name = new ArrayList<String>();
         if (isSmall){
             gui.drawTexturedModalRect(x, y + 10, 145, 54, 111, 46);
-            gui.renderItem(items[0], x + 89, y + 22 + 10, 30f);
+            gui.renderItem(items[0], x + 89, y + 22 + 10, 30f, rotate, 0, 0, 0);
             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);
+                    gui.renderItem(items[i], posX, posY, 30f, rotate, 0, 0, 0);
                     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);
@@ -47,12 +49,12 @@ public class Page
             drawText(gui, text, x, y + 25);
         }else{
             gui.drawTexturedModalRect(x, y + 12, 145, 0, 111, 54);
-            gui.renderItem(items[0], x + 91, y + 28 + 10, 30f);
+            gui.renderItem(items[0], x + 91, y + 28 + 10, 30f, rotate, 0, 0, 0);
             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);
+                    gui.renderItem(items[i], posX, posY, 30f, rotate, 0, 0, 0);
                     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);
@@ -73,7 +75,7 @@ public class Page
      * @param mouseY
      * @param items
      */
-    public static void addSmeltingRecipeTextPage(GuiGuide gui, int x, int y, String text, int mouseX, int mouseY, ItemStack ... items)
+    public static void addSmeltingRecipeTextPage(GuiGuide gui, int x, int y, String text, int mouseX, int mouseY, boolean rotate, ItemStack ... items)
     {
         ArrayList<String> name = new ArrayList<String>();
         gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + items[1].getDisplayName(), x + 30 - items[0].getDisplayName().length() / 2, y + 2, 0);
@@ -81,13 +83,13 @@ public class Page
         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[0], x + 13, y + 20 + 10, 35f);
+        gui.drawTexturedModalRect(x, y + 10, 145, 100, 111, 52);
+        gui.renderItem(items[0], x + 13, y + 20 + 10, 35f, rotate, 0, 0, 0);
         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[1], x + 77, y + 28 + 10, 35f);
+        gui.renderItem(items[1], x + 77, y + 28 + 10, 35f, rotate, 0, 0, 0);
         drawText(gui, text, x, y + 30);
         GL11.glColor4f(1, 1, 1, 1);
         GL11.glDisable(GL11.GL_BLEND);
@@ -101,15 +103,34 @@ public class Page
      * @param text
      * @param size
      */
-    public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, String text, float size)
+    public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, String text, float size, boolean rotate)
     {
         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" + item.getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(item.getDisplayName()) / 2) - 10, y + 2, 0);
+        gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + item.getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(item.getDisplayName()) / 2) - 10, y + (int)size/5, 0);
         GL11.glColor4f(1, 1, 1, 1);
-        gui.renderItem(item, x + 13, y + 18, size);
-        drawText(gui, text, x, y - (int)(200 / size));
+        gui.renderItem(item, x + 13, y + 18, size, rotate, 0, 0, 0);
+        drawText(gui, text, x - 2, y - (int)(250 / size));
+        GL11.glDisable(GL11.GL_BLEND);
+    }
+    
+    public static void addSlotItem(GuiGuide gui, int x, int y, int mouseX, int mouseY, ItemStack item, float xRot, float yRot, float zRot)
+    {
+        ArrayList<String> name = new ArrayList<String>();
+        GL11.glColor4f(1, 1, 1, 1);
+        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 + 9, y + 19, 148, 153, 12, 12);
+        if(item.getItem() != null){
+            name.add(item.getDisplayName());
+            if (mouseX >= x + 10 && mouseX <= x + 20 && mouseY >= y + 20 && mouseY <= y + 30) gui.drawHoverString(name, x, y + 10);
+            name.removeAll(name);
+        }
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glColor4f(1, 1, 1, 1);
+        if(item.getItem() != null) gui.renderItem(item, x + 15, y + 25, 40f, false, xRot, yRot, zRot);
         GL11.glDisable(GL11.GL_BLEND);
     }
     
@@ -126,14 +147,15 @@ public class Page
      * @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)
+    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, boolean rotate)
     {
         y += 5;
         GL11.glEnable(GL11.GL_BLEND);
+        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         if (showName) 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 + imgX, y + 18 + imgY, size);
+        gui.renderItem(item, x + 13 + imgX, y + 18 + imgY, size, rotate, 0, 0, 0);
         drawText(gui, text, x + txtX, y + txtY);
         GL11.glDisable(GL11.GL_BLEND);
     }