Added a new structure, a new curse, achievements, challenges, curses

entry in the guide; reworked liquids to be tile entities, cleaned the
structures code, potion code and... you know what? I improved and
changed so much stuff that I literally forgot what I did...

1 files changed, 96 insertions, 92 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
index 33d94f2..a124703 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
@@ -1,92 +1,96 @@
-package darkknight.jewelrycraft.client.gui;
-
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
-import darkknight.jewelrycraft.util.JewelrycraftUtil;
-import darkknight.jewelrycraft.util.Variables;
-
-public class GuiTabGemsAndIngots extends GuiTab
-{
-    
-    /**
-     * @param id
-     */
-    public GuiTabGemsAndIngots(int id)
-    {
-        super(id);
-    }
-    
-    public String getName()
-    {
-        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.misc");
-    }
-    
-    /**
-     * @return
-     */
-    @Override
-    public ItemStack getIcon()
-    {
-        return new ItemStack(Items.emerald);
-    }
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param page
-     */
-    @Override
-    public void drawBackground(GuiGuide gui, int x, int y, int page)
-    {
-        int xPos = page % 2 == 0 ? 107 : -35;
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        for(int i = (page - 1) * 9; i < page * 9; i++)
-            if (i < JewelrycraftUtil.gem.size()){
-                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Gems", gui.getLeft() + xPos + 40, gui.getTop(), 0);
-                gui.renderItem(JewelrycraftUtil.gem.get(i), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16 * (i - 9 * (page - 1)), 30f, true, 0, 0, 0);
-                gui.getFont().drawString(String.format("%-1.18s", JewelrycraftUtil.gem.get(i).getDisplayName()), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16 * (i - 9 * (page - 1)), 0);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-        page -= JewelrycraftUtil.gem.size() / 9 + 1;
-        for(int i = (page - 1) * 9; i < page * 9; i++)
-            if (i < JewelrycraftUtil.metal.size() && page > 0){
-                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Ingots", gui.getLeft() + xPos + 40, gui.getTop(), 0);
-                gui.renderItem(JewelrycraftUtil.metal.get(i).copy(), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16 * (i - 9 * (page - 1)), 30f, true, 0, 0, 0);
-                gui.getFont().drawString(String.format("%-1.18s", JewelrycraftUtil.metal.get(i).copy().getDisplayName()), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16 * (i - 9 * (page - 1)), 0);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-        page -= JewelrycraftUtil.metal.size() / 9 + 1;
-        for(int i = (page - 1) * 9; i < page * 9; i++)
-            if (i < JewelrycraftUtil.ores.size() && page > 0){
-                gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Ores", gui.getLeft() + xPos + 40, gui.getTop(), 0);
-                gui.renderItem(JewelrycraftUtil.ores.get(i).copy(), gui.getLeft() + xPos + 10, gui.getTop() + 22 + 16 * (i - 9 * (page - 1)), 30f, true, 0, 0, 0);
-                gui.getFont().drawString(String.format("%-1.18s", JewelrycraftUtil.ores.get(i).copy().getDisplayName()), gui.getLeft() + xPos + 20, gui.getTop() + 12 + 16 * (i - 9 * (page - 1)), 0);
-                GL11.glDisable(GL11.GL_LIGHTING);
-            }
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-    
-    /**
-     * @return
-     */
-    @Override
-    public int getMaxPages()
-    {
-        return JewelrycraftUtil.gem.size() / 9 + JewelrycraftUtil.metal.size() / 9 + JewelrycraftUtil.ores.size() / 9 + 4;
-    }
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param page
-     */
-    @Override
-    public void drawForeground(GuiGuide gui, int x, int y, int page)
-    {}
-}
+package darkknight.jewelrycraft.client.gui;

+

+import net.minecraft.init.Items;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.EnumChatFormatting;

+import net.minecraft.util.StatCollector;

+import org.lwjgl.opengl.GL11;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

+import darkknight.jewelrycraft.util.Variables;

+

+public class GuiTabGemsAndIngots extends GuiTab

+{

+    

+    /**

+     * @param id

+     */

+    public GuiTabGemsAndIngots(int id)

+    {

+        super(id);

+    }

+    

+    public String getName()

+    {

+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.misc");

+    }

+    

+    /**

+     * @return

+     */

+    @Override

+    public ItemStack getIcon()

+    {

+        return new ItemStack(Items.emerald);

+    }

+    

+    /**

+     * @param gui

+     * @param x

+     * @param y

+     * @param page

+     */

+    @Override

+    public void drawBackground(GuiGuide gui, int x, int y, int page)

+    {

+        int xPos = page % 2 == 0 ? 107 : -35;

+        float scale = 0.75F;

+        for(int i = (page - 1) * 12; i < page * 12; i++)

+            if (i < JewelrycraftUtil.gem.size()){

+            	GL11.glPushMatrix();

+                if(i==(page - 1) * 12) gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Gems", gui.getLeft() + xPos + 40, gui.getTop(), 0);

+            	GL11.glScalef(scale, scale, 0f);

+                gui.getFont().drawString(String.format("%-1.26s", JewelrycraftUtil.gem.get(i).getDisplayName()), (int)((gui.getLeft() + xPos + 12)/scale), (int)((gui.getTop() + 12 + 12 * (i - 12 * (page - 1)))/scale), 0);

+                GL11.glPopMatrix();

+                gui.renderItem(JewelrycraftUtil.gem.get(i), gui.getLeft() + xPos + 5, gui.getTop() + 18 + 12 * (i - 12 * (page - 1)), 24f, true, 0, 0, 0);

+            }

+        page -= JewelrycraftUtil.gem.size() / 13 + 1;

+        for(int i = (page - 1) * 12; i < page * 12; i++)

+            if (i < JewelrycraftUtil.metal.size() && page > 0){

+            	GL11.glPushMatrix();

+            	if(i==(page - 1) * 12) gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Ingots", gui.getLeft() + xPos + 40, gui.getTop(), 0);

+            	GL11.glScalef(scale, scale, 0f);

+                gui.getFont().drawString(String.format("%-1.18s", JewelrycraftUtil.metal.get(i).copy().getDisplayName()), (int)((gui.getLeft() + xPos + 12)/scale), (int)((gui.getTop() + 12 + 12 * (i - 12 * (page - 1)))/scale), 0);

+                GL11.glPopMatrix();

+                gui.renderItem(JewelrycraftUtil.metal.get(i), gui.getLeft() + xPos + 5, gui.getTop() + 18 + 12 * (i - 12 * (page - 1)), 24f, true, 0, 0, 0);

+            }

+        page -= JewelrycraftUtil.metal.size() / 13 + 1;

+        for(int i = (page - 1) * 12; i < page * 12; i++)

+            if (i < JewelrycraftUtil.ores.size() && page > 0){

+            	GL11.glPushMatrix();

+            	if(i==(page - 1) * 12) gui.getFont().drawString(EnumChatFormatting.DARK_BLUE + "\u00a7n" + "Ores", gui.getLeft() + xPos + 40, gui.getTop(), 0);

+            	GL11.glScalef(scale, scale, 0f);

+                gui.getFont().drawString(String.format("%-1.18s", JewelrycraftUtil.ores.get(i).copy().getDisplayName()), (int)((gui.getLeft() + xPos + 12)/scale), (int)((gui.getTop() + 12 + 12 * (i - 12 * (page - 1)))/scale), 0);

+                GL11.glPopMatrix();

+                gui.renderItem(JewelrycraftUtil.ores.get(i), gui.getLeft() + xPos + 5, gui.getTop() + 18 + 12 * (i - 12 * (page - 1)), 24f, true, 0, 0, 0);

+            }

+    }

+    

+    /**

+     * @return

+     */

+    @Override

+    public int getMaxPages()

+    {

+        return (JewelrycraftUtil.gem.size() / 13) + (JewelrycraftUtil.metal.size() / 13) + (JewelrycraftUtil.ores.size() / 13) + 3;

+    }

+    

+    /**

+     * @param gui

+     * @param x

+     * @param y

+     * @param page

+     */

+    @Override

+    public void drawForeground(GuiGuide gui, int x, int y, int page)

+    {}

+}