Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replaced blockActivated with onBlockActivated

Browse source
This commit is contained in:
Krapht 2012-08-11 21:56:42 +02:00
parent 77e694b5c8
commit 987bfde84d
13 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/builders/BlockArchitect.java
View file

@ -60,7 +60,7 @@ public class BlockArchitect extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
// Drop through if the player is sneaking
if (entityplayer.isSneaking())

3
common/buildcraft/builders/BlockBlueprintLibrary.java
View file

@ -38,7 +38,8 @@ public class BlockBlueprintLibrary extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9);
// Drop through if the player is sneaking
if (entityplayer.isSneaking())

2
common/buildcraft/builders/BlockBuilder.java
View file

@ -73,7 +73,7 @@ public class BlockBuilder extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
// Drop through if the player is sneaking
if (entityplayer.isSneaking())

2
common/buildcraft/builders/BlockFiller.java
View file

@ -45,7 +45,7 @@ public class BlockFiller extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
// Drop through if the player is sneaking
if (entityplayer.isSneaking())

2
common/buildcraft/builders/BlockMarker.java
View file

@ -78,7 +78,7 @@ public class BlockMarker extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
((TileMarker) world.getBlockTileEntity(i, j, k)).tryConnection();
return true;
}

3
common/buildcraft/energy/BlockEngine.java
View file

@ -68,7 +68,8 @@ public class BlockEngine extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
TileEngine tile = (TileEngine) world.getBlockTileEntity(i, j, k);
// Drop through if the player is sneaking

4
common/buildcraft/factory/BlockAutoWorkbench.java
View file

@ -45,8 +45,8 @@ public class BlockAutoWorkbench extends BlockBuildCraft {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
super.blockActivated(world, i, j, k, entityplayer);
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9);
// Drop through if the player is sneaking
if (entityplayer.isSneaking())

12
common/buildcraft/factory/BlockHopper.java
View file

@ -48,21 +48,21 @@ public class BlockHopper extends BlockBuildCraft {
}
@Override
public boolean blockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer) {
super.blockActivated(world, x, y, z, entityPlayer);
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9);
// Drop through if the player is sneaking
if (entityPlayer.isSneaking())
if (entityplayer.isSneaking())
return false;
if (entityPlayer.getCurrentEquippedItem() != null) {
if (entityPlayer.getCurrentEquippedItem().getItem() instanceof IItemPipe) {
if (entityplayer.getCurrentEquippedItem() != null) {
if (entityplayer.getCurrentEquippedItem().getItem() instanceof IItemPipe) {
return false;
}
}
if (!CoreProxy.isClient(world))
entityPlayer.openGui(mod_BuildCraftFactory.instance, GuiIds.HOPPER, world, x, y, z);
entityplayer.openGui(mod_BuildCraftFactory.instance, GuiIds.HOPPER, world, x, y, z);
return true;
}

2
common/buildcraft/factory/BlockQuarry.java
View file

@ -205,7 +205,7 @@ public class BlockQuarry extends BlockMachineRoot {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
TileQuarry tile = (TileQuarry) world.getBlockTileEntity(i, j, k);
// Drop through if the player is sneaking

2
common/buildcraft/factory/BlockRefinery.java
View file

@ -75,7 +75,7 @@ public class BlockRefinery extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
// Drop through if the player is sneaking
if (entityplayer.isSneaking())
return false;

2
common/buildcraft/factory/BlockTank.java
View file

@ -89,7 +89,7 @@ public class BlockTank extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null) {

2
common/buildcraft/silicon/BlockAssemblyTable.java
View file

@ -43,7 +43,7 @@ public class BlockAssemblyTable extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
// Drop through if the player is sneaking
if (entityplayer.isSneaking())
return false;

4
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -271,8 +271,8 @@ public class BlockGenericPipe extends BlockContainer {
}
@Override
public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
super.blockActivated(world, i, j, k, entityplayer);
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) {
super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9);
world.notifyBlocksOfNeighborChange(i, j, k, BuildCraftTransport.genericPipeBlock.blockID);