summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2014-04-01 22:33:40 +0300
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2014-04-01 22:33:40 +0300
commiteb32c0b97d9f3dddace4ffb1a4eb0617e4f63225 (patch)
tree6523cdae9112ab995c8397d5d7a1d6bf4dc2a471
parent9d0d74a3ba0aeca9f1130d1228fa4b9ef08d19d6 (diff)
Yaay! I finished another update :)
-rw-r--r--common/darkknight/jewelrycraft/client/GuiGuide.java4
-rw-r--r--common/darkknight/jewelrycraft/container/GuiTabItems.java54
-rw-r--r--common/darkknight/jewelrycraft/container/GuiTabNecklaces.java344
-rw-r--r--common/darkknight/jewelrycraft/container/GuiTabRings.java523
-rw-r--r--common/darkknight/jewelrycraft/container/Page.java25
-rw-r--r--common/darkknight/jewelrycraft/item/ItemNecklace.java28
-rw-r--r--common/darkknight/jewelrycraft/item/ItemRing.java18
-rw-r--r--common/darkknight/jewelrycraft/recipes/CraftingRecipes.java4
-rw-r--r--resources/assets/jewelrycraft/textures/gui/guidePage.pngbin18212 -> 29547 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/gui/guidePage1.pngbin30103 -> 0 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/gui/guidePageFlip.pngbin18340 -> 29469 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/gui/guidePageFlip1.pngbin30159 -> 0 bytes
12 files changed, 964 insertions, 36 deletions
diff --git a/common/darkknight/jewelrycraft/client/GuiGuide.java b/common/darkknight/jewelrycraft/client/GuiGuide.java
index 48fc762..64aed20 100644
--- a/common/darkknight/jewelrycraft/client/GuiGuide.java
+++ b/common/darkknight/jewelrycraft/client/GuiGuide.java
@@ -78,13 +78,13 @@ public class GuiGuide extends GuiContainer
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)
+ 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)
+ 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;
diff --git a/common/darkknight/jewelrycraft/container/GuiTabItems.java b/common/darkknight/jewelrycraft/container/GuiTabItems.java
index 78ab2dc..2b99a0b 100644
--- a/common/darkknight/jewelrycraft/container/GuiTabItems.java
+++ b/common/darkknight/jewelrycraft/container/GuiTabItems.java
@@ -1,5 +1,7 @@
package darkknight.jewelrycraft.container;
+import java.awt.Desktop;
+import java.net.URL;
import java.util.ArrayList;
import net.minecraft.block.Block;
@@ -16,7 +18,7 @@ public class GuiTabItems extends GuiTab
{
super("Items", id);
}
-
+
public ItemStack getIcon()
{
return new ItemStack(ItemList.thiefGloves);
@@ -210,13 +212,61 @@ public class GuiTabItems extends GuiTab
items.add(new ItemStack(ItemList.crystal, 1, values));
Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop() + 60, true, text, items, x, y);
break;
+ case 13:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values >= 3) values = 0;
+ text.add(" It's this exact guide.");
+ text.add("I don't even know why");
+ text.add("you're reading this.");
+ text.add("I added this recipe in");
+ text.add("case you lose the");
+ text.add("original. In case you");
+ text.add("don't have it, I suggest");
+ text.add("adding NEI so you can");
+ items.add(new ItemStack(ItemList.guide));
+ items.add(new ItemStack(ItemList.molds, 1, values));
+ items.add(new ItemStack(Item.book));
+ Page.addCraftingRecipeTextPage(gui, gui.getLeft() + xPos, gui.getTop(), true, text, items, x, y);
+ break;
+ case 14:
+ String link = "HERE";
+ if(x >= gui.getLeft() + 138 && x <= gui.getLeft() + 168 && y >= gui.getTop() + 98 && y <= gui.getTop() + 108) link = "§1HERE§0";
+ text.add("see all the recipes.");
+ text.add("Since you are reading");
+ text.add("this, how about making");
+ text.add("a youtube video");
+ text.add("spotlighting this mod.");
+ text.add("I'd really appreciate it.");
+ text.add("After that you can");
+ text.add("share it in the main");
+ text.add("thread " + link + ".");
+ text.add(" This mod was made by");
+ text.add("DarkKnight (or sor1n");
+ text.add("depending from where");
+ text.add("you got this)");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
default:;
}
}
public int getMaxPages()
{
- return 11;
+ return 13;
+ }
+
+ public void mouseClick(GuiGuide gui, int x, int y, int button)
+ {
+ if(gui.page == 13 && x >= gui.getLeft() + 138 && x <= gui.getLeft() + 168 && y >= gui.getTop() + 98 && y <= gui.getTop() + 108)
+ {
+ try
+ {
+ Desktop.getDesktop().browse(new URL("http://www.minecraftforum.net/topic/2210959-164smp-ssp-jewelrycraft-version-12/").toURI());
+ }
+ catch (Exception e) {}
+ }
}
@Override
diff --git a/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java b/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
index c42ea92..65b9721 100644
--- a/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
+++ b/common/darkknight/jewelrycraft/container/GuiTabNecklaces.java
@@ -1,17 +1,22 @@
package darkknight.jewelrycraft.container;
+import java.util.ArrayList;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import darkknight.jewelrycraft.client.GuiGuide;
import darkknight.jewelrycraft.item.ItemList;
import darkknight.jewelrycraft.util.JewelryNBT;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
public class GuiTabNecklaces extends GuiTab
{
+ int jValues;
public GuiTabNecklaces(int id)
{
super("Necklaces", id);
+ jValues = 0;
}
public ItemStack getIcon()
@@ -25,7 +30,344 @@ public class GuiTabNecklaces extends GuiTab
@Override
public void drawBackground(GuiGuide gui, int x, int y, int page)
{
- gui.getFont().drawString(this.getName(), gui.getLeft() + 4, gui.getTop() + 5, 3432135);
+ ArrayList<String> text = new ArrayList<String>();
+ ArrayList<ItemStack> jewels = new ArrayList<ItemStack>();
+ ItemStack item = new ItemStack(ItemList.necklace);
+ int xPos = (page%2==0)?107:-35;
+ switch(page)
+ {
+ case 1:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
+
+ text.add("§2Jewel: §0Ender Pearl");
+ text.add("§2Modifier: §0None");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring teleports");
+ text.add("you and anyone around ");
+ text.add("in any location from the");
+ text.add("same dimension. Just");
+ text.add("right click once in a");
+ text.add("location to se the ");
+ text.add("position. Then right ");
+ text.add("click any time you want");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 2:
+ text.add("to teleport there.");
+ text.add("§4§nAltar Effect");
+ text.add(" This teleports anyone");
+ text.add("or anything that steps");
+ text.add("or goes near the altar");
+ text.add("to the necklaces");
+ text.add("coordonates, as long");
+ text.add("as that is in the same");
+ text.add("dimension.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 3:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
+ JewelryNBT.addModifier(item, new ItemStack(Item.bed));
+
+ text.add("§2Jewel: §0Ender Pearl");
+ text.add("§2Modifier: §0Bed");
+ text.add("§2Ingot: §0Any");
+ text.add(" Just like the other");
+ text.add("necklace this teleports");
+ text.add("you and anybody close");
+ text.add("to you to the set");
+ text.add("destination. The only");
+ text.add("difference is that you");
+ text.add("can travel between");
+ text.add("dimensions with this.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 4:
+ text.add("§4§nAltar Effect");
+ text.add(" This teleports anyone");
+ text.add("or anything that step");
+ text.add("on or around the altar");
+ text.add("to the set location, with");
+ text.add("the benefit of it being");
+ text.add("capable of");
+ text.add("inter-dimensional");
+ text.add("travels.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 5:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.blazePowder));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Blaze Powder");
+ text.add("§2Ingot: §0Any");
+ text.add(" This necklace gives");
+ text.add("you and those around");
+ text.add("you §4Fire Resistance§0");
+ text.add("when activated and in");
+ text.add("your inventory. To");
+ text.add("deactivate it simply");
+ text.add("right click with it.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 6:
+ text.add("Depending on the jewel");
+ text.add("used, you and the");
+ text.add("others get §4Fire");
+ text.add("§4Resistance§0 I if you");
+ text.add("haven't got any jewel,");
+ text.add("II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 7:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.sugar));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Sugar");
+ text.add("§2Ingot: §0Any");
+ text.add(" This necklace gives");
+ text.add("you and those around");
+ text.add("you §4Speed§0 when");
+ text.add("activated and in your");
+ text.add("inventory. To");
+ text.add("deactivate it simply");
+ text.add("right click with it.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 8:
+ text.add("Depending on the jewel");
+ text.add("used, you and the");
+ text.add("others get §4Speed§0 I");
+ text.add("if you haven't got any");
+ text.add("jewel, II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 9:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeIron));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Iron Pickaxe");
+ text.add("§2Ingot: §0Any");
+ text.add(" This necklace gives");
+ text.add("you and those around");
+ text.add("you §4Haste§0 when");
+ text.add("activated and in your");
+ text.add("inventory. To");
+ text.add("deactivate it simply");
+ text.add("right click with it.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 10:
+ text.add("Depending on the jewel");
+ text.add("used, you and the");
+ text.add("others get §4Haste§0 I");
+ text.add("if you haven't got any");
+ text.add("jewel, II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 11:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.feather));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Feather");
+ text.add("§2Ingot: §0Any");
+ text.add(" This necklace gives");
+ text.add("you and those around");
+ text.add("you §4Jump Boost§0 when");
+ text.add("activated and in your");
+ text.add("inventory. To");
+ text.add("deactivate it simply");
+ text.add("right click with it.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 12:
+ text.add("Depending on the jewel");
+ text.add("used, you and the");
+ text.add("others get §4Jump Boost");
+ text.add("I if you haven't got any");
+ text.add("jewel, II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 13:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.potion, 1, 8270));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §08min Potion of");
+ text.add("Invisibility");
+ text.add("§2Ingot: §0Any");
+ text.add(" This necklace gives");
+ text.add("you and those around");
+ text.add("you §4Invisibility§0 when");
+ text.add("activated and in your");
+ text.add("inventory. To");
+ text.add("deactivate it simply");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 14:
+ text.add("right click with it.");
+ text.add("Depending on the jewel");
+ text.add("used, you and the");
+ text.add("others get §4Invisibility§0 I");
+ text.add("if you haven't got any");
+ text.add("jewel, II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 15:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0){values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.dyePowder, 1, 15));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Bone Meal");
+ text.add("§2Ingot: §0Any");
+ text.add(" This hydrates the");
+ text.add("farm blocks under you");
+ text.add("in a defined area. If");
+ text.add("you right click with this,");
+ text.add("it will help plants in");
+ text.add("that area grow faster.");
+ text.add("The are it affects is");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 16:
+ text.add("determined by the jewel");
+ text.add("used. For none, the");
+ text.add("area is a block, diamond");
+ text.add("is 3x3, emerald 5x5 and");
+ text.add("nether star 11x11.");
+ text.add("§4§nAltar Effect");
+ text.add(" In the altar, this");
+ text.add("has the ability to");
+ text.add("hydrate any tilted land");
+ text.add("and speed up the");
+ text.add("growth of plants in a");
+ text.add("7x3x7 area.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 17:
+ JewelryNBT.addMetal(item, new ItemStack(ItemList.shadowIngot));
+ JewelryNBT.addJewel(item, new ItemStack(Item.netherStar));
+ JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeDiamond));
+
+ text.add("§2Jewel: §0Nether Star");
+ text.add("§2Modifier: §0Diamond Pick");
+ text.add("§2Ingot: §0Shadow Ingot");
+ text.add(" This will break all");
+ text.add("blocks in a 3x3x1 area.");
+ text.add("Just right click on a");
+ text.add("block and let the mining");
+ text.add("begin.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ default:;
+ }
+ }
+
+ public int getMaxPages()
+ {
+ return 17;
}
@Override
diff --git a/common/darkknight/jewelrycraft/container/GuiTabRings.java b/common/darkknight/jewelrycraft/container/GuiTabRings.java
index 1982fee..b821dd2 100644
--- a/common/darkknight/jewelrycraft/container/GuiTabRings.java
+++ b/common/darkknight/jewelrycraft/container/GuiTabRings.java
@@ -2,6 +2,7 @@ package darkknight.jewelrycraft.container;
import java.util.ArrayList;
+import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import darkknight.jewelrycraft.client.GuiGuide;
@@ -11,10 +12,11 @@ import darkknight.jewelrycraft.util.JewelrycraftUtil;
public class GuiTabRings extends GuiTab
{
-
+ int jValues;
public GuiTabRings(int id)
{
super("Rings", id);
+ jValues = 0;
}
public ItemStack getIcon()
@@ -29,6 +31,7 @@ public class GuiTabRings extends GuiTab
public void drawBackground(GuiGuide gui, int x, int y, int page)
{
ArrayList<String> text = new ArrayList<String>();
+ ArrayList<ItemStack> jewels = new ArrayList<ItemStack>();
ItemStack item = new ItemStack(ItemList.ring);
int xPos = (page%2==0)?107:-35;
switch(page)
@@ -53,12 +56,528 @@ public class GuiTabRings extends GuiTab
text.add("to se the position. Then");
text.add("right click any time you");
text.add("want to teleport there.");
- Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10);
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 2:
+ text.add("§4§nAltar Effect");
+ text.add(" If this ring is placed");
+ text.add("in the altar and if the");
+ text.add("ring has coordonates");
+ text.add("memorized, then anyone");
+ text.add("who steps on the block");
+ text.add("will get teleported in");
+ text.add("that location, as long");
+ text.add("as it is in the same");
+ text.add("dimension. This works");
+ text.add("for other entities as");
+ text.add("well, not just players.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 3:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
+ JewelryNBT.addModifier(item, new ItemStack(Item.bed));
+
+ text.add("§2Jewel: §0Ender Pearl");
+ text.add("§2Modifier: §0Bed");
+ text.add("§2Ingot: §0Any");
+ text.add(" Just like the other");
+ text.add("ring that had only an");
+ text.add("ender pearl as a jewel,");
+ text.add("by adding a bed as a");
+ text.add("modifier to it you can");
+ text.add("travel between");
+ text.add("dimensions.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 4:
+ text.add("§4§nAltar Effect");
+ text.add(" Just like the other");
+ text.add("one, when in the altar");
+ text.add("if somebody steps on");
+ text.add("the block they get");
+ text.add("teleported in that spot.");
+ text.add("The only difference is");
+ text.add("that you can teleport");
+ text.add("between dimesnions with");
+ text.add("this. It works for mobs");
+ text.add("and other entities as");
+ text.add("well.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 5:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.blazePowder));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Blaze Powder");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring grants you");
+ text.add("§4Fire Resistance§0 when");
+ text.add("activated and in your");
+ text.add("inventory. To deactivate");
+ text.add("it simply right click with");
+ text.add("it. Depending on the");
+ text.add("jewel you used, you");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 6:
+ text.add("get §4Fire Resistance§0 I");
+ text.add("if you haven't got any");
+ text.add("jewel, II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 7:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.sugar));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Sugar");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring grants you");
+ text.add("§4Speed§0 when activated");
+ text.add("and in your inventory.");
+ text.add("To deactivate it simply");
+ text.add("right click with it.");
+ text.add("Depending on the");
+ text.add("jewel you used, you");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 8:
+ text.add("get §4Speed§0 I if you");
+ text.add("haven't got any jewel,");
+ text.add("II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 9:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeIron));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Iron Pickaxe");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring grants you");
+ text.add("§4Haste§0 when activated");
+ text.add("and in your inventory.");
+ text.add("To deactivate it simply");
+ text.add("right click with it.");
+ text.add("Depending on the");
+ text.add("jewel you used, you");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 10:
+ text.add("get §4Haste§0 I if you");
+ text.add("haven't got any jewel,");
+ text.add("II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 11:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.feather));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §0Feather");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring grants you");
+ text.add("§4Jump Boost§0 when");
+ text.add("activated and in your");
+ text.add("inventory, as well as");
+ text.add("remove any fall damage.");
+ text.add("To deactivate it simply");
+ text.add("right click with it.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 12:
+ text.add("Depending on the jewel");
+ text.add("you used, you get");
+ text.add("§4Jump Boost§0 I if you");
+ text.add("haven't got any jewel,");
+ text.add("II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 13:
+ jewels.add(null);
+ jewels.add(new ItemStack(Item.diamond));
+ jewels.add(new ItemStack(Item.emerald));
+ jewels.add(new ItemStack(Item.netherStar));
+
+ if(del == 0) { values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > jewels.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, jewels.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.potion, 1, 8270));
+
+ text.add("§2Jewel: §0None, Diamond");
+ text.add("Emerald or Nether Star");
+ text.add("§2Modifier: §08min Potion of");
+ text.add("Invisibility");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring grants you");
+ text.add("§4Invisibility§0 when");
+ text.add("activated and in your");
+ text.add("inventory, as well as");
+ text.add("remove any fall damage.");
+ text.add("To deactivate it simply");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 14:
+ text.add("right click with it.");
+ text.add("Depending on the jewel");
+ text.add("you used, you get");
+ text.add("§4Invisibility§0 I if you");
+ text.add("haven't got any jewel,");
+ text.add("II for Diamond,");
+ text.add("III for Emerald and");
+ text.add("VIII for Nether Star.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 15:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.netherStar));
+ JewelryNBT.addModifier(item, new ItemStack(Item.book));
+
+ text.add("§2Jewel: §0Nether Star");
+ text.add("§2Modifier: §0Book");
+ text.add("§2Ingot: §0Any");
+ text.add(" This has the power");
+ text.add("to §5Enchant§0, §5Disenchant§0");
+ text.add("or even §5Transfer");
+ text.add("§5Enchantments§0. To");
+ text.add("change its mode simply");
+ text.add("right click it. However,");
+ text.add("this ring only works");
+ text.add("when it is being held.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 16:
+ text.add("§5§nDisenchanting§0");
+ text.add(" If the ring is held");
+ text.add("and an enchanted item");
+ text.add("is placed beside it in");
+ text.add("the hotbar, the ring");
+ text.add("will remove all the");
+ text.add("enchantments from the");
+ text.add("item and store them in");
+ text.add("enchanted books, which");
+ text.add("are placed in your");
+ text.add("inventory. Be careful");
+ text.add("however, because if");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 17:
+ text.add("there is no room in");
+ text.add("your inventory for the");
+ text.add("books, the enchantments");
+ text.add("will go in the void with");
+ text.add("no way of recovering");
+ text.add("them. Unfortunately,");
+ text.add("disenchanting is not");
+ text.add("free. It requires 2");
+ text.add("levels of experience");
+ text.add("per ench and some of");
+ text.add("your blood. It will also");
+ text.add("damage the item a bit.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 18:
+ text.add("§5§nEnchanting§0");
+ text.add(" This mode allows you");
+ text.add("to give a random");
+ text.add("enchantment to an item");
+ text.add("that can hold");
+ text.add("enchantments in the");
+ text.add("first place. However,");
+ text.add("each enchanting comes");
+ text.add("with a cost. The player");
+ text.add("is required to have at");
+ text.add("least 1 level of xp.");
+ text.add("The higher the number");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 19:
+ text.add("the better, as the level");
+ text.add("of the enchantment will");
+ text.add("be equal with the amount");
+ text.add("of levels, but this value");
+ text.add("can never go over 6.");
+ text.add("This gives allows people");
+ text.add("to get an enchantment");
+ text.add("of a higher value than");
+ text.add("normal (5 being the");
+ text.add("limit normally).");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 20:
+ text.add("§5§nEnchantment Transfer§0");
+ text.add(" This mode is very");
+ text.add("special as it lets you");
+ text.add("transfer enchantments");
+ text.add("from an item or block to");
+ text.add("another, not caring if");
+ text.add("the item/block can");
+ text.add("actually hold enchants.");
+ text.add("Just place the ench");
+ text.add("item on the left of the");
+ text.add("ring and to the right of");
+ text.add("the ring, the item you");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 21:
+ text.add("want to transfer the");
+ text.add("enchs to. The ring can");
+ text.add("only transfer an ench");
+ text.add("at a time, after each");
+ text.add("transfer it requiring a");
+ text.add("cooldown.");
+ text.add(" §4Again, this ring only");
+ text.add("§4works when it is in the");
+ text.add("§4players hotbar and");
+ text.add("§4being held!");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 22:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
+ JewelryNBT.addModifier(item, new ItemStack(Block.chest));
+
+ text.add("§2Jewel: §0Ender Pearl");
+ text.add("§2Modifier: §0Chest");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring can link");
+ text.add("to any chest and");
+ text.add("access its inventory.");
+ text.add("To link to a chest just");
+ text.add("crouch and right click");
+ text.add("on the one you want.");
+ text.add("Then right click again");
+ text.add("to open that inventory.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 23:
+ text.add("This only works if you");
+ text.add("are in range to the");
+ text.add("chest. You can go");
+ text.add("about 128 blocks");
+ text.add("before it stops");
+ text.add("working. After that");
+ text.add("a message will be");
+ text.add("displayed saying the");
+ text.add("amount of blocks you");
+ text.add("need to be closer in");
+ text.add("order for it to work");
+ text.add("again.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 24:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Block.obsidian));
+ JewelryNBT.addModifier(item, new ItemStack(Item.eyeOfEnder));
+
+ text.add("§2Jewel: §0Obsidian");
+ text.add("§2Modifier: §0Eye of Ender");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring is connected");
+ text.add("to your ender chest.");
+ text.add("Just right click it");
+ text.add("anywhere to open the");
+ text.add("ender chest gui.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 25:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.netherStar));
+ JewelryNBT.addModifier(item, new ItemStack(Block.chest));
+
+ text.add("§2Jewel: §0Nether Star");
+ text.add("§2Modifier: §0Chest");
+ text.add("§2Ingot: §0Any");
+ text.add(" This ring can store");
+ text.add("any entity in it. To do");
+ text.add("that right click an");
+ text.add("to store it in the ring");
+ text.add("(crouch and right click");
+ text.add("if right clicking the");
+ text.add("entity opens a GUI,");
+ text.add("such as villagers).");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 26:
+ text.add("Right click again on the");
+ text.add("ground to release the");
+ text.add("entity in that spot.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 27:
+ if(del == 0){values++; jValues++;}
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+ if(jValues > JewelrycraftUtil.jewel.size() - 1) jValues = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, JewelrycraftUtil.jewel.get(jValues));
+ JewelryNBT.addModifier(item, new ItemStack(Item.dyePowder, 1, 15));
+
+ text.add("§2Jewel: §0Any");
+ text.add("§2Modifier: §0Bone Meal");
+ text.add("§2Ingot: §0Any");
+ text.add(" While having it in");
+ text.add("the inventory it will");
+ text.add("hydrate any farmland");
+ text.add("you step on. If you");
+ text.add("right click with this");
+ text.add("on a plant, it will");
+ text.add("speed up the growth a");
+ text.add("bit. Better keep right");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 28:
+ text.add("clicking if you want to");
+ text.add("see an actual effect.");
+ text.add("§4§nAltar Effect");
+ text.add(" In the altar, the ring");
+ text.add("has the ability to");
+ text.add("hydrate any tilted land");
+ text.add("and speed up the");
+ text.add("growth of plants in a");
+ text.add("3x3x3 area.");
+ Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
+ break;
+ case 29:
+ if(del == 0) values++;
+ del++;
+ if(del >= 300) del = 0;
+ if(values > JewelrycraftUtil.metal.size() - 1) values = 0;
+
+ JewelryNBT.addMetal(item, JewelrycraftUtil.metal.get(values));
+ JewelryNBT.addJewel(item, new ItemStack(Item.enderPearl));
+ JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeDiamond));
+
+ text.add("§2Jewel: §0Ender Pearl");
+ text.add("§2Modifier: §0Diamond Pick");
+ text.add("§2Ingot: §0Any");
+ text.add(" You can right click");
+ text.add("any block (or crouch");
+ text.add("right click) to store");
+ text.add("that block inside it.");
+ text.add("Right click on the");
+ text.add("ground to place it");
+ text.add("there. It can also");
+ text.add("create golems/withers.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
+ break;
+ case 30:
+ JewelryNBT.addMetal(item, new ItemStack(ItemList.shadowIngot));
+ JewelryNBT.addJewel(item, new ItemStack(Item.netherStar));
+ JewelryNBT.addModifier(item, new ItemStack(Item.pickaxeDiamond));
+
+ text.add("§2Jewel: §0Nether Star");
+ text.add("§2Modifier: §0Diamond Pick");
+ text.add("§2Ingot: §0Shadow Ingot");
+ text.add(" Right clicking with");
+ text.add("this on any block will");
+ text.add("cause that block to");
+ text.add("break instantly.");
+ Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop(), item, text, 50f, 0, -10, false, 45, 0);
break;
default:;
}
}
+ public int getMaxPages()
+ {
+ return 30;
+ }
+
@Override
public void drawForeground(GuiGuide gui, int x, int y, int page)
{
diff --git a/common/darkknight/jewelrycraft/container/Page.java b/common/darkknight/jewelrycraft/container/Page.java
index f3b9622..7837b8d 100644
--- a/common/darkknight/jewelrycraft/container/Page.java
+++ b/common/darkknight/jewelrycraft/container/Page.java
@@ -16,7 +16,7 @@ public class Page
y+=5;
gui.getFont().drawString("§1§n" + items.get(0).getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(items.get(0).getDisplayName())/2) - 10, y - 2, 0);
GL11.glColor4f(1, 1, 1, 1);
- Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip1.png"));
+ Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip.png"));
ArrayList<String> name = new ArrayList<String>();
if(isSmall){
gui.drawTexturedModalRect(x, y + 10, 145, 54, 111, 46);
@@ -28,24 +28,28 @@ public class Page
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);
}
for(int i = 0; i < text.size(); i++) gui.getFont().drawString(text.get(i), x, y + 55 + i*12, 0);
}
@@ -57,54 +61,63 @@ public class Page
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 + 57, 30f);
name.add(items.get(7).getDisplayName());
if(mouseX >= x && mouseX <= x + 16 && mouseY >= y + 47 && mouseY <= y + 47 + 16) gui.drawHoverString(name, x + 8, y + 47);
name.removeAll(name);
+ GL11.glDisable(GL11.GL_LIGHTING);
}
if(items.size() > 8 && items.get(8) != null){
gui.renderItem(items.get(8), x + 28, y + 57, 30f);
name.add(items.get(8).getDisplayName());
if(mouseX >= x + 20 && mouseX <= x + 16 + 20 && mouseY >= y + 47 && mouseY <= y + 47 + 16) gui.drawHoverString(name, x + 28, y + 47);
name.removeAll(name);
+ GL11.glDisable(GL11.GL_LIGHTING);
}
if(items.size() > 9 && items.get(9) != null){
gui.renderItem(items.get(9), x + 45, y + 57, 30f);
name.add(items.get(9).getDisplayName());
if(mouseX >= x + 40 && mouseX <= x + 16 + 40 && mouseY >= y + 47 && mouseY <= y + 47 + 16) gui.drawHoverString(name, x + 45, y + 47);
name.removeAll(name);
+ GL11.glDisable(GL11.GL_LIGHTING);
}
for(int i = 0; i < text.size(); i++) gui.getFont().drawString(text.get(i), x, y + 62 + i*12, 0);
GL11.glColor4f(1, 1, 1, 1);
@@ -116,14 +129,14 @@ public class Page
ArrayList<String> name = new ArrayList<String>();
gui.getFont().drawString("§1§n" + items.get(1).getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(items.get(0).getDisplayName())/2), y + 2, 0);
GL11.glColor4f(1, 1, 1, 1);
- Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip1" +
- ".png"));
+ Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/guidePageFlip" + ".png"));
gui.drawTexturedModalRect(x, y + 10, 145, 100, 111, 46);
gui.renderItem(items.get(0), x + 13, y + 20 + 10, 50f);
name.add(items.get(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, 50f);
@@ -140,12 +153,12 @@ public class Page
for(int i = 0; i < text.size(); i++) gui.getFont().drawString(text.get(i), x, y + 30 + i*12, 0);
}
- public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, ArrayList<String> text, float size, int txtX, int txtY)
+ public static void addImageTextPage(GuiGuide gui, int x, int y, ItemStack item, ArrayList<String> text, float size, int txtX, int txtY, boolean showName, int imgX, int imgY)
{
y+=5;
- gui.getFont().drawString("§1§n" + item.getDisplayName(), x + Math.abs(70 - gui.getFont().getStringWidth(item.getDisplayName())/2) - 10, y + 2, 0);
+ if(showName) gui.getFont().drawString("§1§n" + 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);
+ gui.renderItem(item, x + 13 + imgX, y + 18 + imgY, size);
for(int i = 0; i < text.size(); i++) gui.getFont().drawString(text.get(i), x + txtX, y + 30 + txtY + i*12, 0);
}
diff --git a/common/darkknight/jewelrycraft/item/ItemNecklace.java b/common/darkknight/jewelrycraft/item/ItemNecklace.java
index 7559f53..1218191 100644
--- a/common/darkknight/jewelrycraft/item/ItemNecklace.java
+++ b/common/darkknight/jewelrycraft/item/ItemNecklace.java
@@ -118,17 +118,17 @@ public class ItemNecklace extends Item
return stack;
}
- @Override
- public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity)
- {
- if (!player.worldObj.isRemote && entity instanceof EntityLivingBase && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Block.chest)) && JewelryNBT.entity(stack, player) == null){
- JewelryNBT.addEntity(stack, entity);
- JewelryNBT.addEntityID(stack, entity);
- entity.setDead();
- JewelryNBT.addFakeEnchantment(stack);
- }
- return true;
- }
+// @Override
+// public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity)
+// {
+// if (!player.worldObj.isRemote && entity instanceof EntityLivingBase && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Block.chest)) && JewelryNBT.entity(stack, player) == null){
+// JewelryNBT.addEntity(stack, entity);
+// JewelryNBT.addEntityID(stack, entity);
+// entity.setDead();
+// JewelryNBT.addFakeEnchantment(stack);
+// }
+// return true;
+// }
/**
* allows items to add custom lines of information to the mouseover
@@ -220,14 +220,14 @@ public class ItemNecklace extends Item
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
{
- amplifier = 1D;
+ amplifier = 0D;
if (!world.isRemote)
{
EntityPlayer entityplayer = (EntityPlayer) entity;
int posX = (int)Math.floor(entityplayer.posX), posY = (int)Math.floor(entityplayer.posY), posZ = (int)Math.floor(entityplayer.posZ);
- if (JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond))) amplifier = 2D;
- else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.emerald))) amplifier = 3D;
+ if (JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond))) amplifier = 1D;
+ else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.emerald))) amplifier = 2D;
else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar))) amplifier = 5D;
if(JewelryNBT.isModifierX(stack, new ItemStack(Item.dyePowder, 1, 15)) && world.getBlockId(posX, posY - 1, posZ) == Block.tilledField.blockID)
diff --git a/common/darkknight/jewelrycraft/item/ItemRing.java b/common/darkknight/jewelrycraft/item/ItemRing.java
index 900039b..92416f4 100644
--- a/common/darkknight/jewelrycraft/item/ItemRing.java
+++ b/common/darkknight/jewelrycraft/item/ItemRing.java
@@ -161,7 +161,7 @@ public class ItemRing extends Item
public String getItemDisplayName(ItemStack stack)
{
- if (JewelryNBT.ingot(stack) != null && JewelryNBT.jewel(stack) != null && JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond)) && JewelryNBT.isIngotX(stack, new ItemStack(Item.ingotGold))) return "Wedding Ring";
+ if (JewelryNBT.ingot(stack) != null && JewelryNBT.jewel(stack) != null && JewelryNBT.modifier(stack) == null && JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond)) && JewelryNBT.isIngotX(stack, new ItemStack(Item.ingotGold))) return "Wedding Ring";
else if(JewelryNBT.ingot(stack) != null) return JewelryNBT.ingot(stack).getDisplayName().replace("Ingot", " ").trim() + " " + ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
}
@@ -394,7 +394,7 @@ public class ItemRing extends Item
else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar))) amplifier = 7;
if(JewelryNBT.isModifierX(stack, new ItemStack(Item.dyePowder, 1, 15)) && world.getBlockId(posX, posY - 1, posZ) == Block.tilledField.blockID)
- world.setBlockMetadataWithNotify(posX, posY - 1, posZ, 1, 2);
+ world.setBlockMetadataWithNotify(posX, posY - 1, posZ, 1, 7);
if(JewelryNBT.isModeX(stack, "Activated"))
{
@@ -429,8 +429,8 @@ public class ItemRing extends Item
if(entityplayer.inventory.getCurrentItem() != null && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Item.book)) && entityplayer.inventory.getCurrentItem().equals(stack))
{
ItemStack item = null;
- if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
- if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
+ if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
+ if(entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
if(item != null && JewelryNBT.isModeX(stack, "Disenchant"))
{
ItemStack enchBook = new ItemStack(Item.enchantedBook);
@@ -457,9 +457,9 @@ public class ItemRing extends Item
}
}
}
- if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && JewelryNBT.isModeX(stack, "Transfer"))
+ if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && JewelryNBT.isModeX(stack, "Transfer"))
{
- if(cooldown > 0) entityplayer.addChatMessage("Ring is currently cooling down (" + cooldown + ")");
+ if(cooldown > 0) entityplayer.addChatMessage("Ring is currently cooling down!");
ItemStack enchantedItem = null, enchantableItem = null;
if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted() && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null)
{
@@ -483,13 +483,13 @@ public class ItemRing extends Item
EnchantmentHelper.setEnchantments(resultItem, enchantableItem);
enchItem.remove(Integer.valueOf(e));
EnchantmentHelper.setEnchantments(enchItem, enchantedItem);
- cooldown = 1000;
+ cooldown = 50000;
}
}
}
}
- if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
- else if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
+ if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
+ else if(entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
if(item != null && !item.isItemEnchanted() && item.isItemEnchantable() && entityplayer.experienceLevel > 0 && JewelryNBT.isModeX(stack, "Enchant"))
{
Map enchItem = EnchantmentHelper.getEnchantments(item);
diff --git a/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java
index d8e4da2..50eb325 100644
--- a/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java
+++ b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java
@@ -28,6 +28,10 @@ public class CraftingRecipes
GameRegistry.addShapelessRecipe(new ItemStack(ItemList.crystal, 1, i), new Object[]{new ItemStack(ItemList.crystal, 1, 15), new ItemStack(Item.dyePowder, 1, i)});
GameRegistry.addShapelessRecipe(new ItemStack(ItemList.crystal, 1, 15), new Object[]{new ItemStack(ItemList.crystal, 1, i), new ItemStack(Item.dyePowder, 1, 15)});
}
+ GameRegistry.addShapelessRecipe(new ItemStack(ItemList.shadowIngot, 9), new Object[]{new ItemStack(BlockList.shadowBlock)});
+ GameRegistry.addShapelessRecipe(new ItemStack(ItemList.guide), new Object[]{new ItemStack(Item.book), new ItemStack(ItemList.molds, 1, 0)});
+ GameRegistry.addShapelessRecipe(new ItemStack(ItemList.guide), new Object[]{new ItemStack(Item.book), new ItemStack(ItemList.molds, 1, 1)});
+ GameRegistry.addShapelessRecipe(new ItemStack(ItemList.guide), new Object[]{new ItemStack(Item.book), new ItemStack(ItemList.molds, 1, 2)});
//Blocks
GameRegistry.addRecipe(new ItemStack(BlockList.molder), "x x", "xxx", 'x', Block.cobblestone);
diff --git a/resources/assets/jewelrycraft/textures/gui/guidePage.png b/resources/assets/jewelrycraft/textures/gui/guidePage.png
index c855048..c74dab2 100644
--- a/resources/assets/jewelrycraft/textures/gui/guidePage.png
+++ b/resources/assets/jewelrycraft/textures/gui/guidePage.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/gui/guidePage1.png b/resources/assets/jewelrycraft/textures/gui/guidePage1.png
deleted file mode 100644
index 9ffdf08..0000000
--- a/resources/assets/jewelrycraft/textures/gui/guidePage1.png
+++ /dev/null
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/gui/guidePageFlip.png b/resources/assets/jewelrycraft/textures/gui/guidePageFlip.png
index 418c472..0746861 100644
--- a/resources/assets/jewelrycraft/textures/gui/guidePageFlip.png
+++ b/resources/assets/jewelrycraft/textures/gui/guidePageFlip.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/gui/guidePageFlip1.png b/resources/assets/jewelrycraft/textures/gui/guidePageFlip1.png
deleted file mode 100644
index 9a0ef55..0000000
--- a/resources/assets/jewelrycraft/textures/gui/guidePageFlip1.png
+++ /dev/null
Binary files differ