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

updating ignore

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2017-04-01 20:29:36 -04:00
parent 3eb0df434c
commit bd140502f5
2 changed files with 54 additions and 47 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

95
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,65 +246,66 @@ 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;
for (int z = 0; z < 5; z++) { for (int z = 0; z < 5; z++) {
for (int x = 0; x < 5; x++) { for (int x = 0; x < 5; x++) {
if (hitx >= this.getNormalMin(x) && hitx <= this.getNormalMax(x)) { if (hitx >= this.getNormalMin(x) && hitx <= this.getNormalMax(x)) {
if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) { if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) {
doWork(pItem, counter, tile, world, pos, player); doWork(pItem, counter, tile, world, pos, player);
return true; return true;
}
}
counter++;
} }
} }
counter++;
} }
if (state.getValue(FACING) == EnumFacing.SOUTH) { }
int counter = 0; }
for (int z = 0; z < 5; z++) { if (state.getValue(FACING) == EnumFacing.SOUTH) {
for (int x = 0; x < 5; x++) { int counter = 0;
if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) { for (int z = 0; z < 5; z++) {
if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) { for (int x = 0; x < 5; x++) {
doWork(pItem, counter, tile, world, pos, player); if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) {
return true; if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) {
} doWork(pItem, counter, tile, world, pos, player);
} return true;
counter++;
} }
} }
counter++;
} }
if (state.getValue(FACING) == EnumFacing.WEST) { }
int counter = 0; }
for (int x = 0; x < 5; x++) { if (state.getValue(FACING) == EnumFacing.WEST) {
for (int z = 0; z < 5; z++) { int counter = 0;
if (hitx >= this.getNormalMin(x) && hitx <= this.getNormalMax(x)) { for (int x = 0; x < 5; x++) {
if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) { for (int z = 0; z < 5; z++) {
doWork(pItem, counter, tile, world, pos, player); if (hitx >= this.getNormalMin(x) && hitx <= this.getNormalMax(x)) {
return true; if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) {
} doWork(pItem, counter, tile, world, pos, player);
} return true;
counter++;
} }
} }
counter++;
} }
if (state.getValue(FACING) == EnumFacing.EAST) { }
int counter = 0; }
for (int x = 0; x < 5; x++) { if (state.getValue(FACING) == EnumFacing.EAST) {
for (int z = 0; z < 5; z++) { int counter = 0;
if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) { for (int x = 0; x < 5; x++) {
if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) { for (int z = 0; z < 5; z++) {
doWork(pItem, counter, tile, world, pos, player); if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) {
return true; if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) {
} doWork(pItem, counter, tile, world, pos, player);
} return true;
counter++;
} }
} }
counter++;
} }
}
}
} }
} }
return false; return false;