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, 186 insertions, 238 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
index 1ff2ef3..b3caaf2 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
@@ -1,239 +1,187 @@
-package darkknight.jewelrycraft.client.gui;
-
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import org.lwjgl.opengl.GL11;
-import darkknight.jewelrycraft.block.BlockList;
-import darkknight.jewelrycraft.block.BlockShadowEye;
-
-public class GuiGuide extends GuiContainer
-{
-    public int page, rot, del;
-    public boolean prevHover, nextHover;
-    World world;
-    private final GuiTab[] tabs;
-    private GuiTab activeTab;
-    ResourceLocation pageTexture, flippedPageTexture;
-    
-    /**
-     * @param container
-     * @param world
-     * @param pageTex
-     * @param flipPageTex
-     */
-    public GuiGuide(Container container, World world, ResourceLocation pageTex, ResourceLocation flipPageTex)
-    {
-        super(container);
-        page = 1;
-        rot = 0;
-        del = 0;
-        this.world = world;
-        tabs = new GuiTab[]{new GuiTabIntroduction(0), new GuiTabBlocks(1), new GuiTabItems(2), new GuiTabGemsAndIngots(3), new GuiTabOresToIngots(4), new GuiTabModifiers(5), new GuiTabRitual(6)};
-        activeTab = tabs[0];
-        pageTexture = pageTex;
-        flippedPageTexture = flipPageTex;
-        this.xSize = 240;
-    }
-    
-    /**
-     * @param f
-     * @param i
-     * @param j
-     */
-    @Override
-    protected void drawGuiContainerBackgroundLayer(float f, int i, int j)
-    {
-        nextHover = false;
-        prevHover = false;
-        if (del == 0) rot++;
-        del++;
-        if (del >= 2) del = 0;
-        Minecraft.getMinecraft().getTextureManager().bindTexture(pageTexture);
-        drawTexturedModalRect(guiLeft + 147 / 2 + 20, guiTop - 10, 0, 0, 145, 180);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(flippedPageTexture);
-        drawTexturedModalRect(guiLeft - 147 / 2 + 21, guiTop - 10, 0, 0, 145, 180);
-        for(GuiRectangle tab: tabs){
-            int srcX = 24;
-            int sizeX = 19;
-            if (tab == activeTab){
-                srcX += 38;
-                sizeX += 3;
-            }else if (tab.inRect(this, i, j)) srcX += 19;
-            tab.draw(this, srcX, 180, sizeX, 18);
-        }
-        if (i >= guiLeft + 195 + 20 && i <= guiLeft + 195 + 20 + 11 && j >= guiTop + 127 + 20 && j <= guiTop + 127 + 20 + 14 && page + 2 <= activeTab.getMaxPages()){
-            drawTexturedModalRect(guiLeft + 195 + 20, guiTop + 127 + 20, 0, 180, 11, 14);
-            nextHover = true;
-        }
-        if (i >= guiLeft + 20 - 61 && i <= guiLeft - 61 + 20 + 11 && j >= guiTop + 127 + 20 && j <= guiTop + 127 + 20 + 14 && page - 2 > 0){
-            drawTexturedModalRect(guiLeft - 61 + 20, guiTop + 127 + 20, 11, 180, 11, 14);
-            prevHover = true;
-        }
-        activeTab.drawBackground(this, i, j, page);
-        activeTab.drawBackground(this, i, j, page + 1);
-        ArrayList<String> text = new ArrayList<String>();
-        text.add(Integer.toString(page));
-        drawHoveringText(text, guiLeft - 10 + 20 - text.get(0).length(), guiTop + 150 + 25, fontRendererObj);
-        text.remove(Integer.toString(page));
-        text.add(Integer.toString(page + 1));
-        drawHoveringText(text, guiLeft - 10 + 20 + 147 - text.get(0).length(), guiTop + 150 + 25, fontRendererObj);
-        for(int tab = 0; tab < tabs.length; tab++)
-            renderItem(tabs[tab].getIcon(), guiLeft - 52, guiTop + 26 + tab * 19, activeTab.getIcon());
-    }
-    
-    /**
-     * @param x
-     * @param y
-     */
-    @Override
-    protected void drawGuiContainerForegroundLayer(int x, int y)
-    {
-        activeTab.drawForeground(this, x, y, page);
-        activeTab.drawForeground(this, x, y, page + 1);
-        for(GuiTab tab: tabs)
-            tab.drawString(this, x, y, tab.getName());
-    }
-    
-    /**
-     * @param x
-     * @param y
-     * @param button
-     */
-    @Override
-    protected void mouseClicked(int x, int y, int button)
-    {
-        if (nextHover && page + 2 <= activeTab.getMaxPages()) page += 2;
-        else if (prevHover && page > 1) page -= 2;
-        activeTab.mouseClick(this, x, y, button);
-        for(GuiTab tab: tabs)
-            if (activeTab != tab) if (tab.inRect(this, x, y)){
-                activeTab = tab;
-                page = 1;
-                break;
-            }
-    }
-    
-    /**
-     * @param item
-     * @param x
-     * @param y
-     * @param activeIcon
-     */
-    public void renderItem(ItemStack item, float x, float y, ItemStack activeIcon)
-    {
-        GL11.glPushMatrix();
-        GL11.glDisable(GL11.GL_LIGHTING);
-        EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, item);
-        entityitem.hoverStart = 0.0F;
-        if (item.isItemEqual(new ItemStack(BlockList.smelter))){
-            y -= 3;
-            x += 1;
-        }
-        GL11.glTranslatef(x, y, 100);
-        float scale = 30F;
-        GL11.glScalef(-scale, scale, scale);
-        if (activeIcon != null && item.isItemEqual(activeIcon)) GL11.glRotatef(rot, 0, 1, 0);
-        if (item.isItemEqual(new ItemStack(BlockList.smelter))){
-            GL11.glScalef(1.5F, 1.5F, 1.5F);
-            GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
-        }else if (item.isItemEqual(new ItemStack(BlockList.handPedestal))){
-            GL11.glScalef(1.2F, 1.2F, 1.2F);
-            GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
-            GL11.glTranslatef(0F, 0.05F, 0F);
-        }else if (item.isItemEqual(new ItemStack(BlockList.shadowOre))){
-            GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
-            GL11.glTranslatef(0F, 0.13F, 0F);
-        }else GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
-        if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.enableStandardItemLighting();
-        if (RenderManager.instance.options.fancyGraphics) RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-        else{
-            GL11.glRotatef(180F, 0F, 1F, 0F);
-            RenderManager.instance.options.fancyGraphics = true;
-            RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-            RenderManager.instance.options.fancyGraphics = false;
-        }
-        if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.disableStandardItemLighting();
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glPopMatrix();
-    }
-    
-    /**
-     * @param item
-     * @param x
-     * @param y
-     * @param scale
-     */
-    public void renderItem(ItemStack item, float x, float y, float scale, boolean rotate, float xRot, float yRot, float zRot)
-    {
-        GL11.glPushMatrix();
-        EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, item);
-        entityitem.hoverStart = 0.0F;
-        GL11.glTranslatef(x, y, 100);
-        GL11.glScalef(-scale, scale, scale);
-        GL11.glRotatef(160.0F, 1.0F, 0.0F, 0.0F);
-        if (rotate) GL11.glRotatef(rot, 0.0F, 1.0F, 0.0F);
-        else{
-            GL11.glRotatef(xRot, 1, 0, 0);
-            GL11.glRotatef(yRot, 0, 1, 0);
-            GL11.glRotatef(zRot, 0, 0, 1);
-            if (xRot >= 90F || zRot >= 90F) GL11.glTranslatef(0F, -0.2F, 0F);
-            if (Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockShadowEye) GL11.glTranslatef(0F, 0F, 0.025F);
-        }
-        if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.enableStandardItemLighting();
-        if (RenderManager.instance.options.fancyGraphics) RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-        else{
-            RenderManager.instance.options.fancyGraphics = true;
-            RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-            RenderManager.instance.options.fancyGraphics = false;
-        }
-        if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.disableStandardItemLighting();
-        GL11.glPopMatrix();
-    }
-    
-    /**
-     * @return
-     */
-    public int getLeft()
-    {
-        return guiLeft;
-    }
-    
-    /**
-     * @return
-     */
-    public int getTop()
-    {
-        return guiTop;
-    }
-    
-    /**
-     * @return
-     */
-    public FontRenderer getFont()
-    {
-        return fontRendererObj;
-    }
-    
-    /**
-     * @param lst
-     * @param x
-     * @param y
-     */
-    @SuppressWarnings ("rawtypes")
-    public void drawHoverString(List lst, int x, int y)
-    {
-        drawHoveringText(lst, x, y, fontRendererObj);
-    }
+package darkknight.jewelrycraft.client.gui;

+

+import java.util.ArrayList;

+import java.util.List;

+import net.minecraft.block.Block;

+import net.minecraft.block.BlockAir;

+import net.minecraft.client.Minecraft;

+import net.minecraft.client.gui.FontRenderer;

+import net.minecraft.client.gui.inventory.GuiContainer;

+import net.minecraft.client.renderer.RenderHelper;

+import net.minecraft.client.renderer.entity.RenderManager;

+import net.minecraft.entity.item.EntityItem;

+import net.minecraft.inventory.Container;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.ResourceLocation;

+import net.minecraft.world.World;

+import org.lwjgl.opengl.GL11;

+import darkknight.jewelrycraft.JewelrycraftMod;

+import darkknight.jewelrycraft.block.BlockList;

+import darkknight.jewelrycraft.block.BlockShadowEye;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

+

+public class GuiGuide extends GuiContainer {

+	public int page, rot, del;

+	public boolean prevHover, nextHover;

+	World world;

+	private final GuiTab[] tabs = new GuiTab[] { new GuiTabIntroduction(0), new GuiTabBlocks(1), new GuiTabItems(2), new GuiTabGemsAndIngots(3), new GuiTabCurses(4), new GuiTabModifiers(5), new GuiTabRitual(6) };

+	private GuiTab activeTab;

+	ResourceLocation pageTexture, flippedPageTexture;

+

+	public GuiGuide(Container container, World world, ResourceLocation pageTex, ResourceLocation flipPageTex) {

+		super(container);

+		page = JewelrycraftMod.prevPage;

+		rot = 0;

+		del = 0;

+		this.world = world;

+		activeTab = JewelrycraftMod.prevActive;

+		pageTexture = pageTex;

+		flippedPageTexture = flipPageTex;

+		this.xSize = 240;

+	}

+

+	@Override

+	protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {

+		nextHover = false;

+		prevHover = false;

+		if (del == 0) rot++;

+		del++;

+		if (del >= 2) del = 0;

+		Minecraft.getMinecraft().getTextureManager().bindTexture(pageTexture);

+		drawTexturedModalRect(guiLeft + 147 / 2 + 20, guiTop - 10, 0, 0, 145, 179);

+		Minecraft.getMinecraft().getTextureManager().bindTexture(flippedPageTexture);

+		drawTexturedModalRect(guiLeft - 147 / 2 + 21, guiTop - 10, 0, 0, 145, 179);

+		for (GuiRectangle tab : tabs) {

+			int srcX = 24;

+			int sizeX = 19;

+			if (tab == activeTab) {

+				srcX += 38;

+				sizeX += 3;

+			}

+			else if (tab.inRect(this, i, j)) srcX += 19;

+			tab.draw(this, srcX, 180, sizeX, 18);

+		}

+		if (i >= guiLeft + 195 + 20 && i <= guiLeft + 195 + 20 + 11 && j >= guiTop + 127 + 20 && j <= guiTop + 127 + 20 + 14 && page + 2 <= activeTab.getMaxPages()) {

+			drawTexturedModalRect(guiLeft + 195 + 20, guiTop + 127 + 20, 0, 180, 11, 14);

+			nextHover = true;

+		}

+		if (i >= guiLeft + 20 - 61 && i <= guiLeft - 61 + 20 + 11 && j >= guiTop + 127 + 20 && j <= guiTop + 127 + 20 + 14 && page - 2 > 0) {

+			drawTexturedModalRect(guiLeft - 61 + 20, guiTop + 127 + 20, 11, 180, 11, 14);

+			prevHover = true;

+		}

+		activeTab.drawBackground(this, i, j, page);

+		activeTab.drawBackground(this, i, j, page + 1);

+		ArrayList<String> text = new ArrayList<String>();

+		text.add(Integer.toString(page));

+		drawHoveringText(text, guiLeft - 10 + 20 - text.get(0).length(), guiTop + 150 + 25, fontRendererObj);

+		text.remove(Integer.toString(page));

+		text.add(Integer.toString(page + 1));

+		drawHoveringText(text, guiLeft - 10 + 20 + 147 - text.get(0).length(), guiTop + 150 + 25, fontRendererObj);

+		for (int tab = 0; tab < tabs.length; tab++)

+			renderItem(tabs[tab].getIcon(), guiLeft - 52, guiTop + 26 + tab * 19, activeTab.getIcon());

+	}

+

+	@Override

+	protected void drawGuiContainerForegroundLayer(int x, int y) {

+		activeTab.drawForeground(this, x, y, page);

+		activeTab.drawForeground(this, x, y, page + 1);

+		for (GuiTab tab : tabs)

+			tab.drawString(this, x, y, tab.getName());

+	}

+

+	@Override

+	protected void mouseClicked(int x, int y, int button) {

+		if (nextHover && page + 2 <= activeTab.getMaxPages()) {

+			page += 2;

+			JewelrycraftMod.prevPage = page;

+		}

+		else if (prevHover && page > 1) {

+			page -= 2;

+			JewelrycraftMod.prevPage = page;

+		}

+		activeTab.mouseClick(this, x, y, button);

+		for (GuiTab tab : tabs)

+			if (activeTab != tab) if (tab.inRect(this, x, y)) {

+				activeTab = tab;

+				JewelrycraftMod.prevActive = tab;

+				page = 1;

+				JewelrycraftMod.prevPage = page;

+				break;

+			}

+	}

+

+	public void renderItem(ItemStack item, float x, float y, ItemStack activeIcon) {

+		GL11.glPushMatrix();

+		GL11.glDisable(GL11.GL_LIGHTING);

+		EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, item);

+		entityitem.hoverStart = 0.0F;

+		if (item.isItemEqual(new ItemStack(BlockList.smelter))) {

+			y -= 3;

+			x += 1;

+		}

+		GL11.glTranslatef(x, y, 100);

+		float scale = 30F;

+		GL11.glScalef(-scale, scale, scale);

+		if (activeIcon != null && item.isItemEqual(activeIcon)) GL11.glRotatef(rot, 0, 1, 0);

+		if (item.isItemEqual(new ItemStack(BlockList.smelter))) GL11.glScalef(1.5F, 1.5F, 1.5F);

+		else if (item.isItemEqual(new ItemStack(BlockList.handPedestal))) {

+			GL11.glScalef(1.2F, 1.2F, 1.2F);

+			GL11.glTranslatef(0F, -0.05F, 0F);

+		}

+		GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);

+		if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.enableStandardItemLighting();

+		if (RenderManager.instance.options.fancyGraphics) RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);

+		else {

+			GL11.glRotatef(180F, 0F, 1F, 0F);

+			RenderManager.instance.options.fancyGraphics = true;

+			RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);

+			RenderManager.instance.options.fancyGraphics = false;

+		}

+		if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.disableStandardItemLighting();

+		GL11.glEnable(GL11.GL_LIGHTING);

+		GL11.glPopMatrix();

+	}

+

+	public void renderItem(ItemStack item, float x, float y, float scale, boolean rotate, float xRot, float yRot, float zRot) {

+		GL11.glPushMatrix();

+		EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, item);

+		entityitem.hoverStart = 0.0F;

+		GL11.glTranslatef(x, y, 100);

+		GL11.glScalef(-scale, scale, scale);

+		GL11.glRotatef(160.0F, 1.0F, 0.0F, 0.0F);

+		if (rotate) GL11.glRotatef(rot, 0.0F, 1.0F, 0.0F);

+		else {

+			GL11.glRotatef(xRot, 1, 0, 0);

+			GL11.glRotatef(yRot, 0, 1, 0);

+			GL11.glRotatef(zRot, 0, 0, 1);

+			if (xRot >= 90F || zRot >= 90F) GL11.glTranslatef(0F, -0.2F, 0F);

+			if (Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockShadowEye) GL11.glTranslatef(0F, 0F, 0.025F);

+		}

+		if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.enableStandardItemLighting();

+		if (RenderManager.instance.options.fancyGraphics) RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);

+		else {

+			RenderManager.instance.options.fancyGraphics = true;

+			RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);

+			RenderManager.instance.options.fancyGraphics = false;

+		}

+		if (!(Block.getBlockFromItem(entityitem.getEntityItem().getItem()) instanceof BlockAir)) RenderHelper.disableStandardItemLighting();

+		GL11.glPopMatrix();

+	}

+

+	public int getLeft() {

+		return guiLeft;

+	}

+

+	public int getTop() {

+		return guiTop;

+	}

+

+	public FontRenderer getFont() {

+		return fontRendererObj;

+	}

+

+	@SuppressWarnings("rawtypes")

+	public void drawHoverString(List lst, int x, int y) {

+		drawHoveringText(lst, x, y, fontRendererObj);

+	}

 }
\ No newline at end of file