Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-26 21:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Use getStateID for playAuxSFX

Browse source
This commit is contained in:
Ellpeck 2016-01-23 23:29:19 +01:00
parent fbc5c5240d
commit 7a6fda911f
9 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java
View file

@ -53,7 +53,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{
//Set New Block
if(!ConfigValues.lessBlockBreakingEffects){
world.playAuxSFX(2001, pos, Block.getIdFromBlock(block)+(PosUtil.getMetadata(pos, world) << 12));
world.playAuxSFX(2001, pos, Block.getStateId(world.getBlockState(pos)));
}
PosUtil.setBlock(pos, world, InitBlocks.blockGiantChest, 0, 2);

8
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java
View file

@ -106,17 +106,17 @@ public class ItemLeafBlower extends ItemBase{
Block theBlock = PosUtil.getBlock(theCoord, world);
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
int meta = PosUtil.getMetadata(theCoord, world);
//Gets all of the Drops the Block should have
drops.addAll(theBlock.getDrops(world, theCoord, world.getBlockState(theCoord), 0));
//Deletes the Block
world.setBlockToAir(theCoord);
//Plays the Breaking Sound
if(!ConfigValues.lessBlockBreakingEffects){
world.playAuxSFX(2001, theCoord, Block.getIdFromBlock(theBlock)+(meta << 12));
world.playAuxSFX(2001, theCoord, Block.getStateId(world.getBlockState(theCoord)));
}
//Deletes the Block
world.setBlockToAir(theCoord);
for(ItemStack theDrop : drops){
//Drops the Items into the World
world.spawnEntityInWorld(new EntityItem(world, theCoord.getX()+0.5, theCoord.getY()+0.5, theCoord.getZ()+0.5, theDrop));

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java
View file

@ -47,7 +47,7 @@ public class LensNone extends Lens{
ItemStack output = outputs.get(0);
if(output.getItem() instanceof ItemBlock){
if(!ConfigValues.lessBlockBreakingEffects){
tile.getWorldObject().playAuxSFX(2001, pos, Block.getIdFromBlock(PosUtil.getBlock(pos, tile.getWorldObject()))+(PosUtil.getMetadata(pos, tile.getWorldObject()) << 12));
tile.getWorldObject().playAuxSFX(2001, pos, Block.getStateId(tile.getWorldObject().getBlockState(pos)));
}
PosUtil.setBlock(pos, tile.getWorldObject(), Block.getBlockFromItem(output.getItem()), output.getItemDamage(), 2);
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
View file

@ -82,7 +82,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst
if(WorldUtil.addToInventory(this, drops, false, true)){
if(!ConfigValues.lessBlockBreakingEffects){
worldObj.playAuxSFX(2001, coordsBlock, Block.getIdFromBlock(blockToBreak)+(meta << 12));
worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(worldObj.getBlockState(coordsBlock)));
}
WorldUtil.breakBlockAtSide(sideToManipulate, worldObj, this.pos);
WorldUtil.addToInventory(this, drops, true, true);

3
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
View file

@ -73,12 +73,11 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem
Block blockToBreak = PosUtil.getBlock(coordsBlock, worldObj);
if(blockToBreak != null && !(blockToBreak instanceof BlockAir) && blockToBreak.getBlockHardness(worldObj, pos) > -1.0F){
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
int meta = PosUtil.getMetadata(coordsBlock, worldObj);
drops.addAll(blockToBreak.getDrops(worldObj, coordsBlock, worldObj.getBlockState(coordsBlock), 0));
if(WorldUtil.addToInventory(this, drops, false, true)){
if(!ConfigValues.lessBlockBreakingEffects){
worldObj.playAuxSFX(2001, coordsBlock, Block.getIdFromBlock(blockToBreak)+(meta << 12));
worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(worldObj.getBlockState(coordsBlock)));
}
WorldUtil.breakBlockAtSide(sideToManipulate, worldObj, this.getPos(), i);
WorldUtil.addToInventory(this, drops, true, true);

4
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java
View file

@ -65,10 +65,8 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr
Collections.shuffle(breakPositions);
BlockPos theCoord = breakPositions.get(0);
Block theBlock = PosUtil.getBlock(theCoord, worldObj);
int meta = PosUtil.getMetadata(theCoord, worldObj);
if(!ConfigValues.lessBlockBreakingEffects){
this.worldObj.playAuxSFX(2001, theCoord, Block.getIdFromBlock(theBlock)+(meta << 12));
this.worldObj.playAuxSFX(2001, theCoord, Block.getStateId(worldObj.getBlockState(theCoord)));
}
this.worldObj.setBlockToAir(theCoord);

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java
View file

@ -87,7 +87,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR
if(WorldUtil.addToInventory(this, drops, false, true)){
if(!ConfigValues.lessBlockBreakingEffects){
worldObj.playAuxSFX(2001, pos, Block.getIdFromBlock(block)+(meta << 12));
worldObj.playAuxSFX(2001, pos, Block.getStateId(worldObj.getBlockState(pos)));
}
worldObj.setBlockToAir(pos);

3
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java
View file

@ -102,12 +102,11 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements
Block blockToBreak = PosUtil.getBlock(boundPosition, worldObj);
if(blockToBreak != null && blockToBreak.getBlockHardness(worldObj, boundPosition) > -1.0F){
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
int meta = PosUtil.getMetadata(boundPosition, worldObj);
drops.addAll(blockToBreak.getDrops(worldObj, boundPosition, worldObj.getBlockState(boundPosition), 0));
if(WorldUtil.addToInventory(this, drops, false, true)){
if(!ConfigValues.lessBlockBreakingEffects){
worldObj.playAuxSFX(2001, this.boundPosition, Block.getIdFromBlock(blockToBreak)+(meta << 12));
worldObj.playAuxSFX(2001, this.boundPosition, Block.getStateId(worldObj.getBlockState(this.boundPosition)));
}
worldObj.setBlockToAir(this.boundPosition);
WorldUtil.addToInventory(this, drops, true, true);

2
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -366,7 +366,7 @@ public class WorldUtil{
}
else{
//Shows the Harvest Particles and plays the Block's Sound
world.playAuxSFX(2001, pos, Block.getIdFromBlock(block)+(meta << 12));
world.playAuxSFX(2001, pos, Block.getStateId(state));
}
//If the Block was actually "removed", meaning it will drop an Item