From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../jewelrycraft/events/EntityEventHandler.java | 730 +++++++++++++-------- 1 file changed, 462 insertions(+), 268 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java') diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index 6806f65..e9809d0 100755 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -51,64 +51,83 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; public class EntityEventHandler { - int updateTime = 0, - totalUnavailableCurses = 0, luck = 0; + int updateTime = 0, totalUnavailableCurses = 0, luck = 0; - boolean addedCurses = false; + boolean addedCurses = false; - public static Random rand = new Random(); + public static Random rand = new Random(); - public static ArrayList types = new ArrayList(); + public static ArrayList types = new ArrayList(); @SubscribeEvent public void onEntityJoinWorld(EntityJoinWorldEvent event) { if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) { - JewelrycraftMod.netWrapper - .sendToServer(new PacketRequestPlayerInfo()); + JewelrycraftMod.netWrapper.sendToServer( + new PacketRequestPlayerInfo()); } final Entity entity = event.entity; - if (!event.world.isRemote && entity instanceof EntityPlayer) { + if (!event.world.isRemote + && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; NBTTagCompound persistTag = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); boolean shouldGiveManual = ItemList.guide != null - && !persistTag.getBoolean("givenGuide"); + && !persistTag.getBoolean( + "givenGuide"); if (shouldGiveManual) { - ItemStack manual = new ItemStack(ItemList.guide); - - if (!player.inventory.addItemStackToInventory(manual)) { - BlockUtils.dropItemStackInWorld(player.worldObj, - player.posX, player.posY, player.posZ, manual); + ItemStack manual = new ItemStack( + ItemList.guide); + + if (!player.inventory + .addItemStackToInventory( + manual)) { + BlockUtils.dropItemStackInWorld( + player.worldObj, + player.posX, + player.posY, + player.posZ, + manual); } persistTag.setBoolean("givenGuide", true); } - boolean render = persistTag.getBoolean("fancyRender"); + boolean render = persistTag + .getBoolean("fancyRender"); JewelrycraftMod.fancyRender = render; if (ConfigHandler.CURSES_ENABLED) { for (Curse curse : Curse.getCurseList()) { - if (curse.canCurseBeActivated(event.world) - && !persistTag.hasKey(curse.getName())) { - persistTag.setInteger(curse.getName(), 0); + if (curse.canCurseBeActivated( + event.world) + && !persistTag.hasKey( + curse.getName())) { + persistTag.setInteger(curse + .getName(), + 0); } } } for (Curse curse : Curse.getCurseList()) { - if (!curse.canCurseBeActivated(event.world)) { - Curse.availableCurses.remove(curse); - persistTag.setInteger(curse.getName(), 0); + if (!curse.canCurseBeActivated( + event.world)) { + Curse.availableCurses + .remove(curse); + persistTag.setInteger( + curse.getName(), + 0); totalUnavailableCurses++; - } else if (!Curse.availableCurses.contains(curse)) + } else if (!Curse.availableCurses + .contains(curse)) Curse.availableCurses.add(curse); } @@ -151,7 +170,8 @@ public class EntityEventHandler { EntityPlayer player = (EntityPlayer) entity; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); playerInfo.setBoolean("fancyRender", JewelrycraftMod.fancyRender); @@ -161,20 +181,25 @@ public class EntityEventHandler { } for (int i = 0; i < 18; i++) { - if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, + i) != null) { if (getJewelryItems(playerInfo, i) .getItem() instanceof ItemBaseJewelry) { - ((ItemBaseJewelry) getJewelryItems(playerInfo, i) - .getItem()).action( - getJewelryItems(playerInfo, i), + ((ItemBaseJewelry) getJewelryItems( + playerInfo, + i).getItem()).action( + getJewelryItems(playerInfo, + i), player); } if (getJewelryItems(playerInfo, i) .getItem() instanceof IJewelryItem) { - ((IJewelryItem) getJewelryItems(playerInfo, i) - .getItem()).onWearAction( - getJewelryItems(playerInfo, i), + ((IJewelryItem) getJewelryItems( + playerInfo, + i).getItem()).onWearAction( + getJewelryItems(playerInfo, + i), player); } } @@ -191,11 +216,14 @@ public class EntityEventHandler { } if (ConfigHandler.CURSES_ENABLED) { - for (Curse curse : Curse.getCurseList()) { - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo - .getInteger(curse.getName()) > 0) { - curse.action(player.worldObj, player); + for (Curse curse : Curse + .getCurseList()) { + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) { + curse.action(player.worldObj, + player); } } } @@ -206,66 +234,84 @@ public class EntityEventHandler { public void updateCurses(NBTTagCompound playerInfo, EntityPlayer player) { if (playerInfo.hasKey("playerCursePointsChanged") - && playerInfo.getBoolean("playerCursePointsChanged")) { + && playerInfo.getBoolean( + "playerCursePointsChanged")) { int points = playerInfo.getInteger("cursePoints"); - int maxCurses = playerInfo.getInteger("cursePoints") - / Variables.CURSE_POINTS_PER_LEVEL + 1; - - if (points > 0 - && playerInfo.getInteger("activeCurses") < maxCurses) { - while (playerInfo.getInteger("activeCurses") < maxCurses - && Curse.availableCurses.size() > 0 - && playerInfo.getInteger("activeCurses") < Curse - .getCurseList().size()) { + int maxCurses = playerInfo + .getInteger("cursePoints") + / Variables.CURSE_POINTS_PER_LEVEL + + 1; + + if (points > 0 && playerInfo.getInteger( + "activeCurses") < maxCurses) { + while (playerInfo.getInteger( + "activeCurses") < maxCurses + && Curse.availableCurses + .size() > 0 + && playerInfo.getInteger( + "activeCurses") < Curse + .getCurseList() + .size()) { addCurse(player, playerInfo); } } if (!playerInfo.hasKey("curseTime") - || !playerInfo.hasKey("reselectCurses") - || playerInfo.getBoolean("reselectCurses")) { + || !playerInfo.hasKey( + "reselectCurses") + || playerInfo.getBoolean( + "reselectCurses")) { playerInfo.setInteger("curseTime", 23000); - playerInfo.setBoolean("reselectCurses", false); + playerInfo.setBoolean("reselectCurses", + false); } JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); if (addedCurses) { - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("curse." - + Variables.MODID + ".activated"))); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal( + "curse." + Variables.MODID + + ".activated"))); addedCurses = false; } } if (playerInfo.getBoolean("playerCursePointsChanged")) { - playerInfo.setBoolean("playerCursePointsChanged", false); + playerInfo.setBoolean("playerCursePointsChanged", + false); } luck = calculateLuck(player); } public void timeUntilYouCanResetCurses(NBTTagCompound playerInfo) { - if (playerInfo.hasKey("reselectCurses") - && !playerInfo.getBoolean("reselectCurses")) { + if (playerInfo.hasKey("reselectCurses") && !playerInfo + .getBoolean("reselectCurses")) { playerInfo.setInteger("curseTime", - playerInfo.getInteger("curseTime") - 10000); + playerInfo.getInteger("curseTime") + - 10000); if (playerInfo.getInteger("curseTime") <= 0) - playerInfo.setBoolean("reselectCurses", true); + playerInfo.setBoolean("reselectCurses", + true); } } - public ItemStack getJewelryItems(NBTTagCompound playerInfo, int i) { + public ItemStack getJewelryItems(NBTTagCompound playerInfo, + int i) { if (playerInfo.hasKey("ext" + i)) { NBTTagCompound nbt = (NBTTagCompound) playerInfo .getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); + ItemStack item = ItemStack + .loadItemStackFromNBT(nbt); if (item != null) { return item; @@ -277,16 +323,22 @@ public class EntityEventHandler { @SubscribeEvent public void onEntityLivingDropItems(LivingDropsEvent event) { - if (event.source.getEntity() != null - && event.source.getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.source.getEntity(); + if (event.source.getEntity() != null && event.source + .getEntity() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.source + .getEntity(); NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.entityDropItems(player, event.entityLiving, + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.entityDropItems( + player, + event.entityLiving, event.drops); } } @@ -295,130 +347,167 @@ public class EntityEventHandler { public void onEntityAttacked(LivingAttackEvent event) { EntityLivingBase entity = event.entityLiving; - if (event.source.getEntity() != null - && event.source.getEntity() instanceof EntityLivingBase - && ((EntityLivingBase) event.source.getEntity()) - .isPotionActive(PotionList.stun)) + if (event.source.getEntity() != null && event.source + .getEntity() instanceof EntityLivingBase + && ((EntityLivingBase) event.source + .getEntity()).isPotionActive( + PotionList.stun)) event.setCanceled(true); if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); - if (!(event.source.getEntity() instanceof EntityPlayer) + if (!(event.source + .getEntity() instanceof EntityPlayer) && !player.capabilities.isCreativeMode) { if (!player.worldObj.isRemote) for (int i = 0; i < 18; i++) - if (getJewelryItems(playerInfo, i) != null) { - if (getJewelryItems(playerInfo, i) - .getItem() instanceof ItemBaseJewelry) { + if (getJewelryItems( + playerInfo, + i) != null) { + if (getJewelryItems( + playerInfo, + i).getItem() instanceof ItemBaseJewelry) { ((ItemBaseJewelry) getJewelryItems( - playerInfo, i).getItem()) - .onPlayerAttacked( - getJewelryItems( - playerInfo, - i), - player, - event.source, - event.ammount); + playerInfo, + i).getItem()).onPlayerAttacked( + getJewelryItems(playerInfo, + i), + player, + event.source, + event.ammount); if (((ItemBaseJewelry) getJewelryItems( - playerInfo, i).getItem()) - .onPlayerAttackedCacellable( - getJewelryItems( - playerInfo, - i), - player, - event.source, - event.ammount)) { - event.setCanceled(true); + playerInfo, + i).getItem()).onPlayerAttackedCacellable( + getJewelryItems(playerInfo, + i), + player, + event.source, + event.ammount)) { + event.setCanceled( + true); } } - if (getJewelryItems(playerInfo, i) - .getItem() instanceof IJewelryItem) { - ((IJewelryItem) getJewelryItems(playerInfo, - i).getItem()) - .onPlayerAttackedAction( - getJewelryItems( - playerInfo, - i), - player, - event.source, - event.ammount); + if (getJewelryItems( + playerInfo, + i).getItem() instanceof IJewelryItem) { + ((IJewelryItem) getJewelryItems( + playerInfo, + i).getItem()).onPlayerAttackedAction( + getJewelryItems(playerInfo, + i), + player, + event.source, + event.ammount); } } if (ConfigHandler.CURSES_ENABLED) { - for (Curse curse : Curse.getCurseList()) { - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo - .getInteger(curse.getName()) > 0) { - curse.attackedAction(player.worldObj, player, - event, event.source.getEntity()); + for (Curse curse : Curse + .getCurseList()) { + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) { + curse.attackedAction( + player.worldObj, + player, + event, + event.source.getEntity()); } } } } removeHearts(event, player, playerInfo); - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); } if (event.source.getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.source.getEntity(); + EntityPlayer player = (EntityPlayer) event.source + .getEntity(); NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); for (int i = 0; i < 18; i++) - if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, + i) != null) { if (getJewelryItems(playerInfo, i) .getItem() instanceof ItemBaseJewelry) { - ((ItemBaseJewelry) getJewelryItems(playerInfo, i) - .getItem()).onEntityAttacked( - getJewelryItems(playerInfo, i), - player, entity, event.ammount); - if (((ItemBaseJewelry) getJewelryItems(playerInfo, + ((ItemBaseJewelry) getJewelryItems( + playerInfo, + i).getItem()).onEntityAttacked( + getJewelryItems(playerInfo, + i), + player, + entity, + event.ammount); + if (((ItemBaseJewelry) getJewelryItems( + playerInfo, i).getItem()).onEntityAttackedCacellable( - getJewelryItems(playerInfo, i), - player, entity, event.ammount)) - event.setCanceled(true); + getJewelryItems(playerInfo, + i), + player, + entity, + event.ammount)) + event.setCanceled( + true); } if (getJewelryItems(playerInfo, i) .getItem() instanceof IJewelryItem) - ((IJewelryItem) getJewelryItems(playerInfo, i) - .getItem()).onEntityAttackedByPlayer( - getJewelryItems(playerInfo, i), - player, entity, event.ammount); + ((IJewelryItem) getJewelryItems( + playerInfo, + i).getItem()).onEntityAttackedByPlayer( + getJewelryItems(playerInfo, + i), + player, + entity, + event.ammount); } if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo - .getInteger(curse.getName()) > 0) { - curse.attackedByPlayerAction(event, - entity.worldObj, player, entity); - if (curse.attackedByPlayerActionCancelable(event, - player.worldObj, player, entity)) - event.setCanceled(true); + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) { + curse.attackedByPlayerAction( + event, + entity.worldObj, + player, + entity); + if (curse.attackedByPlayerActionCancelable( + event, + player.worldObj, + player, + entity)) + event.setCanceled( + true); } - if (entity instanceof EntityHeart && entity.getAge() < 30) + if (entity instanceof EntityHeart + && entity.getAge() < 30) event.setCanceled(true); if (event.source.getEntity() instanceof EntityPlayerMP) { - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); } } } - public void removeHearts(LivingAttackEvent event, EntityPlayer player, - NBTTagCompound playerInfo) { + public void removeHearts(LivingAttackEvent event, + EntityPlayer player, NBTTagCompound playerInfo) { if (!player.worldObj.isRemote && !player.capabilities.isCreativeMode && (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime @@ -428,17 +517,21 @@ public class EntityEventHandler { } if (playerInfo.getFloat("BlueHeart") > 0) { - float damage = playerInfo.getFloat("BlueHeart") + float damage = playerInfo + .getFloat("BlueHeart") - event.ammount; if (damage >= 0) { - playerInfo.setFloat("BlueHeart", damage); + playerInfo.setFloat("BlueHeart", + damage); } else { - playerInfo.setFloat("BlueHeart", 0f); + playerInfo.setFloat("BlueHeart", + 0f); } if (damage < 0) { System.out.println(damage); - player.attackEntityFrom(event.source, + player.attackEntityFrom( + event.source, Math.abs(damage)); } @@ -446,42 +539,56 @@ public class EntityEventHandler { player.hurtTime = player.maxHurtTime = 10; player.worldObj.playSoundAtEntity(player, "game.player.hurt", 1.0F, - (EntityEventHandler.rand.nextFloat() - - EntityEventHandler.rand.nextFloat()) - * 0.2F + 1.0F); + (EntityEventHandler.rand + .nextFloat() + - EntityEventHandler.rand + .nextFloat()) + * 0.2F + + 1.0F); event.setCanceled(true); } else if (playerInfo.getFloat("BlackHeart") > 0) { AxisAlignedBB axisalignedbb = player.boundingBox .expand(6.0D, 6.0D, 6.0D); List enemies = player.worldObj - .getEntitiesWithinAABBExcludingEntity(player, + .getEntitiesWithinAABBExcludingEntity( + player, axisalignedbb, EntitySelector.selectMonsters); if (enemies != null && !enemies.isEmpty() && event.source != DamageSourceList.blackHeart) { - Iterator iterator = enemies.iterator(); + Iterator iterator = enemies + .iterator(); while (iterator.hasNext()) { - Entity enemy = (Entity) iterator.next(); - enemy.attackEntityFrom(DamageSourceList.blackHeart, + Entity enemy = (Entity) iterator + .next(); + enemy.attackEntityFrom( + DamageSourceList.blackHeart, 6f); } } - float damage = playerInfo.getFloat("BlackHeart") + float damage = playerInfo + .getFloat("BlackHeart") - event.ammount; if (damage >= 0) - playerInfo.setFloat("BlackHeart", damage); + playerInfo.setFloat("BlackHeart", + damage); else - playerInfo.setFloat("BlackHeart", 0f); + playerInfo.setFloat("BlackHeart", + 0f); if (damage < 0) - player.attackEntityFrom(event.source, + player.attackEntityFrom( + event.source, Math.abs(damage)); player.hurtResistantTime = player.maxHurtResistantTime; player.hurtTime = player.maxHurtTime = 10; player.worldObj.playSoundAtEntity(player, "game.player.hurt", 1.0F, - (EntityEventHandler.rand.nextFloat() - - EntityEventHandler.rand.nextFloat()) - * 0.2F + 1.0F); + (EntityEventHandler.rand + .nextFloat() + - EntityEventHandler.rand + .nextFloat()) + * 0.2F + + 1.0F); event.setCanceled(true); } } @@ -492,25 +599,36 @@ public class EntityEventHandler { EntityPlayer player = event.entityPlayer; if (!player.worldObj.isRemote) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (playerInfo.hasKey("cursePoints")) { - int points = playerInfo.getInteger("cursePoints"); - int maxCurses = playerInfo.getInteger("cursePoints") - / Variables.CURSE_POINTS_PER_LEVEL + 1; - if (points > 0 && playerInfo - .getInteger("activeCurses") < maxCurses) - while (playerInfo - .getInteger("activeCurses") < maxCurses - && Curse.availableCurses.size() > 0 - && playerInfo - .getInteger("activeCurses") < Curse - .getCurseList().size()) + int points = playerInfo + .getInteger("cursePoints"); + int maxCurses = playerInfo + .getInteger("cursePoints") + / Variables.CURSE_POINTS_PER_LEVEL + + 1; + if (points > 0 && playerInfo.getInteger( + "activeCurses") < maxCurses) + while (playerInfo.getInteger( + "activeCurses") < maxCurses + && Curse.availableCurses + .size() > 0 + && playerInfo.getInteger( + "activeCurses") < Curse + .getCurseList() + .size()) addCurse(player, playerInfo); if (!playerInfo.hasKey("curseTime") - || !playerInfo.hasKey("reselectCurses") - || playerInfo.getBoolean("reselectCurses")) { - playerInfo.setInteger("curseTime", 23000); - playerInfo.setBoolean("reselectCurses", false); + || !playerInfo.hasKey( + "reselectCurses") + || playerInfo.getBoolean( + "reselectCurses")) { + playerInfo.setInteger("curseTime", + 23000); + playerInfo.setBoolean( + "reselectCurses", + false); } } playerInfo.setFloat("BlueHeart", 0f); @@ -518,42 +636,56 @@ public class EntityEventHandler { playerInfo.setFloat("WhiteHeart", 0f); if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.respawnAction(player.worldObj, player); + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.respawnAction( + player.worldObj, + player); for (int i = 0; i < 18; i++) - if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, + i) != null) { if (getJewelryItems(playerInfo, i) .getItem() instanceof ItemBaseJewelry) - ((ItemBaseJewelry) getJewelryItems(playerInfo, i) - .getItem()).onPlayerRespawn( - getJewelryItems(playerInfo, i), + ((ItemBaseJewelry) getJewelryItems( + playerInfo, + i).getItem()).onPlayerRespawn( + getJewelryItems(playerInfo, + i), event); if (getJewelryItems(playerInfo, i) .getItem() instanceof IJewelryItem) - ((IJewelryItem) getJewelryItems(playerInfo, i) - .getItem()).onPlayerRespawnAction( - getJewelryItems(playerInfo, i), + ((IJewelryItem) getJewelryItems( + playerInfo, + i).getItem()).onPlayerRespawnAction( + getJewelryItems(playerInfo, + i), event); } JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); if (addedCurses) { - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); addedCurses = false; } } } - public void addCurse(EntityPlayer player, NBTTagCompound playerInfo) { + public void addCurse(EntityPlayer player, + NBTTagCompound playerInfo) { if (ConfigHandler.CURSES_ENABLED && Curse.availableCurses.size() > 0) { Curse cur = ((WeightedRandomCurse) WeightedRandom - .getRandomItem(rand, JewelrycraftUtil - .getCurses(player.worldObj, player, rand))) - .getCurse(rand); + .getRandomItem(rand, + JewelrycraftUtil.getCurses( + player.worldObj, + player, + rand))).getCurse( + rand); playerInfo.setInteger(cur.getName(), 1); Curse.availableCurses.remove(cur); addedCurses = true; @@ -561,11 +693,14 @@ public class EntityEventHandler { playerInfo.setInteger("activeCurses", 1); else playerInfo.setInteger("activeCurses", - playerInfo.getInteger("activeCurses") + 1); - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + playerInfo.getInteger( + "activeCurses") + + 1); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); } } @@ -573,30 +708,38 @@ public class EntityEventHandler { @SubscribeEvent public void itemToss(ItemTossEvent event) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(event.player, Variables.MODID); + .getModPlayerPersistTag(event.player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (event.player != null - && curse.canCurseBeActivated(event.player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0 + if (event.player != null && curse + .canCurseBeActivated( + event.player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0 && curse.itemToss()) { EntityItem entityitem = new EntityItem( event.player.worldObj, - event.player.posX + 0.5D, - event.player.posY + 0.5D, - event.player.posZ + 0.5D, + event.player.posX + + 0.5D, + event.player.posY + + 0.5D, + event.player.posZ + + 0.5D, event.entityItem.getEntityItem()); if (entityitem != null) { entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; event.player.worldObj - .spawnEntityInWorld(entityitem); + .spawnEntityInWorld( + entityitem); MinecraftServer.getServer() .getConfigurationManager() - .sendChatMsg(new ChatComponentText("<" - + event.player.getDisplayName() - + "> I shouldn't drop this. I might need it later.")); + .sendChatMsg(new ChatComponentText( + "<" + event.player + .getDisplayName() + + "> I shouldn't drop this. I might need it later.")); event.setCanceled(true); } } @@ -606,18 +749,21 @@ public class EntityEventHandler { public void playerFileSave(PlayerEvent.SaveToFile event) { if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) - JewelrycraftMod.netWrapper - .sendToServer(new PacketRequestPlayerInfo()); + JewelrycraftMod.netWrapper.sendToServer( + new PacketRequestPlayerInfo()); } public int calculateLuck(EntityPlayer player) { int luck = 0; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) luck += curse.luck(); return luck; } @@ -628,28 +774,35 @@ public class EntityEventHandler { if (rand.nextInt(chance) == 0 && live .getCreatureAttribute() != JewelrycraftUtil.HEARTS) { if (type == "White") { - EntityHeart h = new EntityHalfHeart(live.worldObj); + EntityHeart h = new EntityHalfHeart( + live.worldObj); h.setType(type); - h.setLocationAndAngles(live.posX, live.posY, live.posZ, + h.setLocationAndAngles(live.posX, + live.posY, live.posZ, MathHelper.wrapAngleTo180_float( rand.nextFloat() * 360.0F), 0.0F); live.worldObj.spawnEntityInWorld(h); } else { - for (int i = 1; - i <= 1 + rand.nextInt( - 1 + (int) (live.getMaxHealth() / 2)); - i++) { + for (int i = 1; i <= 1 + rand.nextInt(1 + + (int) (live.getMaxHealth() + / 2)); i++) { EntityHeart[] hearts = { new EntityHeart(live.worldObj), - new EntityHalfHeart(entity.worldObj) }; - EntityHeart h = hearts[rand.nextInt(2)]; + new EntityHalfHeart( + entity.worldObj) + }; + EntityHeart h = hearts[rand + .nextInt(2)]; h.setType(type); - h.setLocationAndAngles(live.posX, live.posY, live.posZ, + h.setLocationAndAngles(live.posX, + live.posY, + live.posZ, MathHelper.wrapAngleTo180_float( rand.nextFloat() * 360.0F), 0.0F); - live.worldObj.spawnEntityInWorld(h); + live.worldObj.spawnEntityInWorld( + h); } } } @@ -658,44 +811,64 @@ public class EntityEventHandler { @SubscribeEvent public void onEntityDead(LivingDeathEvent event) { final Entity entity = event.entity; - if (!entity.worldObj.isRemote && !(entity instanceof EntityPlayer) + if (!entity.worldObj.isRemote + && !(entity instanceof EntityPlayer) && entity instanceof EntityLiving && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { System.out.println(luck); spawnHearts(entity, Math.max(2, 20 - luck)); - EntityPlayer player = (EntityPlayer) event.source.getEntity(); + EntityPlayer player = (EntityPlayer) event.source + .getEntity(); NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.entityDeathAction(player.worldObj, - event.entityLiving, player); + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.entityDeathAction( + player.worldObj, + event.entityLiving, + player); } if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); playerInfo.setFloat("BlueHeart", 0f); playerInfo.setFloat("BlackHeart", 0f); playerInfo.setFloat("WhiteHeart", 0f); if (playerInfo.hasKey("reselectCurses") - && playerInfo.getBoolean("reselectCurses")) { + && playerInfo.getBoolean( + "reselectCurses")) { playerInfo.setInteger("activeCurses", 0); if (ConfigHandler.CURSES_ENABLED) - for (Curse l : Curse.getCurseList()) { - if (l.canCurseBeActivated(player.worldObj) - && playerInfo - .getInteger(l.getName()) == 1) { - playerInfo.setInteger(l.getName(), 0); - l.setTicksActive(0); - if (!Curse.availableCurses.contains(l)) - Curse.availableCurses.add(l); - } else if (l.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(l.getName()) >= 2) - playerInfo.setInteger(l.getName(), 1); + for (Curse l : Curse + .getCurseList()) { + if (l.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + l.getName()) == 1) { + playerInfo.setInteger( + l.getName(), + 0); + l.setTicksActive( + 0); + if (!Curse.availableCurses + .contains(l)) + Curse.availableCurses + .add(l); + } else if (l.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + l.getName()) >= 2) + playerInfo.setInteger( + l.getName(), + 1); } if (entity.worldObj.isRemote) JewelrycraftMod.netWrapper @@ -704,32 +877,43 @@ public class EntityEventHandler { if (ConfigHandler.CURSES_ENABLED) { for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.playerDeathAction(player.worldObj, player, + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.playerDeathAction( + player.worldObj, + player, event); } for (int i = 0; i < 18; i++) - if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, + i) != null) { if (getJewelryItems(playerInfo, i) .getItem() instanceof ItemBaseJewelry) - ((ItemBaseJewelry) getJewelryItems(playerInfo, i) - .getItem()).onPlayerDead( - getJewelryItems(playerInfo, i), - player, event.source); + ((ItemBaseJewelry) getJewelryItems( + playerInfo, + i).getItem()).onPlayerDead( + getJewelryItems(playerInfo, + i), + player, + event.source); if (getJewelryItems(playerInfo, i) .getItem() instanceof IJewelryItem) - ((IJewelryItem) getJewelryItems(playerInfo, i) - .getItem()).onPlayerDeadAction( - getJewelryItems(playerInfo, i), - player, event.source); + ((IJewelryItem) getJewelryItems( + playerInfo, + i).getItem()).onPlayerDeadAction( + getJewelryItems(playerInfo, + i), + player, + event.source); } } if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) - JewelrycraftMod.netWrapper - .sendToServer(new PacketRequestPlayerInfo()); + JewelrycraftMod.netWrapper.sendToServer( + new PacketRequestPlayerInfo()); } @SubscribeEvent @@ -737,30 +921,40 @@ public class EntityEventHandler { if (event.entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entity; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) { for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.playerHealAction(player.worldObj, player, + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.playerHealAction( + player.worldObj, + player, event); } } } - + @SubscribeEvent public void onPlayerSleep(PlayerSleepInBedEvent event) { if (event.entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entity; NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (ConfigHandler.CURSES_ENABLED) { for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated(player.worldObj) - && playerInfo.getInteger(curse.getName()) > 0) - curse.playerSleepAction(player.worldObj, player, + if (curse.canCurseBeActivated( + player.worldObj) + && playerInfo.getInteger( + curse.getName()) > 0) + curse.playerSleepAction( + player.worldObj, + player, event); } } -- cgit v1.2.3