diff options
Diffstat (limited to 'src/main/java/com/sosnitzka/taiga/traits')
33 files changed, 149 insertions, 72 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index f837873..3c0db7a 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -29,7 +29,8 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onXpDrop(LivingExperienceDropEvent event) { EntityPlayer player = event.getAttackingPlayer(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() > 0) { + if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) + && event.getDroppedExperience() > 0) { event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience())); } } @@ -37,7 +38,8 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); - if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() > 0) { + if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player + .getHeldItemMainhand()), this.identifier) && event.getExpToDrop() > 0) { event.setExpToDrop(this.getUpdateXP(event.getExpToDrop())); } } @@ -47,14 +49,16 @@ public class TraitAnalysing extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (random.nextFloat() < .1f && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (!w.isRemote && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (!w.isRemote && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe + (player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } } private int getUpdateXP(int xp) { - float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextInt(xp) * (1 + random.nextFloat())); + float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextInt(xp) * (1 + + random.nextFloat())); return Math.round(exp); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java index 357a0bd..121d8b8 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitArcane.java @@ -30,7 +30,8 @@ public class TraitArcane extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { int time = (int) world.getWorldTime(); if (random.nextFloat() <= 0.05 && isNight(time)) { ToolHelper.healTool(tool, random.nextInt(8) + 1, null); @@ -38,7 +39,8 @@ public class TraitArcane extends AbstractTrait { } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { int time = (int) player.getEntityWorld().getWorldTime(); if (random.nextFloat() <= 0.05 && isNight(time)) { ToolHelper.healTool(tool, random.nextInt(8) + 1, null); @@ -52,7 +54,8 @@ public class TraitArcane extends AbstractTrait { if (!w.isRemote && e.getSource().getTrueSource() != null) { if (e.getSource().getTrueSource() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { ItemStack tool = ((EntityPlayer) e.getSource().getTrueSource()).getHeldItemMainhand(); - if (isNight((int) w.getWorldTime()) && random.nextFloat() < 0.1 && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { + if (isNight((int) w.getWorldTime()) && random.nextFloat() < 0.1 && TinkerUtil.hasTrait(TagUtil + .getTagSafe(tool), identifier)) { ToolHelper.healTool(tool, random.nextInt(16), null); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java index ec0232d..8ef3e0f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java @@ -39,7 +39,8 @@ public class TraitBerserk extends TraitProgressiveStats { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { NBTTagCompound tag = TagUtil.getExtraTag(tool); Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); if (!data.active) return newDamage; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java index 3b0b16f..88ecc8a 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java @@ -23,7 +23,8 @@ public class TraitBlind extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { int time = (int) world.getWorldTime(); if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { if (random.nextBoolean()) @@ -34,7 +35,8 @@ public class TraitBlind extends AbstractTrait { } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { int time = (int) player.getEntityWorld().getWorldTime(); if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { if (random.nextBoolean()) diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java index 4fc374c..929bf32 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBright.java @@ -26,7 +26,8 @@ public class TraitBright extends AbstractTrait { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { int time = (int) target.getEntityWorld().getWorldTime(); if (!isNight(time)) { newDamage = damage * (1 + random.nextFloat() / 2f); @@ -36,7 +37,8 @@ public class TraitBright extends AbstractTrait { @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { if (random.nextFloat() >= chance) { player.addPotionEffect(new PotionEffect(GLOWING, 200)); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java index 70c4b8b..8cf1cd6 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java @@ -21,7 +21,8 @@ public class TraitCarousel extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index 5ad0af0..fd17aa8 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -20,14 +20,16 @@ public class TraitCascade extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { float f = random.nextFloat(); if (!world.isRemote && tool.canHarvestBlock(state) && f <= 0.1) { double x, y, z, sx, sy, sz; sx = x = pos.getX(); sy = y = pos.getY(); sz = z = pos.getZ(); - int i = random.nextInt((int) Math.min(300f * (float) ToolHelper.getCurrentDurability(tool) / ToolHelper.getMaxDurability(tool), 50f)); + int i = random.nextInt((int) Math.min(300f * (float) ToolHelper.getCurrentDurability(tool) / ToolHelper + .getMaxDurability(tool), 50f)); for (int a = i; a > 0; a--) { int r = random.nextInt(3); int d = random.nextBoolean() ? 1 : -1; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java index 1c65d32..1d01112 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -102,7 +102,8 @@ public class TraitCatcher extends AbstractTrait { data.mobName = ""; data.write(tag); TagUtil.setExtraTag(tool, tag); - ToolHelper.damageTool(tool, random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * costMulti)), event.getEntityPlayer()); + ToolHelper.damageTool(tool, random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * + costMulti)), event.getEntityPlayer()); } } } @@ -116,7 +117,8 @@ public class TraitCatcher extends AbstractTrait { NBTTagCompound tag = TagUtil.getExtraTag(tool); Data data = Data.read(tag); if (!data.mobClass.isEmpty()) - e.getToolTip().add(TextFormatting.DARK_PURPLE + "Captured: " + TextFormatting.LIGHT_PURPLE + data.mobName); + e.getToolTip().add(TextFormatting.DARK_PURPLE + "Captured: " + TextFormatting.LIGHT_PURPLE + data + .mobName); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java index c4e95cd..f832494 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java @@ -31,8 +31,10 @@ public class TraitCongenial extends AbstractTrait { @SubscribeEvent public void onEntityKill(LivingDeathEvent e) { - if (e.getSource().getTrueSource() instanceof EntityPlayer && !e.getSource().getTrueSource().world.isRemote && e.getEntity() instanceof EntityCreature) { - if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()).getHeldItemMainhand()), identifier)) { + if (e.getSource().getTrueSource() instanceof EntityPlayer && !e.getSource().getTrueSource().world.isRemote && + e.getEntity() instanceof EntityCreature) { + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()) + .getHeldItemMainhand()), identifier)) { ItemStack tool = ((EntityPlayer) e.getSource().getTrueSource()).getHeldItemMainhand(); String name = e.getEntity().getName(); NBTTagCompound tag = TagUtil.getExtraTag(tool); @@ -48,7 +50,8 @@ public class TraitCongenial extends AbstractTrait { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { World w = player.getEntityWorld(); if (!w.isRemote) { NBTTagCompound tag = TagUtil.getExtraTag(tool); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java index 6a6fdb4..2e8c96b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCursed.java @@ -36,7 +36,8 @@ public class TraitCursed extends AbstractTrait { if (random.nextInt((chance + data.curse) / (data.curse + 1)) == 1) { if (isSelected) data.curse += 10; else data.curse++; - entity.attackEntityFrom(new DamageSource("Curse"), random.nextFloat() * ((EntityPlayer) entity).getHealth() / 2); + entity.attackEntityFrom(new DamageSource("Curse"), random.nextFloat() * ((EntityPlayer) entity).getHealth + () / 2); } data.write(tag); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index 7e9855c..2f7eeac 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -41,7 +41,9 @@ public class TraitCurvature extends AbstractTrait { @Override public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) { if (!event.getWorld().isRemote && random.nextFloat() < 0.05) { - List<IBlockState> blockstates = Lists.newArrayList(Blocks.STONE.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), Blocks.DIRT.getDefaultState()); + List<IBlockState> blockstates = Lists.newArrayList(Blocks.STONE.getDefaultState(), Blocks.NETHERRACK + .getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), Blocks.DIRT + .getDefaultState()); IBlockState mainstate = event.getState(); if (blockstates.contains(mainstate)) return; for (int i = 0; i < chance; i++) { @@ -54,7 +56,8 @@ public class TraitCurvature extends AbstractTrait { event.getDrops().clear(); event.getWorld().setBlockState(cPos, mainstate); event.getHarvester().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - event.getHarvester().sendStatusMessage(new TextComponentString("Teleported to: " + x + " " + y + " " + z), false); + event.getHarvester().sendStatusMessage(new TextComponentString("Teleported to: " + x + " " + y + + " " + z), false); return; } } @@ -62,7 +65,8 @@ public class TraitCurvature extends AbstractTrait { } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { if (random.nextFloat() <= 0.15) { target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); changePos(player, target); @@ -74,9 +78,11 @@ public class TraitCurvature extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player + .getHeldItemMainhand()), identifier)) { ItemStack i = new ItemStack(Items.ENDER_PEARL, random.nextInt(2)); - event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); + event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event + .getEntity().posZ, i)); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java index f66aab0..c20fede 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDark.java @@ -19,7 +19,8 @@ public class TraitDark extends AbstractTrait { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { int time = (int) target.getEntityWorld().getWorldTime(); if (isNight(time)) { newDamage = damage * (1 + random.nextFloat() / 2f); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java index 6e7229d..0f79c0e 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java @@ -28,7 +28,8 @@ public class TraitDevelopement extends AbstractTrait { public void onBreak(BlockEvent.BreakEvent e) { IBlockState state = e.getState(); ItemStack tool = e.getPlayer().getHeldItemMainhand(); - if (state.getBlock().equals(net.minecraft.init.Blocks.STONE) && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) + if (state.getBlock().equals(net.minecraft.init.Blocks.STONE) && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), + identifier)) System.out.println("State.Variant: " + state.getValue(BlockStone.VARIANT)); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index 797c25e..7f5d276 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -28,7 +28,8 @@ public class TraitDiffuse extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); - if (!player.getEntityWorld().isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (!player.getEntityWorld().isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()) + , this.identifier)) { event.setExpToDrop((int) this.getUpdateXP(event.getExpToDrop())); } } @@ -38,7 +39,8 @@ public class TraitDiffuse extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (event.getEntity() instanceof EntityCreature && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (event.getEntity() instanceof EntityCreature && TinkerUtil.hasTrait(TagUtil.getTagSafe(player + .getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java index 311c12b..dbdd13f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java @@ -29,7 +29,8 @@ public class TraitDissolving extends AbstractTrait { if (!event.getEntity().getEntityWorld().isRemote) { EntityPlayer player = event.getAttackingPlayer(); float r = random.nextFloat(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this + .identifier)) { if (r <= 0.80) { event.setDroppedExperience(0); } else { diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java index 8871d58..920f7b9 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java @@ -24,7 +24,8 @@ public class TraitFracture extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { float f = random.nextFloat(); float b = 0.99F * calcBonus(tool); if (!world.isRemote && tool.canHarvestBlock(state) && f <= b) { @@ -34,32 +35,38 @@ public class TraitFracture extends AbstractTrait { switch (mop.sideHit) { case UP: BlockPos next1 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ()); - if (tool.canHarvestBlock(world.getBlockState(next1)) && !world.getBlockState(next1).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next1)) && !world.getBlockState(next1) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next1, true); break; case DOWN: BlockPos next2 = new BlockPos(pos.getX(), pos.getY() + i, pos.getZ()); - if (tool.canHarvestBlock(world.getBlockState(next2)) && !world.getBlockState(next2).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next2)) && !world.getBlockState(next2) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next2, true); break; case WEST: BlockPos next3 = new BlockPos(pos.getX() + i, pos.getY(), pos.getZ()); - if (tool.canHarvestBlock(world.getBlockState(next3)) && !world.getBlockState(next3).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next3)) && !world.getBlockState(next3) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next3, true); break; case EAST: BlockPos next4 = new BlockPos(pos.getX() - i, pos.getY(), pos.getZ()); - if (tool.canHarvestBlock(world.getBlockState(next4)) && !world.getBlockState(next4).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next4)) && !world.getBlockState(next4) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next4, true); break; case SOUTH: BlockPos next5 = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - i); - if (tool.canHarvestBlock(world.getBlockState(next5)) && !world.getBlockState(next5).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next5)) && !world.getBlockState(next5) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next5, true); break; case NORTH: BlockPos next6 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ() + i); - if (tool.canHarvestBlock(world.getBlockState(next6)) && !world.getBlockState(next6).equals(Blocks.BEDROCK.getDefaultState())) + if (tool.canHarvestBlock(world.getBlockState(next6)) && !world.getBlockState(next6) + .equals(Blocks.BEDROCK.getDefaultState())) world.destroyBlock(next6, true); break; } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java index 9c43b97..0902a4e 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFragile.java @@ -22,7 +22,8 @@ public class TraitFragile extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { if (random.nextBoolean()) { float f = random.nextFloat(); float b = 0.99F * calcBonus(tool); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index b621b73..97fb0ec 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -34,7 +34,8 @@ public class TraitGarishly extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player + .getHeldItemMainhand()), identifier)) { int r = random.nextInt(2); ItemStack i = null; @@ -50,7 +51,8 @@ public class TraitGarishly extends AbstractTrait { break; } assert i != null; - event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); + event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event + .getEntity().posZ, i)); } } } @@ -60,7 +62,8 @@ public class TraitGarishly extends AbstractTrait { float r = random.nextFloat(); if (random.nextBoolean()) event.getDrops().clear(); else if (r < 0.25 && event.getWorld().getBlockState(event.getPos()).getMaterial() == Material.ROCK) { - @SuppressWarnings("ConstantConditions") ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(3)); + @SuppressWarnings("ConstantConditions") ItemStack stack = new ItemStack(Item.getItemFromBlock(event + .getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(3)); event.getDrops().add(0, stack); ToolHelper.damageTool(tool, random.nextInt(6) + 1, event.getHarvester()); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java index f07d817..fde853a 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGlimmer.java @@ -37,14 +37,16 @@ public class TraitGlimmer extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { if (random.nextFloat() <= 0.05) { player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, random.nextInt(600) + 300)); } } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { if (random.nextFloat() <= 0.05) { player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, random.nextInt(600) + 300)); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java index 1af99b9..f8588a9 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java @@ -17,7 +17,8 @@ public class TraitHeroic extends AbstractTrait { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { int durability = ToolHelper.getCurrentDurability(tool); int durabilitymax = ToolHelper.getMaxDurability(tool); int safeDenominator = durabilitymax - durability - 1; @@ -30,7 +31,8 @@ public class TraitHeroic extends AbstractTrait { } else { calc = newDamage + (newDamage / 2) / ((durability * durabilitymax / safeDenominator) + 1); } - if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) { + if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || + (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) { return super.damage(tool, player, target, damage, calc, isCritical); } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java index 32fabc4..9db6c06 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java @@ -30,7 +30,8 @@ public class TraitHollow extends AbstractTrait { @Override - public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { + public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + isCritical) { int time = (int) player.getEntityWorld().getWorldTime(); if (random.nextFloat() <= 0.01 || (random.nextFloat() <= 0.03 && isNight(time))) { ((EntityLiving) target).setNoAI(true); @@ -46,7 +47,8 @@ public class TraitHollow extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (!w.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (random.nextFloat() <= 0.9 && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (random.nextFloat() <= 0.9 && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil + .getTagSafe(player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index b7876e2..fa59b38 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -31,7 +31,8 @@ public class TraitInstable extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { if (random.nextFloat() <= 0.03) { if (!world.isRemote) { if (random.nextBoolean()) { @@ -43,7 +44,8 @@ public class TraitInstable extends AbstractTrait { } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { BlockPos pos = target.getPosition(); if (random.nextFloat() <= 0.04) { if (!player.getEntityWorld().isRemote) { @@ -60,9 +62,11 @@ public class TraitInstable extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (random.nextFloat() < 0.05 && !w.isRemote && event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player + .getHeldItemMainhand()), identifier)) { ItemStack i = new ItemStack(Items.GUNPOWDER, random.nextInt(2)); - event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i)); + event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event + .getEntity().posZ, i)); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java index 1596ace..c50821d 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMelting.java @@ -28,7 +28,8 @@ public class TraitMelting extends AbstractTrait { public void blockbreak(BlockEvent.BreakEvent e) { Block b = e.getWorld().getBlockState(e.getPos()).getBlock(); if (TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getPlayer().getHeldItemMainhand()), identifier)) { - if (!e.getWorld().isRemote && random.nextFloat() <= 0.025 && (b == Blocks.STONE || b == Blocks.COBBLESTONE || b == Blocks.NETHERRACK || b == Blocks.OBSIDIAN)) { + if (!e.getWorld().isRemote && random.nextFloat() <= 0.025 && (b == Blocks.STONE || b == Blocks + .COBBLESTONE || b == Blocks.NETHERRACK || b == Blocks.OBSIDIAN)) { e.setCanceled(true); e.getWorld().setBlockState(e.getPos(), Blocks.LAVA.getDefaultState()); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java b/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java index 65ac1c7..cb433c6 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitMutate.java @@ -29,7 +29,9 @@ public class TraitMutate extends AbstractTrait { public void beforeBlockBreak(ItemStack tool, BlockEvent.BreakEvent event) { if (!event.getWorld().isRemote && random.nextFloat() > 0.95) { IBlockState state = event.getState(); - List<Block> blist = newArrayList(Blocks.STONE, Blocks.COBBLESTONE, Blocks.DIRT, Blocks.SAND, Blocks.GRASS, Blocks.CLAY, Blocks.NETHERRACK, Blocks.ICE, Blocks.SNOW, Blocks.BONE_BLOCK, Blocks.LAVA, Blocks.WATER, Blocks.WHEAT); + List<Block> blist = newArrayList(Blocks.STONE, Blocks.COBBLESTONE, Blocks.DIRT, Blocks.SAND, Blocks + .GRASS, Blocks.CLAY, Blocks.NETHERRACK, Blocks.ICE, Blocks.SNOW, Blocks.BONE_BLOCK, Blocks.LAVA, + Blocks.WATER, Blocks.WHEAT); if (blist.contains(state.getBlock())) { Block newBlock = blist.get(random.nextInt(blist.size())); IBlockState newState = newBlock.getDefaultState(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java index 7861445..6f84263 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitPorted.java @@ -37,7 +37,8 @@ public class TraitPorted extends AbstractTrait { } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { if (random.nextFloat() <= 0.005) { player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); teleport(player, world); @@ -46,7 +47,8 @@ public class TraitPorted extends AbstractTrait { @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { if (random.nextFloat() <= 0.005) { target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); teleport(player, player.getEntityWorld()); @@ -66,7 +68,8 @@ public class TraitPorted extends AbstractTrait { return; } e.setPosition(tPos.getX(), tPos.getY(), tPos.getZ()); - ToolHelper.damageTool(e.getHeldItemMainhand(), ToolHelper.getCurrentDurability(e.getHeldItemMainhand()) / 2 + 1, e); + ToolHelper.damageTool(e.getHeldItemMainhand(), ToolHelper.getCurrentDurability(e.getHeldItemMainhand()) / 2 + + 1, e); } @Override diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java index fe20fef..6df6974 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitResonance.java @@ -19,9 +19,11 @@ public class TraitResonance extends AbstractTrait { } @Override - public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean + wasCritical, boolean wasHit) { if (random.nextFloat() <= chance) { - target.knockBack(target, random.nextFloat() * random.nextFloat() * 10, player.posX - target.posX, player.posZ - target.posZ); + target.knockBack(target, random.nextFloat() * random.nextFloat() * 10, player.posX - target.posX, player + .posZ - target.posZ); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java index 1d904bd..32f1de2 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java @@ -37,7 +37,8 @@ public class TraitReviving extends AbstractTrait { World w = e.getEntity().getEntityWorld(); if (!w.isRemote && e.getSource().getTrueSource() != null) { if (e.getSource().getTrueSource() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { - if (random.nextFloat() <= chance && TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()).getHeldItemMainhand()), identifier)) { + if (random.nextFloat() <= chance && TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e + .getSource().getTrueSource()).getHeldItemMainhand()), identifier)) { int id = e.getEntity().getEntityId(); Entity ent = EntityList.createEntityByID(id, w); if (ent != null) { diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java index 2baf143..c3c4fba 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java @@ -30,9 +30,13 @@ public class TraitSlaughtering extends AbstractTrait { World w = event.getEntity().getEntityWorld(); if (event.getSource().getTrueSource() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource(); - if (!w.isRemote && event.getEntity() instanceof EntityLiving && !(event.getEntity() instanceof EntityPlayer) && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (!w.isRemote && event.getEntity() instanceof EntityLiving && !(event.getEntity() instanceof + EntityPlayer) && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), + identifier)) { ItemStack i = event.getDrops().get(random.nextInt(event.getDrops().size())).getItem(); - event.getDrops().add(new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, new ItemStack(i.getItem(), random.nextInt(4) + 1, i.getMetadata(), i.getTagCompound()))); + event.getDrops().add(new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event + .getEntity().posZ, new ItemStack(i.getItem(), random.nextInt(4) + 1, i.getMetadata(), i + .getTagCompound()))); } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java index 65b075d..88af4dd 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -51,7 +51,8 @@ public class TraitSoulEater extends AbstractTrait { } @Override - public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { + public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float + newDamage, boolean isCritical) { NBTTagCompound tag = TagUtil.getExtraTag(tool); Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); float bonus = data.bonus; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java index 5334048..bcdd645 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java @@ -37,11 +37,13 @@ public class TraitSuperHeavy extends TraitProgressiveStats { NBTTagCompound tag = TagUtil.getExtraTag(tool); Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); if (data.brokenblocks == 0) return; - event.setNewSpeed(Math.max(event.getNewSpeed() - data.brokenblocks * event.getOriginalSpeed() / blockcount, 0.35f)); + event.setNewSpeed(Math.max(event.getNewSpeed() - data.brokenblocks * event.getOriginalSpeed() / blockcount, + 0.35f)); } @Override - public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase + player, boolean wasEffective) { NBTTagCompound tag = TagUtil.getExtraTag(tool); Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); data.brokenblocks += 1; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java index c00ef3e..b490a28 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTantrum.java @@ -52,7 +52,8 @@ public class TraitTantrum extends AbstractTrait { if (data.amount >= max_charges) { TagUtil.setEnchantEffect(tool, true); if (event.getHarvester() instanceof EntityPlayerMP) { - Sounds.PlaySoundForPlayer(event.getHarvester(), Sounds.shocking_discharge, 1f, 0.8f + .2f * random.nextFloat()); + Sounds.PlaySoundForPlayer(event.getHarvester(), Sounds.shocking_discharge, 1f, 0.8f + .2f * + random.nextFloat()); } } data.write(tag); @@ -71,7 +72,8 @@ public class TraitTantrum extends AbstractTrait { Data data = Data.read(tag); if (data.amount > 1f) { double d = Math.min(Utils.round2(random.nextDouble() * data.amount), max_power); - w.newExplosion(event.getEntityPlayer(), pos.getX(), pos.getY(), pos.getZ(), (float) Math.pow((double) 1.2f, d), false, true); + w.newExplosion(event.getEntityPlayer(), pos.getX(), pos.getY(), pos.getZ(), (float) Math.pow((double) + 1.2f, d), false, true); data.amount -= d; data.write(tag); TagUtil.setExtraTag(tool, tag); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java index 831d629..14ea41c 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java @@ -29,8 +29,10 @@ public class TraitTraditional extends AbstractTrait { @SubscribeEvent public void onEntityKill(LivingDeathEvent e) { World w = e.getEntity().getEntityWorld(); - if (!w.isRemote && e.getSource().getTrueSource() instanceof EntityPlayer && e.getEntity() instanceof EntityCreature) { - if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()).getHeldItemMainhand()), identifier)) { + if (!w.isRemote && e.getSource().getTrueSource() instanceof EntityPlayer && e.getEntity() instanceof + EntityCreature) { + if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getTrueSource()) + .getHeldItemMainhand()), identifier)) { String name = EntityList.getEntityString(e.getEntity()); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java index abcb328..756480b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -68,8 +68,11 @@ public class TraitWhirl extends AbstractTrait { if (MathHelper.sqrt(x * x + y * y + z * z) > r) { continue; } - BlockPos nPos = new BlockPos(event.getPos().getX() + x, event.getPos().getY() + y, event.getPos().getZ() + z); - if (!(event.getWorld().getBlockState(nPos).equals(Blocks.WATER.getDefaultState()) || event.getWorld().getBlockState(nPos).equals(Blocks.FLOWING_WATER.getDefaultState()))) + BlockPos nPos = new BlockPos(event.getPos().getX() + x, event.getPos().getY() + y, event + .getPos().getZ() + z); + if (!(event.getWorld().getBlockState(nPos).equals(Blocks.WATER.getDefaultState()) || + event.getWorld().getBlockState(nPos).equals(Blocks.FLOWING_WATER.getDefaultState + ()))) continue; event.getWorld().destroyBlock(nPos, false); } @@ -93,7 +96,8 @@ public class TraitWhirl extends AbstractTrait { NBTTagCompound tag = TagUtil.getExtraTag(tool); Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag); if (data.radius > 0) { - e.getToolTip().add(TextFormatting.BLUE + "Actual Radius: " + TextFormatting.WHITE + Math.round(data.radius * 100) / 100); + e.getToolTip().add(TextFormatting.BLUE + "Actual Radius: " + TextFormatting.WHITE + Math.round(data + .radius * 100) / 100); } } } |