icons and bugs

src/main/java/com/kitsu/medievalcraft/Main.java

@@ -55,7 +55,7 @@ public class Main {
 
 	public static final String MODID = "kitsumedievalcraft";
 	public static final String MODNAME = "ForgeCraft";
-	public static final String VERSION = "2.2.4";
+	public static final String VERSION = "2.2.5";
 
 	public static SimpleNetworkWrapper sNet;
 

src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java

@@ -68,9 +68,18 @@ public abstract class IngotBase extends BlockContainer {
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int aa, float bb, float cc, float ff){
 		//System.out.println(this.getUnlocalizedName());
-		if(player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){
+		
+			//if(player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){
 			int a = player.inventory.currentItem;
-			if(player.inventory.getStackInSlot(a)!=null){
+			if(player.inventory.getStackInSlot(a)==null){
+				ItemStack jar = new ItemStack(this);
+				player.inventory.setInventorySlotContents(a, jar);
+				if(!world.isRemote){
+					world.setBlock(x, y, z, Blocks.air, 0, 2);
+				}
+				return true;
+			}
+			if(player.inventory.getStackInSlot(a)!=null && player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){
 				if(player.inventory.getStackInSlot(a).getItem()==Item.getItemFromBlock(this)){
 					ItemStack jar = new ItemStack(this);
 					player.inventory.addItemStackToInventory(jar);
@@ -80,15 +89,8 @@ public abstract class IngotBase extends BlockContainer {
 				}
 				return true;
 			}
-			if(player.inventory.getStackInSlot(a)==null){
-				ItemStack jar = new ItemStack(this);
-				player.inventory.setInventorySlotContents(a, jar);
-				if(!world.isRemote){
-					world.setBlock(x, y, z, Blocks.air, 0, 2);
-				}
-				return true;
-			}
-		}
+
+		
 		return false;
 	}
 

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "kitsumedievalcraft",
   "name": "ForgeCraft",
   "description": "ForgeCraft",
-  "version": "{2.2.4}",
+  "version": "{2.2.5}",
   "mcversion": "{1.7.10}",
   "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging",
   "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",