mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-12-23 11:49:23 +01:00
made the Leaf Blower blow away blocks at random again
This commit is contained in:
parent
e6bcf6d0c6
commit
ee45300303
2 changed files with 28 additions and 20 deletions
|
@ -31,6 +31,7 @@ import net.minecraft.util.MathHelper;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
public class ItemLeafBlower extends Item implements INameableItem{
|
public class ItemLeafBlower extends Item implements INameableItem{
|
||||||
|
|
||||||
|
@ -44,7 +45,7 @@ public class ItemLeafBlower extends Item implements INameableItem{
|
||||||
@Override
|
@Override
|
||||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int time){
|
public void onUsingTick(ItemStack stack, EntityPlayer player, int time){
|
||||||
if(!player.worldObj.isRemote){
|
if(!player.worldObj.isRemote){
|
||||||
if(time <= getMaxItemUseDuration(stack) && time % 2 == 0){
|
if(time <= getMaxItemUseDuration(stack) && (this.isAdvanced || time % 3 == 0)){
|
||||||
//Breaks the Blocks
|
//Breaks the Blocks
|
||||||
this.breakStuff(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ));
|
this.breakStuff(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ));
|
||||||
//Plays a Minecart sounds (It really sounds like a Leaf Blower!)
|
//Plays a Minecart sounds (It really sounds like a Leaf Blower!)
|
||||||
|
@ -61,34 +62,41 @@ public class ItemLeafBlower extends Item implements INameableItem{
|
||||||
* @param z The Z Position of the Player
|
* @param z The Z Position of the Player
|
||||||
*/
|
*/
|
||||||
public void breakStuff(World world, int x, int y, int z){
|
public void breakStuff(World world, int x, int y, int z){
|
||||||
|
ArrayList<WorldPos> breakPositions = new ArrayList<WorldPos>();
|
||||||
|
|
||||||
for(int reachX = -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue(); reachX < ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1; reachX++){
|
for(int reachX = -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue(); reachX < ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1; reachX++){
|
||||||
for(int reachZ = -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue(); reachZ < ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1; reachZ++){
|
for(int reachZ = -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue(); reachZ < ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1; reachZ++){
|
||||||
for(int reachY = (this.isAdvanced ? -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue() : -ConfigIntValues.LEAF_BLOWER_RANGE_UP.getValue()); reachY < (this.isAdvanced ? ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1 : ConfigIntValues.LEAF_BLOWER_RANGE_UP.getValue()+1); reachY++){
|
for(int reachY = (this.isAdvanced ? -ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue() : -ConfigIntValues.LEAF_BLOWER_RANGE_UP.getValue()); reachY < (this.isAdvanced ? ConfigIntValues.LEAF_BLOWER_RANGE_SIDES.getValue()+1 : ConfigIntValues.LEAF_BLOWER_RANGE_UP.getValue()+1); reachY++){
|
||||||
//The current Block to break
|
//The current Block to break
|
||||||
Block block = world.getBlock(x+reachX, y+reachY, z+reachZ);
|
Block block = world.getBlock(x+reachX, y+reachY, z+reachZ);
|
||||||
if(block != null && (block instanceof BlockBush || (this.isAdvanced && block.isLeaves(world, x+reachX, y+reachY, z+reachZ)))){
|
if(block != null && (block instanceof BlockBush || (this.isAdvanced && block.isLeaves(world, x+reachX, y+reachY, z+reachZ)))){
|
||||||
WorldPos theCoord = new WorldPos(world, x+reachX, y+reachY, z+reachZ);
|
breakPositions.add(new WorldPos(world, x+reachX, y+reachY, z+reachZ));
|
||||||
Block theBlock = world.getBlock(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
|
||||||
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
|
|
||||||
int meta = world.getBlockMetadata(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
|
||||||
//Gets all of the Drops the Block should have
|
|
||||||
drops.addAll(theBlock.getDrops(world, theCoord.getX(), theCoord.getY(), theCoord.getZ(), meta, 0));
|
|
||||||
|
|
||||||
//Deletes the Block
|
|
||||||
world.setBlockToAir(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
|
||||||
//Plays the Breaking Sound
|
|
||||||
world.playAuxSFX(2001, theCoord.getX(), theCoord.getY(), theCoord.getZ(), Block.getIdFromBlock(theBlock)+(meta << 12));
|
|
||||||
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!breakPositions.isEmpty()){
|
||||||
|
Collections.shuffle(breakPositions);
|
||||||
|
|
||||||
|
WorldPos theCoord = breakPositions.get(0);
|
||||||
|
Block theBlock = world.getBlock(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
||||||
|
|
||||||
|
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
|
||||||
|
int meta = world.getBlockMetadata(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
||||||
|
//Gets all of the Drops the Block should have
|
||||||
|
drops.addAll(theBlock.getDrops(world, theCoord.getX(), theCoord.getY(), theCoord.getZ(), meta, 0));
|
||||||
|
|
||||||
|
//Deletes the Block
|
||||||
|
world.setBlockToAir(theCoord.getX(), theCoord.getY(), theCoord.getZ());
|
||||||
|
//Plays the Breaking Sound
|
||||||
|
world.playAuxSFX(2001, theCoord.getX(), theCoord.getY(), theCoord.getZ(), Block.getIdFromBlock(theBlock)+(meta << 12));
|
||||||
|
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -498,7 +498,7 @@ booklet.actuallyadditions.chapter.wings.text.1=Sometimes, bats will drop <item>W
|
||||||
booklet.actuallyadditions.chapter.foods.name=Foodstuffs
|
booklet.actuallyadditions.chapter.foods.name=Foodstuffs
|
||||||
|
|
||||||
booklet.actuallyadditions.chapter.leafBlower.name=Leaf Blowers
|
booklet.actuallyadditions.chapter.leafBlower.name=Leaf Blowers
|
||||||
booklet.actuallyadditions.chapter.leafBlower.text.1=The <item>Leaf Blower<r> can blow away tall grass, flowers and other stuff around you when you <imp>hold right-click<r>. There is an <item>Advanced Leaf Blower<r>, which works like the basic one, except that it <imp>also breaks leaves<r>.
|
booklet.actuallyadditions.chapter.leafBlower.text.1=The <item>Leaf Blower<r> can blow away tall grass, flowers and other stuff around you when you <imp>hold right-click<r>. There is an <item>Advanced Leaf Blower<r>, which works like the basic one, except that it operates <imp>much faster<r> and <imp>also breaks Leaves<r>.
|
||||||
|
|
||||||
booklet.actuallyadditions.chapter.aiots.name=All-In-One-Tools (AIOTs)
|
booklet.actuallyadditions.chapter.aiots.name=All-In-One-Tools (AIOTs)
|
||||||
booklet.actuallyadditions.chapter.aiots.text.1=An <item>All-In-One-Tool<r> is a tool that is <imp>Pickaxe, Axe, Shovel, Sword and Hoe in one<r>. They are available in every material and if you have <imp>Thermal Foundation<r> or <imp>MekanismTools<r> installed, there are even AIOTs made of their materials!
|
booklet.actuallyadditions.chapter.aiots.text.1=An <item>All-In-One-Tool<r> is a tool that is <imp>Pickaxe, Axe, Shovel, Sword and Hoe in one<r>. They are available in every material and if you have <imp>Thermal Foundation<r> or <imp>MekanismTools<r> installed, there are even AIOTs made of their materials!
|
||||||
|
|
Loading…
Reference in a new issue