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

Merge branch 'featureMoreIron'

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2017-04-01 21:29:56 -04:00
parent 9f1f8e4f91 efc3a2b7f9
commit 0c93042f9e
3 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -19,7 +19,11 @@ forge-*-changelog.txt
1.11/usernamecache.json 1.11/usernamecache.json
1.11/options.txt 1.11/options.txt
*.DS_Store *.DS_Store
*.iml
*.ipr
*.iws
1.11/eula.txt
1.11/server.properties
# eclipse # eclipse
bin bin

7
1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java
View File

@@ -94,6 +94,8 @@ public class Anvil extends CustomContainerFacing {
//System.out.println("Tile is not null"); //System.out.println("Tile is not null");
//if ((player.inventory.getCurrentItem().getItem().equals(PrimalItems.STONE_GALLAGHER)) || (player.inventory.getCurrentItem().getItem() == ModItems.forgehammer)) { //if ((player.inventory.getCurrentItem().getItem().equals(PrimalItems.STONE_GALLAGHER)) || (player.inventory.getCurrentItem().getItem() == ModItems.forgehammer)) {
if ((pItem.getItem() instanceof WorkMallet) || (pItem.getItem() == ModItems.forgehammer)) { if ((pItem.getItem() instanceof WorkMallet) || (pItem.getItem() == ModItems.forgehammer)) {
@@ -244,6 +246,9 @@ public class Anvil extends CustomContainerFacing {
if ( (!(pItem.getItem() instanceof WorkMallet)) || (!(pItem.getItem() instanceof ForgeHammer)) ) { if ( (!(pItem.getItem() instanceof WorkMallet)) || (!(pItem.getItem() instanceof ForgeHammer)) ) {
if(Block.getBlockFromItem(pItem.getItem()) instanceof IngotBall) {
return false;
}
if (state.getValue(FACING) == EnumFacing.NORTH) { if (state.getValue(FACING) == EnumFacing.NORTH) {
int counter = 0; int counter = 0;
@@ -301,8 +306,6 @@ public class Anvil extends CustomContainerFacing {
} }
} }
} }
} }
} }
return false; return false;

2
1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java
View File

@@ -106,7 +106,7 @@ public class ModBlocks {
//CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1)); //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
return true; return true;
} }
if (pItem.equals(PrimalItems.STONE_GALLAGHER) || pItem.equals(ModItems.forgehammer)) { if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) {
if(world.getBlockState(belowPos).getBlock().equals(ModBlocks.stoneanvil)) { if(world.getBlockState(belowPos).getBlock().equals(ModBlocks.stoneanvil)) {