summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-05-24 19:10:19 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-05-24 19:10:19 +0100
commitae89bf1f9d0e93d249162011416246298fe763f0 (patch)
tree7b41deea2b61bd4ff2388efb223c59f52fb561ea /src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
parent225ae96f35d34393f25a8ea329745d2c678fe586 (diff)
Crystals!!!
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index dcf7804..41a44e1 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -11,13 +11,13 @@ import java.util.List;
import java.util.Map;
import javax.imageio.ImageIO;
import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
@@ -89,7 +89,7 @@ public abstract class ItemBaseJewelry extends Item
int color = getMostCommonColour(m);
if (JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1) != 16777215) JewelryNBT.addIngotColor(stack, JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1));
else JewelryNBT.addIngotColor(stack, color);
- }else if (pass == 1 && stack != null && JewelryNBT.gem(stack) != null && JewelryNBT.gem(stack).getIconIndex() != null && JewelryNBT.gem(stack) != null){
+ }else if (pass == 1 && stack != null && stack.getItem() != null && JewelryNBT.gem(stack) != null && !(Block.getBlockFromItem(JewelryNBT.gem(stack).getItem()) instanceof BlockAir) && JewelryNBT.gem(stack).getIconIndex() != null){
ItemStack gem = JewelryNBT.gem(stack);
icon = ImageIO.read(rm.getResource(getLocation(gem, stack, true)).getInputStream());
int height = icon.getHeight();