summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-06-11 19:59:48 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-06-11 19:59:48 +0100
commit2f93a3de229a3351d91708cf60fbc9ab7a1be97f (patch)
treee5c60900d517d428e00946a7816ab67a75c0e3aa /src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
parente66ce0d4678e288d981f734fa7fdec8f9642545e (diff)
Improved color detection system by 10000000%! (not rly, but it's better
than b4)
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
index 4e20a43..1e68e34 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -1,7 +1,7 @@
package darkknight.jewelrycraft.block;
-import java.io.IOException;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -80,16 +80,9 @@ public class BlockSmelter extends BlockContainer
ItemStack metal = te.moltenMetal;
ItemStack item = te.moltenMetal;
if (Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(metal.getItem()) == Block.getIdFromBlock(Blocks.carpet)) metal.setItemDamage(15 - metal.getItemDamage());
- int color = 16777215;
JewelryNBT.addMetal(item, metal);
- try{
- color = ItemMoltenMetalBucket.color(item, 1);
- }
- catch(IOException e){
- e.printStackTrace();
- }
- JewelrycraftMod.saveData.setString(i + " " + j + " " + k + " " + world.provider.dimensionId, Item.getIdFromItem(metal.getItem()) + ":" + metal.getItemDamage() + ":" + color);
- JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, i, j, k, Item.getIdFromItem(metal.getItem()), metal.getItemDamage(), color));
+ JewelrycraftMod.saveData.setString(i + " " + j + " " + k + " " + world.provider.dimensionId, Item.getIdFromItem(metal.getItem()) + ":" + metal.getItemDamage());
+ JewelrycraftMod.netWrapper.sendToAll(new PacketSendLiquidData(world.provider.dimensionId, i, j, k, Item.getIdFromItem(metal.getItem()), metal.getItemDamage()));
world.setBlock(i, j, k, BlockList.moltenMetal, 0, 3);
int quant = (int)(te.quantity * 10);
if (quant == 1) world.setBlockMetadataWithNotify(i, j, k, 4, 3);