From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../darkknight/jewelrycraft/curses/CurseBlind.java | 21 +-- .../jewelrycraft/curses/CurseDeathsTouch.java | 16 ++- .../jewelrycraft/curses/CurseDoubleDown.java | 9 +- .../jewelrycraft/curses/CurseFlamingSoul.java | 13 +- .../darkknight/jewelrycraft/curses/CurseGreed.java | 8 +- .../jewelrycraft/curses/CurseHumbleBundle.java | 19 +-- .../curses/CurseIncredibleDevotion.java | 14 +- .../jewelrycraft/curses/CurseInfamy.java | 37 +++-- .../jewelrycraft/curses/CurseMidasTouch.java | 150 ++++++++++++-------- .../jewelrycraft/curses/CursePentagram.java | 151 +++++++++++++-------- .../jewelrycraft/curses/CurseRabbitsPaw.java | 15 +- .../jewelrycraft/curses/CurseRottenHeart.java | 15 +- .../jewelrycraft/curses/CurseSacredOath.java | 11 +- .../jewelrycraft/curses/CurseScionOfHell.java | 15 +- .../jewelrycraft/curses/CurseVampireHunger.java | 27 ++-- 15 files changed, 313 insertions(+), 208 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/curses') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java index 8996605..adaf528 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java @@ -18,17 +18,17 @@ public class CurseBlind extends Curse { @Override public void action(World world, EntityPlayer player) { - if (!player.isPotionActive(Potion.blindness) - || player.getActivePotionEffect(Potion.blindness) - .getDuration() < 30) - player.addPotionEffect( - new PotionEffect(Potion.blindness.id, 60)); + if (!player.isPotionActive(Potion.blindness) || player + .getActivePotionEffect(Potion.blindness) + .getDuration() < 30) + player.addPotionEffect(new PotionEffect( + Potion.blindness.id, 60)); } @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".blind.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".blind.description"); } @Override @@ -46,13 +46,14 @@ public class CurseBlind extends Curse { } @Override - public int weight(World world, EntityPlayer player, Random random) { + public int weight(World world, EntityPlayer player, + Random random) { return 7; } @Override public String getDisplayName() { - return StatCollector - .translateToLocal("curse." + Variables.MODID + ".blind"); + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".blind"); } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java index aeb3e22..6281db1 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java @@ -17,10 +17,11 @@ public class CurseDeathsTouch extends Curse { @Override public boolean attackedByPlayerActionCancelable( - LivingAttackEvent event, World world, EntityPlayer player, - Entity target) { + LivingAttackEvent event, World world, + EntityPlayer player, Entity target) { if (!world.isRemote) { - target.attackEntityFrom(DamageSource.wither, event.ammount); + target.attackEntityFrom(DamageSource.wither, + event.ammount); } return true; @@ -28,14 +29,15 @@ public class CurseDeathsTouch extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".deathsTouch.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".deathsTouch.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".deathsTouch"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".deathsTouch"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java index d1d872b..202d8bf 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java @@ -44,14 +44,15 @@ public class CurseDoubleDown extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".doubledown.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".doubledown.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".doubledown"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".doubledown"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java index e808c84..9811eb8 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java @@ -13,15 +13,16 @@ public class CurseFlamingSoul extends Curse { super(name, txtID, pack); } - public void attackedByPlayerAction(World world, EntityPlayer player, - Entity target) { + public void attackedByPlayerAction(World world, + EntityPlayer player, Entity target) { player.setFire(5); } @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".flamingsoul.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".flamingsoul.description"); } @Override @@ -31,7 +32,7 @@ public class CurseFlamingSoul extends Curse { @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".flamingsoul"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".flamingsoul"); } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java index 5d8d29c..4ea7ba3 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java @@ -24,8 +24,8 @@ public class CurseGreed extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".greed.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".greed.description"); } @Override @@ -35,7 +35,7 @@ public class CurseGreed extends Curse { @Override public String getDisplayName() { - return StatCollector - .translateToLocal("curse." + Variables.MODID + ".greed"); + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".greed"); } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java index 3ad73f2..76487a6 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java @@ -42,15 +42,17 @@ public class CurseHumbleBundle extends Curse { for (ItemStack item : event.drops) { ItemStack drop = item.copy(); - if (drop.getItem() != Item.getItemFromBlock(event.block)) - dropItem(event.world, event.x, event.y, event.z, drop); + if (drop.getItem() != Item + .getItemFromBlock(event.block)) + dropItem(event.world, event.x, event.y, + event.z, drop); } } public void dropItem(World world, double x, double y, double z, ItemStack stack) { - EntityItem entityitem = - new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack); + EntityItem entityitem = new EntityItem(world, x + 0.5D, + y + 0.5D, z + 0.5D, stack); entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; @@ -59,14 +61,15 @@ public class CurseHumbleBundle extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".humblebundle.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".humblebundle.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".humblebundle"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".humblebundle"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java b/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java index 43fa756..da88c50 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java @@ -18,22 +18,24 @@ public class CurseIncredibleDevotion extends Curse { public void entityDeathAction(World world, EntityLivingBase target, EntityPlayer player) { if (rand.nextInt(10) == 0) { - world.createExplosion(target, target.posX, target.posY, - target.posZ, target.getMaxHealth() / (10.0f - * (1 / ConfigHandler.DEVOTION_FACTOR)), + world.createExplosion(target, target.posX, + target.posY, target.posZ, + target.getMaxHealth() / (10.0f * (1 + / ConfigHandler.DEVOTION_FACTOR)), true); } } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".incredibledevotion"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".incredibledevotion"); } @Override public String getDescription() { - return StatCollector.translateToLocal("curse." + Variables.MODID + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".incredibledevotion.description"); } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index 8d99006..720ea6f 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java @@ -41,26 +41,32 @@ public class CurseInfamy extends Curse { && !(target instanceof EntityHalfHeart) && target.canAttackWithItem()) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); playerInfo.setFloat("BlackHeart", - playerInfo.getFloat("BlackHeart") + 1.0F); + playerInfo.getFloat("BlackHeart") + + 1.0F); if (player.getMaxHealth() >= 3F) { player.getEntityAttribute( SharedMonsterAttributes.maxHealth) - .setBaseValue(player.getMaxHealth() - 1.0F); + .setBaseValue(player + .getMaxHealth() + - 1.0F); - player.setHealth(player.getHealth() - 1.0F); + player.setHealth( + player.getHealth() - 1.0F); } JewelrycraftUtil.addCursePoints(player, 10); - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); } } @@ -71,15 +77,18 @@ public class CurseInfamy extends Curse { MaskRender mask = new MaskRender(); float yaw = player.prevRotationYawHead - + (player.rotationYawHead - player.prevRotationYawHead) + + (player.rotationYawHead + - player.prevRotationYawHead) * event.partialRenderTick; float yawOffset = player.prevRenderYawOffset - + (player.renderYawOffset - player.prevRenderYawOffset) + + (player.renderYawOffset + - player.prevRenderYawOffset) * event.partialRenderTick; float pitch = player.prevRotationPitch - + (player.rotationPitch - player.prevRotationPitch) + + (player.rotationPitch + - player.prevRotationPitch) * event.partialRenderTick; GL11.glPushMatrix(); GL11.glColor4f(1, 1, 1, 1); @@ -96,14 +105,14 @@ public class CurseInfamy extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".infamy.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".infamy.description"); } @Override public String getDisplayName() { - return StatCollector - .translateToLocal("curse." + Variables.MODID + ".infamy"); + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".infamy"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java index ef78b12..d576803 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java @@ -44,19 +44,26 @@ public class CurseMidasTouch extends Curse { if (!world.isRemote && target instanceof EntityLivingBase && !(target instanceof EntityHeart) && !(target instanceof EntityHalfHeart) - && player.inventory.getCurrentItem() == null) { - world.setBlock(MathHelper.floor_double(target.posX), - MathHelper.floor_double(target.posY), - MathHelper.floor_double(target.posZ), + && player.inventory + .getCurrentItem() == null) { + world.setBlock(MathHelper + .floor_double(target.posX), + MathHelper.floor_double( + target.posY), + MathHelper.floor_double( + target.posZ), BlockList.midasTouchBlock, 0, 2); - TileEntityMidasTouch midasTouchVictim = - new TileEntityMidasTouch(); + TileEntityMidasTouch midasTouchVictim = new TileEntityMidasTouch(); midasTouchVictim.setEntity(target); - world.setTileEntity(MathHelper.floor_double(target.posX), - MathHelper.floor_double(target.posY), - MathHelper.floor_double(target.posZ), + world.setTileEntity( + MathHelper.floor_double( + target.posX), + MathHelper.floor_double( + target.posY), + MathHelper.floor_double( + target.posZ), midasTouchVictim); target.setDead(); @@ -67,13 +74,15 @@ public class CurseMidasTouch extends Curse { public void action(World world, EntityPlayer player) { ItemStack curItem = player.inventory.getCurrentItem(); - if (curItem != null && curItem.getItem() != ItemList.goldObj + if (curItem != null + && curItem.getItem() != ItemList.goldObj && !isGoldenObject(curItem.getItem())) { int index = player.inventory.currentItem; ItemStack item = curItem; ItemStack result = new ItemStack(ItemList.goldObj, - item.stackSize, item.getItemDamage()); + item.stackSize, + item.getItemDamage()); JewelryNBT.addItem(result, item); @@ -81,69 +90,99 @@ public class CurseMidasTouch extends Curse { result = changeItem(curItem); } - player.inventory.setInventorySlotContents(index, result); + player.inventory.setInventorySlotContents(index, + result); } } public ItemStack changeItem(ItemStack currItem) { if (currItem.getItem() instanceof ItemSword) { - return new ItemStack(Items.golden_sword, currItem.stackSize, + return new ItemStack(Items.golden_sword, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemSpade) { - return new ItemStack(Items.golden_shovel, currItem.stackSize, + return new ItemStack(Items.golden_shovel, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemPickaxe) { - return new ItemStack(Items.golden_pickaxe, currItem.stackSize, + return new ItemStack(Items.golden_pickaxe, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemAxe) { - return new ItemStack(Items.golden_axe, currItem.stackSize, + return new ItemStack(Items.golden_axe, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemHoe) { - return new ItemStack(Items.golden_hoe, currItem.stackSize, + return new ItemStack(Items.golden_hoe, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem.getItem()).armorType == 0) { - return new ItemStack(Items.golden_helmet, currItem.stackSize, + && ((ItemArmor) currItem + .getItem()).armorType == 0) { + return new ItemStack(Items.golden_helmet, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem.getItem()).armorType == 1) { + && ((ItemArmor) currItem + .getItem()).armorType == 1) { return new ItemStack(Items.golden_chestplate, - currItem.stackSize, currItem.getItemDamage()); + currItem.stackSize, + currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem.getItem()).armorType == 2) { - return new ItemStack(Items.golden_leggings, currItem.stackSize, + && ((ItemArmor) currItem + .getItem()).armorType == 2) { + return new ItemStack(Items.golden_leggings, + currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem.getItem()).armorType == 3) { - return new ItemStack(Items.golden_boots, currItem.stackSize, + && ((ItemArmor) currItem + .getItem()).armorType == 3) { + return new ItemStack(Items.golden_boots, + currItem.stackSize, currItem.getItemDamage()); - } else if (currItem.getItem().getUnlocalizedName().toLowerCase() - .contains("horsearmor")) { + } else if (currItem.getItem().getUnlocalizedName() + .toLowerCase().contains("horsearmor")) { return new ItemStack(Items.golden_horse_armor, currItem.stackSize, 0); - } else if (currItem.getItem().getUnlocalizedName().toLowerCase() - .contains("nugget") - || currItem.getItem().getItemStackDisplayName(currItem) - .toLowerCase().contains(" nugget") - || currItem.getItem().getItemStackDisplayName(currItem) - .toLowerCase().contains("nugget ")) { - return new ItemStack(Items.gold_nugget, currItem.stackSize, 0); - } else if (currItem.getItem().getUnlocalizedName().toLowerCase() - .contains("ingot") - || currItem.getItem().getItemStackDisplayName(currItem) - .toLowerCase().contains(" ingot") - || currItem.getItem().getItemStackDisplayName(currItem) - .toLowerCase().contains("ingot ")) { - return new ItemStack(Items.gold_ingot, currItem.stackSize, 0); - } else if (Block.getBlockFromItem( - currItem.getItem()) instanceof BlockPressurePlate + } else if (currItem.getItem().getUnlocalizedName() + .toLowerCase().contains("nugget") + || currItem.getItem() + .getItemStackDisplayName( + currItem) + .toLowerCase() + .contains(" nugget") + || currItem.getItem() + .getItemStackDisplayName( + currItem) + .toLowerCase() + .contains("nugget ")) { + return new ItemStack(Items.gold_nugget, + currItem.stackSize, 0); + } else if (currItem.getItem().getUnlocalizedName() + .toLowerCase().contains("ingot") + || currItem.getItem() + .getItemStackDisplayName( + currItem) + .toLowerCase() + .contains(" ingot") + || currItem.getItem() + .getItemStackDisplayName( + currItem) + .toLowerCase() + .contains("ingot ")) { + return new ItemStack(Items.gold_ingot, + currItem.stackSize, 0); + } else if (Block.getBlockFromItem(currItem + .getItem()) instanceof BlockPressurePlate || Block.getBlockFromItem(currItem .getItem()) instanceof BlockPressurePlateWeighted) { - return new ItemStack(Blocks.light_weighted_pressure_plate, + return new ItemStack( + Blocks.light_weighted_pressure_plate, + currItem.stackSize, 0); + } else if (Block.getBlockFromItem(currItem + .getItem()) instanceof BlockCompressed) { + return new ItemStack(Blocks.gold_block, currItem.stackSize, 0); - } else if (Block.getBlockFromItem( - currItem.getItem()) instanceof BlockCompressed) { - return new ItemStack(Blocks.gold_block, currItem.stackSize, 0); } return null; @@ -163,21 +202,23 @@ public class CurseMidasTouch extends Curse { || item.equals(Items.golden_apple) || item.equals(Items.golden_hoe) || item.equals(Items.golden_horse_armor) - || Block.getBlockFromItem(item).equals(Blocks.gold_block) || Block.getBlockFromItem(item) - .equals(Blocks.light_weighted_pressure_plate); + .equals(Blocks.gold_block) + || Block.getBlockFromItem(item).equals( + Blocks.light_weighted_pressure_plate); } @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".midastouch.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".midastouch.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".midastouch"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".midastouch"); } @Override @@ -195,7 +236,8 @@ public class CurseMidasTouch extends Curse { } @Override - public int weight(World world, EntityPlayer player, Random random) { + public int weight(World world, EntityPlayer player, + Random random) { return 2; } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java index a65517d..bf40d55 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java @@ -38,73 +38,91 @@ public class CursePentagram extends Curse { super.action(world, player); if (!world.isRemote) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); for (Object entity : world - .getEntitiesWithinAABBExcludingEntity(player, + .getEntitiesWithinAABBExcludingEntity( + player, AxisAlignedBB.getBoundingBox( - player.boundingBox.minX - 0.5F, + player.boundingBox.minX + - 0.5F, player.boundingBox.minY, - player.boundingBox.minZ - 0.5F, - player.boundingBox.maxX + 0.5F, + player.boundingBox.minZ + - 0.5F, + player.boundingBox.maxX + + 0.5F, player.boundingBox.maxY, - player.boundingBox.maxZ + 0.5F))) { + player.boundingBox.maxZ + + 0.5F))) { if (entity instanceof EntityLivingBase) { - NBTTagCompound target = - ((EntityLivingBase) entity).getEntityData(); - - if (target - .getInteger("stolenHealth") < (JewelrycraftUtil - .AchievemtUnlocked(player, - AchievementsList.pentagram) ? 3 - : 2) - && rand.nextInt(40) == 0) { + NBTTagCompound target = ((EntityLivingBase) entity) + .getEntityData(); + + int maxHealthStolen = JewelrycraftUtil + .isAchievementUnlocked( + player, + AchievementsList.pentagram) + ? 3 + : 2; + + boolean canStealHealth = target + .getInteger("stolenHealth") < maxHealthStolen; + + if (canStealHealth && rand.nextInt( + 40) == 0) { ((EntityLivingBase) entity) .getEntityAttribute( SharedMonsterAttributes.maxHealth) .setBaseValue(((EntityLivingBase) entity) - .getMaxHealth() - 2f); + .getMaxHealth() + - 2f); - target.setInteger("stolenHealth", + target.setInteger( + "stolenHealth", target.hasKey("stolenHealth") - ? target.getInteger("stolenHealth") + ? target.getInteger( + "stolenHealth") + 1 : 1); - playerInfo - .setInteger("heartsStolen", - playerInfo.hasKey("heartsStolen") - ? playerInfo.getInteger( - "heartsStolen") + 1 - : 1); + playerInfo.setInteger( + "heartsStolen", + playerInfo.hasKey( + "heartsStolen") ? playerInfo.getInteger("heartsStolen") + 1 : 1); if (player.shouldHeal()) { player.heal(2F); } else { player.getEntityAttribute( SharedMonsterAttributes.maxHealth) - .setBaseValue( - player.getMaxHealth() + 2f); + .setBaseValue(player + .getMaxHealth() + + 2f); } } } } - if (!playerInfo - .getBoolean(AchievementsList.pentagram.statId)) { - if (ticksActive > 24000 - && playerInfo.getInteger("heartsStolen") <= 0) - player.addStat(AchievementsList.pentagram, 1); + if (!playerInfo.getBoolean( + AchievementsList.pentagram.statId)) { + if (ticksActive > 24000 && playerInfo + .getInteger("heartsStolen") <= 0) + player.addStat(AchievementsList.pentagram, + 1); else { player.addChatComponentMessage( - new ChatComponentText(EnumChatFormatting.RED - + StatCollector.translateToLocal( - "challenge.failed") - + " " + EnumChatFormatting.GOLD - + StatCollector.translateToLocal( - AchievementsList.pentagram.statId))); + new ChatComponentText( + EnumChatFormatting.RED + + StatCollector.translateToLocal( + "challenge.failed") + + " " + + EnumChatFormatting.GOLD + + StatCollector.translateToLocal( + AchievementsList.pentagram.statId))); playerInfo.setBoolean( - AchievementsList.pentagram.statId, true); + AchievementsList.pentagram.statId, + true); } } } @@ -114,19 +132,22 @@ public class CursePentagram extends Curse { @Override public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event) { - ResourceLocation PENTAGRAM_TEXTURE = - new ResourceLocation(Variables.MODID, - "textures/gui/" + getTexturePack() + ".png"); + ResourceLocation PENTAGRAM_TEXTURE = new ResourceLocation( + Variables.MODID, + "textures/gui/" + getTexturePack() + + ".png"); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_SRC_COLOR); Tessellator tessellator = Tessellator.instance; - TextureManager texturemanager = - Minecraft.getMinecraft().getTextureManager(); + TextureManager texturemanager = Minecraft.getMinecraft() + .getTextureManager(); texturemanager.bindTexture(PENTAGRAM_TEXTURE); GL11.glRotatef(rot, 0F, 1F, 0F); GL11.glTranslatef(-0.8F, - (player.isSneaking() ? 0.1625F : 0F) + 1.5F, -0.8F); + (player.isSneaking() ? 0.1625F : 0F) + + 1.5F, + -0.8F); GL11.glRotatef(90F, 1F, 0F, 0F); GL11.glScalef(0.05F, 0.05F, 0.05F); rot += 3F; @@ -149,11 +170,13 @@ public class CursePentagram extends Curse { (double) (y + height), (double) 0, (double) ((float) (u + width) * f), (double) ((float) (v + height) * f1)); - tessellator.addVertexWithUV((double) (x + width), (double) (y + 0), - (double) 0, (double) ((float) (u + width) * f), + tessellator.addVertexWithUV((double) (x + width), + (double) (y + 0), (double) 0, + (double) ((float) (u + width) * f), (double) ((float) (v + 0) * f1)); - tessellator.addVertexWithUV((double) (x + 0), (double) (y + 0), - (double) 0, (double) ((float) (u + 0) * f), + tessellator.addVertexWithUV((double) (x + 0), + (double) (y + 0), (double) 0, + (double) ((float) (u + 0) * f), (double) ((float) (v + 0) * f1)); tessellator.draw(); GL11.glDisable(GL11.GL_BLEND); @@ -166,19 +189,23 @@ public class CursePentagram extends Curse { public void playerHandRender(EntityPlayer player, RenderHandEvent event) { if (Minecraft.getMinecraft().gameSettings.thirdPersonView == 0) { - ResourceLocation PENTAGRAM_TEXTURE = - new ResourceLocation(Variables.MODID, - "textures/gui/" + getTexturePack() + ".png"); + ResourceLocation PENTAGRAM_TEXTURE = new ResourceLocation( + Variables.MODID, + "textures/gui/" + getTexturePack() + + ".png"); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_SRC_COLOR); Tessellator tessellator = Tessellator.instance; - TextureManager texturemanager = - Minecraft.getMinecraft().getTextureManager(); + TextureManager texturemanager = Minecraft + .getMinecraft() + .getTextureManager(); texturemanager.bindTexture(PENTAGRAM_TEXTURE); GL11.glRotatef(rot, 0F, 1F, 0F); GL11.glTranslatef(-0.8F, - (player.isSneaking() ? 0.1625F : 0F) - 1.6F, -0.8F); + (player.isSneaking() ? 0.1625F + : 0F) - 1.6F, + -0.8F); GL11.glRotatef(90F, 1F, 0F, 0F); GL11.glScalef(0.05F, 0.05F, 0.05F); rot += 3F; @@ -196,17 +223,20 @@ public class CursePentagram extends Curse { tessellator.addVertexWithUV((double) (x + 0), (double) (y + height), (double) 0, (double) ((float) (u + 0) * f), - (double) ((float) (v + height) * f1)); + (double) ((float) (v + height) + * f1)); tessellator.addVertexWithUV((double) (x + width), (double) (y + height), (double) 0, (double) ((float) (u + width) * f), - (double) ((float) (v + height) * f1)); + (double) ((float) (v + height) + * f1)); tessellator.addVertexWithUV((double) (x + width), (double) (y + 0), (double) 0, (double) ((float) (u + width) * f), (double) ((float) (v + 0) * f1)); - tessellator.addVertexWithUV((double) (x + 0), (double) (y + 0), - (double) 0, (double) ((float) (u + 0) * f), + tessellator.addVertexWithUV((double) (x + 0), + (double) (y + 0), (double) 0, + (double) ((float) (u + 0) * f), (double) ((float) (v + 0) * f1)); tessellator.draw(); GL11.glDisable(GL11.GL_BLEND); @@ -216,8 +246,9 @@ public class CursePentagram extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".pentagram.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".pentagram.description"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java index c185df3..da61cd7 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java @@ -39,8 +39,10 @@ public class CurseRabbitsPaw extends Curse { public void entityDeathAction(World world, EntityLivingBase target, EntityPlayer player) { if (rand.nextInt(3) == 0) - world.spawnEntityInWorld(new EntityXPOrb(world, target.posX, - target.posY, target.posZ, 1 + rand.nextInt(40))); + world.spawnEntityInWorld(new EntityXPOrb(world, + target.posX, target.posY, + target.posZ, + 1 + rand.nextInt(40))); } @Override @@ -50,14 +52,15 @@ public class CurseRabbitsPaw extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".rabbitspaw.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".rabbitspaw.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".rabbitspaw"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".rabbitspaw"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java index 050605d..78d10bc 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java @@ -17,20 +17,23 @@ public class CurseRottenHeart extends Curse { @Override public void action(World world, EntityPlayer player) { if (!player.isPotionActive(Potion.poison) || player - .getActivePotionEffect(Potion.poison).getDuration() < 30) - player.addPotionEffect(new PotionEffect(Potion.poison.id, 80)); + .getActivePotionEffect(Potion.poison) + .getDuration() < 30) + player.addPotionEffect(new PotionEffect( + Potion.poison.id, 80)); } @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".rottenheart.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".rottenheart.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".rottenheart"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".rottenheart"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseSacredOath.java b/src/main/java/darkknight/jewelrycraft/curses/CurseSacredOath.java index 8faf314..2465b89 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseSacredOath.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseSacredOath.java @@ -12,15 +12,16 @@ public class CurseSacredOath extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".sacredoath.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".sacredoath.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".sacredoath"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".sacredoath"); } - + // TODO implement sacred oath to do something } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java b/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java index 4162001..2264017 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java @@ -10,7 +10,8 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingHealEvent; public class CurseScionOfHell extends Curse { - public CurseScionOfHell(String name, int txtID, String texturepack) { + public CurseScionOfHell(String name, int txtID, + String texturepack) { super(name, txtID, texturepack); } @@ -18,7 +19,8 @@ public class CurseScionOfHell extends Curse { public void entityDeathAction(World world, EntityLivingBase target, EntityPlayer player) { player.setHealth(Math.max(player.getMaxHealth(), - player.getHealth() + target.getMaxHealth() / 5.0f)); + player.getHealth() + target.getMaxHealth() + / 5.0f)); } @Override @@ -34,13 +36,14 @@ public class CurseScionOfHell extends Curse { @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".scionofhell.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".scionofhell.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".scionofhell"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".scionofhell"); } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java index 6707bc0..9b8c1f3 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java @@ -22,33 +22,36 @@ public class CurseVampireHunger extends Curse { super(name, txtID, texturepack); } - public void attackedByPlayerAction(World world, EntityPlayer player, - Entity target) { + public void attackedByPlayerAction(World world, + EntityPlayer player, Entity target) { if (player.shouldHeal() && rand.nextBoolean()) player.heal(1F); } @Override public void action(World world, EntityPlayer player) { - if (!player.capabilities.isCreativeMode && world.isDaytime() - && !world.isRaining() - && world.canBlockSeeTheSky( - MathHelper.floor_double(player.posX), - MathHelper.floor_double(player.posY + 1F), - MathHelper.floor_double(player.posZ))) + if (!player.capabilities.isCreativeMode + && world.isDaytime() && !world.isRaining() + && world.canBlockSeeTheSky(MathHelper + .floor_double(player.posX), + MathHelper.floor_double( + player.posY + 1F), + MathHelper.floor_double( + player.posZ))) player.setFire(8); } @Override public String getDescription() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".vampirehunger.description"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + + ".vampirehunger.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal( - "curse." + Variables.MODID + ".vampirehunger"); + return StatCollector.translateToLocal("curse." + + Variables.MODID + ".vampirehunger"); } @Override -- cgit v1.2.3