Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Made the drill's 5x5 upgrade mine out a five by five one block higher so that people stop bitching about it

Browse source
This commit is contained in:
Ellpeck 2016-07-28 18:09:48 +02:00
parent bfac50b2cd
commit b26c74c23a
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
View file

@ -255,23 +255,29 @@ public class ItemDrill extends ItemEnergy{
} }
} }
//Block hit
RayTraceResult ray = WorldUtil.getNearestBlockWithDefaultReachDistance(player.worldObj, player);
if(ray != null){
int side = ray.sideHit.ordinal();
//Breaks the Blocks //Breaks the Blocks
if(!player.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){ if(!player.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){
if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){ if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){
toReturn = this.breakBlocks(stack, 2, player.worldObj, pos, player); toReturn = this.breakBlocks(stack, 2, player.worldObj, side != 0 && side != 1 ? pos.up() : pos, side, player);
} }
else{ else{
toReturn = this.breakBlocks(stack, 1, player.worldObj, pos, player); toReturn = this.breakBlocks(stack, 1, player.worldObj, pos, side, player);
} }
} }
else{ else{
toReturn = this.breakBlocks(stack, 0, player.worldObj, pos, player); toReturn = this.breakBlocks(stack, 0, player.worldObj, pos, side, player);
} }
//Removes Enchantments added above //Removes Enchantments added above
ItemUtil.removeEnchantment(stack, Enchantments.SILK_TOUCH); ItemUtil.removeEnchantment(stack, Enchantments.SILK_TOUCH);
ItemUtil.removeEnchantment(stack, Enchantments.FORTUNE); ItemUtil.removeEnchantment(stack, Enchantments.FORTUNE);
} }
}
return toReturn; return toReturn;
} }
@ -414,19 +420,12 @@ public class ItemDrill extends ItemEnergy{
* @param world The World * @param world The World
* @param player The Player who breaks the Blocks * @param player The Player who breaks the Blocks
*/ */
public boolean breakBlocks(ItemStack stack, int radius, World world, BlockPos aPos, EntityPlayer player){ public boolean breakBlocks(ItemStack stack, int radius, World world, BlockPos aPos, int side, EntityPlayer player){
int xRange = radius; int xRange = radius;
int yRange = radius; int yRange = radius;
int zRange = 0; int zRange = 0;
//Block hit
RayTraceResult pos = WorldUtil.getNearestBlockWithDefaultReachDistance(world, player);
if(pos == null){
return false;
}
//Corrects Blocks to hit depending on Side of original Block hit //Corrects Blocks to hit depending on Side of original Block hit
int side = pos.sideHit.ordinal();
if(side == 0 || side == 1){ if(side == 0 || side == 1){
zRange = radius; zRange = radius;
yRange = 0; yRange = 0;