diff --git a/ee3_common/ee3/item/ItemPhilosopherStone.java b/ee3_common/ee3/item/ItemPhilosopherStone.java index 4310d6a3..093570e7 100644 --- a/ee3_common/ee3/item/ItemPhilosopherStone.java +++ b/ee3_common/ee3/item/ItemPhilosopherStone.java @@ -14,6 +14,7 @@ import net.minecraft.src.mod_EE3; */ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IItemModal { + private byte type; private byte currentCharge; private byte maxCharge; private byte currentMode; @@ -21,12 +22,36 @@ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IIt public ItemPhilosopherStone(int i) { super(i); + type = 1; maxCharge = 4; maxMode = 2; } + /** + * Gets an icon index based on an item's damage value + */ + public int getIconFromDamage(int par1) + { + return this.iconIndex + type; + } + + /* + * Returns the custom item rarity type for the item + * @see net.minecraft.src.Item#getRarity(net.minecraft.src.ItemStack) + */ public EnumRarity getRarity(ItemStack par1ItemStack) { - return mod_EE3.proxy.getCustomEnumRarityType(CustomItemRarity.RARE); + if (type == 1) + return mod_EE3.proxy.getCustomEnumRarityType(CustomItemRarity.RARE); + else + return mod_EE3.proxy.getCustomEnumRarityType(CustomItemRarity.MAGICAL); + } + + /* + * Gives the Philosopher Stone a nice visual effect + * @see net.minecraft.src.Item#hasEffect(net.minecraft.src.ItemStack) + */ + public boolean hasEffect(ItemStack par1ItemStack) { + return (this.type == 1); } @Override diff --git a/ee3_common/ee3/lib/Reference.java b/ee3_common/ee3/lib/Reference.java index 97cdc4dc..9ff3d594 100644 --- a/ee3_common/ee3/lib/Reference.java +++ b/ee3_common/ee3/lib/Reference.java @@ -14,7 +14,7 @@ public class Reference { public static final String CONFIG_DIR = "config/ee3/"; public static final String SPRITE_SHEET_LOCATION = "/ee3/art/sprites/"; - public static final String ITEM_SPRITE_SHEET = "eqexsheet.png"; + public static final String ITEM_SPRITE_SHEET = "ee3_items.png"; public static final String GUI_SHEET_LOCATION = "/ee3/art/gui/"; public static final String ARMOR_SHEET_LOCATION = "/ee3/art/armor/"; public static final String SOUND_RESOURCE_LOCATION = "/ee3/sound/"; diff --git a/resources/ee3/art/sprites/ee3_items.png b/resources/ee3/art/sprites/ee3_items.png new file mode 100644 index 00000000..f3090f38 Binary files /dev/null and b/resources/ee3/art/sprites/ee3_items.png differ