Merge pull request #15 from bartimaeusnek/VoidJarFix

Fixed Void Jar dupe

2 files changed, 22 insertions, 21 deletions

diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index c64770485b..09e9edf427 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -1,8 +1,5 @@
 package common.blocks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import common.tileentities.TE_IchorJar;
 import common.tileentities.TE_IchorVoidJar;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -11,6 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -19,9 +17,13 @@ import net.minecraft.world.World;
 import thaumcraft.common.blocks.BlockJar;
 import thaumcraft.common.config.ConfigBlocks;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class Block_IchorJar extends BlockJar {
 	
-	private static Block_IchorJar instance;
+	private static final Block_IchorJar INSTANCE = new Block_IchorJar();
 	
 	private Block_IchorJar() {
 		super();
@@ -29,17 +31,13 @@ public class Block_IchorJar extends BlockJar {
 		super.setHardness(20.0F);
 		super.setResistance(3.0f);
 	}
-	
+
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_IchorJar();
-		}
-		
 		final String blockName = "kekztech_ichorjar_block";
-		instance.setBlockName(blockName);
-		GameRegistry.registerBlock(instance, blockName);
+		INSTANCE.setBlockName(blockName);
+		GameRegistry.registerBlock(INSTANCE, blockName);
 		
-		return instance;
+		return INSTANCE;
 	}
 	
 	@Override
@@ -75,13 +73,14 @@ public class Block_IchorJar extends BlockJar {
 	@Override
 	public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
 		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te != null && te instanceof TE_IchorJar) {
-			if(((TE_IchorJar) te).amount > 0) {
+		if(te instanceof TE_IchorJar) {
+			TE_IchorJar ite = (TE_IchorJar) te;
+			if(ite.amount > 0) {
 				// Create a decent explosion in the center of the block (TNT has strength 4.0F)
 				world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, 6.0F, false);
 				
 				// Place a lot of Flux in the area
-				final int limit = ((TE_IchorJar) te).amount / 16;
+				final int limit = ite.amount / 16;
 				int created = 0;
 				for(int i = 0; i < 200; i++) {
 					final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
@@ -104,14 +103,16 @@ public class Block_IchorJar extends BlockJar {
 		
 		super.breakBlock(world, x, y, z, par5, par6);
 	}
-	
+
 	@Override
 	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
-		final ArrayList<ItemStack> drops = new ArrayList<>();
-		drops.add(new ItemStack(this, 1, (meta == 3) ? 3 : 0));
-		return drops;
+		return new ArrayList<>(Collections.singleton(new ItemStack(this, 1, (meta == 3) ? 3 : 0)));
 	}
-	
+
+	@Override
+	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
+	}
+
 	@Override
 	public boolean canDropFromExplosion(Explosion e) {
 		return false;
diff --git a/src/main/java/common/tileentities/TE_IchorVoidJar.java b/src/main/java/common/tileentities/TE_IchorVoidJar.java
index cf555d1141..6644461a88 100644
--- a/src/main/java/common/tileentities/TE_IchorVoidJar.java
+++ b/src/main/java/common/tileentities/TE_IchorVoidJar.java
@@ -4,7 +4,7 @@ import thaumcraft.common.tiles.TileJarFillableVoid;
 
 public class TE_IchorVoidJar extends TileJarFillableVoid {
 	
-	public  TE_IchorVoidJar() {
+	public TE_IchorVoidJar() {
 		super.maxAmount = 4096;
 	}
 }