improved jars are correctly placed after picking them up. Also cleaned up recipe registration

2 files changed, 9 insertions, 10 deletions

diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index b8f22db022..7b795d2401 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -4,10 +4,11 @@ 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;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import items.Item_ThaumiumReinforcedJarFilled;
+import items.Item_IchorJarFilled;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -17,7 +18,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.blocks.BlockJar;
-import thaumcraft.common.tiles.TileJarFillableVoid;
 
 public class Block_IchorJar extends BlockJar {
 	
@@ -61,7 +61,7 @@ public class Block_IchorJar extends BlockJar {
 		if(meta == 0) {
 			return new TE_IchorJar();
 		} else if (meta == 3) {
-			return new TileJarFillableVoid();
+			return new TE_IchorVoidJar();
 		} else {
 			return null;
 		}
@@ -75,18 +75,18 @@ public class Block_IchorJar extends BlockJar {
 		
 		final TileEntity te = world.getTileEntity(x, y, z);
 		if(te != null && te instanceof TE_IchorJar) {
-			drop = new ItemStack(Item_ThaumiumReinforcedJarFilled.getInstance());
+			drop = new ItemStack(Item_IchorJarFilled.getInstance());
 			// Empty and no label
 			if(((TE_IchorJar) te).amount <= 0 && ((TE_IchorJar) te).aspectFilter == null) {
 				drop = new ItemStack(this);
 			}
 			// If is void jar, set meta
-			if(te instanceof TileJarFillableVoid) {
+			if(te instanceof TE_IchorVoidJar) {
 				drop.setItemDamage(3);
 			}
 			// Non empty, generate filled jar item with contents
 			if(((TE_IchorJar) te).amount > 0) {
-				((Item_ThaumiumReinforcedJarFilled) drop.getItem()).setAspects(drop,
+				((Item_IchorJarFilled) drop.getItem()).setAspects(drop,
 						(new AspectList()).add(((TE_IchorJar) te).aspect, ((TE_IchorJar) te).amount));
 			}
 			// has label
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index d4777a8cfe..7811b67233 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import common.tileentities.TE_ThaumiumReinforcedJar;
+import common.tileentities.TE_ThaumiumReinforcedVoidJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -17,7 +18,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.blocks.BlockJar;
-import thaumcraft.common.tiles.TileJarFillableVoid;
 
 public class Block_ThaumiumReinforcedJar extends BlockJar {
 	
@@ -61,7 +61,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
 		if(meta == 0) {
 			return new TE_ThaumiumReinforcedJar();
 		} else if (meta == 3) {
-			return new TileJarFillableVoid();
+			return new TE_ThaumiumReinforcedVoidJar();
 		} else {
 			return null;
 		}
@@ -81,7 +81,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
 				drop = new ItemStack(this);
 			}
 			// If is void jar, set meta
-			if(te instanceof TileJarFillableVoid) {
+			if(te instanceof TE_ThaumiumReinforcedVoidJar) {
 				drop.setItemDamage(3);
 			}
 			// Non empty, generate filled jar item with contents
@@ -100,5 +100,4 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
 		}
 		return drops;
 	}
-	
 }