nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

icons and bugs

Browse Source
This commit is contained in:
KitsuShadow
2015-07-20 19:56:05 -04:00
parent 67060294a6
commit 99e0300b7d
83 changed files with 103 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/kitsu/medievalcraft/Main.java
View File

@@ -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;

24
src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java
View File

@@ -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;
}