Lots of fixes and improvements

2 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
index b6d10c1..f15b794 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
@@ -244,7 +244,7 @@ public class BlockMoltenMetal extends BlockFluidClassic {
                 red = (icon.getRGB(x, y) >> 16) & 0xFF;
                 green = (icon.getRGB(x, y) >> 8) & 0xFF;
                 blue = icon.getRGB(x, y) & 0xFF;
-                if((red <= 80 && green <= 80 && blue <= 80) || (red >= 180 && green >= 180 && blue >= 180))
+                if(!isColorPretty(red, green, blue))
                 {
                     if(x<icon.getTileWidth()-1) x++;
                     if(x>=icon.getTileWidth()-1 && y<icon.getTileWidth()-1)
@@ -262,6 +262,12 @@ public class BlockMoltenMetal extends BlockFluidClassic {
         return 16777215;
     }
     
+    public static boolean isColorPretty(int r, int g, int b)
+    {
+        if(r > 80 || g > 80 || b > 80 || (r > 80 && g > 80 && b > 80 && r < 180 && b < 180 && g < 180)) return true;
+        return false;
+    }
+    
     public static String coords(int x, int y, int z)
     {
     	return String.valueOf(x) + " " + String.valueOf(y) + " " + String.valueOf(z);
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
index 1f04bce..c88798b 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -71,7 +71,7 @@ public class BlockSmelter extends BlockContainer
         {
             int index = -1;
             for(int a = 0; a < JewelrycraftUtil.jamcraftPlayers.size(); a++) if(entityPlayer.getDisplayName().equals(JewelrycraftUtil.jamcraftPlayers.get(a))) index = a;
-            if (!te.hasMetal && !te.hasMoltenMetal && !te.pouring && item != null && (item.getUnlocalizedName().toLowerCase().contains("ingot") || index != -1) && !item.getUnlocalizedName().toLowerCase().contains("mold"))
+            if (!te.hasMetal && !te.hasMoltenMetal && !te.pouring && item != null && (item.getUnlocalizedName().toLowerCase().contains("ingot") || item.getUnlocalizedName().toLowerCase().contains("alloy") || index != -1) && !item.getUnlocalizedName().toLowerCase().contains("mold"))
             {
                 entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.nowsmeltingingot", item.getDisplayName())));
                 te.metal = item.copy();