From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/events/EntityEventHandler.java | 787 ++++++--------------- 1 file changed, 203 insertions(+), 584 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 e9809d0..355d041 100755 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -21,11 +21,7 @@ import darkknight.jewelrycraft.network.PacketSendServerPlayersInfo; import darkknight.jewelrycraft.potions.PotionBase; import darkknight.jewelrycraft.potions.PotionList; import darkknight.jewelrycraft.random.WeightedRandomCurse; -import darkknight.jewelrycraft.util.BlockUtils; -import darkknight.jewelrycraft.util.EntitySelector; -import darkknight.jewelrycraft.util.JewelrycraftUtil; -import darkknight.jewelrycraft.util.PlayerUtils; -import darkknight.jewelrycraft.util.Variables; +import darkknight.jewelrycraft.util.*; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -35,11 +31,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.util.WeightedRandom; +import net.minecraft.util.*; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -61,73 +53,47 @@ public class EntityEventHandler { @SubscribeEvent public void onEntityJoinWorld(EntityJoinWorldEvent event) { - if (event.entity instanceof EntityPlayer - && !(event.entity instanceof EntityPlayerMP)) { - JewelrycraftMod.netWrapper.sendToServer( - new PacketRequestPlayerInfo()); + if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) { + 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); + NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - boolean shouldGiveManual = ItemList.guide != null - && !persistTag.getBoolean( - "givenGuide"); + boolean shouldGiveManual = ItemList.guide != null && !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); } @@ -169,38 +135,24 @@ public class EntityEventHandler { if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - playerInfo.setBoolean("fancyRender", - JewelrycraftMod.fancyRender); + playerInfo.setBoolean("fancyRender", JewelrycraftMod.fancyRender); if (updateTime > 0) { updateTime--; } for (int i = 0; i < 18; i++) { - if (getJewelryItems(playerInfo, - i) != null) { - if (getJewelryItems(playerInfo, i) - .getItem() instanceof ItemBaseJewelry) { - ((ItemBaseJewelry) getJewelryItems( - playerInfo, - i).getItem()).action( - getJewelryItems(playerInfo, - i), - player); + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) { + ((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), - player); + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) { + ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()) + .onWearAction(getJewelryItems(playerInfo, i), player); } } } @@ -210,20 +162,14 @@ public class EntityEventHandler { updateCurses(playerInfo, player); if (updateTime == 0) { - JewelrycraftMod.netWrapper - .sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); updateTime = 200; } 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); } } } @@ -231,87 +177,55 @@ public class EntityEventHandler { } } - public void updateCurses(NBTTagCompound playerInfo, - EntityPlayer player) { - if (playerInfo.hasKey("playerCursePointsChanged") - && playerInfo.getBoolean( - "playerCursePointsChanged")) { + public void updateCurses(NBTTagCompound playerInfo, EntityPlayer player) { + if (playerInfo.hasKey("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")) { + if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") + || playerInfo.getBoolean("reselectCurses")) { playerInfo.setInteger("curseTime", 23000); - playerInfo.setBoolean("reselectCurses", - false); + playerInfo.setBoolean("reselectCurses", false); } - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + JewelrycraftMod.netWrapper.sendTo(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")) { - playerInfo.setInteger("curseTime", - playerInfo.getInteger("curseTime") - - 10000); + if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")) { + playerInfo.setInteger("curseTime", 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); + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack - .loadItemStackFromNBT(nbt); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null) { return item; @@ -323,23 +237,13 @@ 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(); - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + NBTTagCompound playerInfo = PlayerUtils.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, - event.drops); + if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) + curse.entityDropItems(player, event.entityLiving, event.drops); } } @@ -347,248 +251,127 @@ 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); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - if (!(event.source - .getEntity() instanceof EntityPlayer) - && !player.capabilities.isCreativeMode) { + 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) { - ((ItemBaseJewelry) getJewelryItems( - 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); + 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); + + if (((ItemBaseJewelry) getJewelryItems(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.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); } if (event.source.getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.source - .getEntity(); - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); for (int i = 0; i < 18; i++) - 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, - i).getItem()).onEntityAttackedCacellable( - getJewelryItems(playerInfo, - i), - player, - entity, - event.ammount)) - event.setCanceled( - true); + 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, i).getItem()).onEntityAttackedCacellable( + 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); + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) + ((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.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); } } } - public void removeHearts(LivingAttackEvent event, - EntityPlayer player, NBTTagCompound playerInfo) { - if (!player.worldObj.isRemote - && !player.capabilities.isCreativeMode - && (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime - / 2.0F) { + public void removeHearts(LivingAttackEvent event, EntityPlayer player, NBTTagCompound playerInfo) { + if (!player.worldObj.isRemote && !player.capabilities.isCreativeMode + && (float) player.hurtResistantTime <= (float) player.maxHurtResistantTime / 2.0F) { if (playerInfo.getFloat("WhiteHeart") > 0) { playerInfo.setFloat("WhiteHeart", 0f); } if (playerInfo.getFloat("BlueHeart") > 0) { - float damage = playerInfo - .getFloat("BlueHeart") - - event.ammount; + 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, - Math.abs(damage)); + 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); + player.worldObj.playSoundAtEntity(player, "game.player.hurt", 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, - axisalignedbb, - EntitySelector.selectMonsters); - if (enemies != null && !enemies.isEmpty() - && event.source != DamageSourceList.blackHeart) { - Iterator iterator = enemies - .iterator(); + AxisAlignedBB axisalignedbb = player.boundingBox.expand(6.0D, 6.0D, 6.0D); + List enemies = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, axisalignedbb, + EntitySelector.selectMonsters); + if (enemies != null && !enemies.isEmpty() && event.source != DamageSourceList.blackHeart) { + Iterator iterator = enemies.iterator(); while (iterator.hasNext()) { - Entity enemy = (Entity) iterator - .next(); - enemy.attackEntityFrom( - DamageSourceList.blackHeart, - 6f); + Entity enemy = (Entity) iterator.next(); + enemy.attackEntityFrom(DamageSourceList.blackHeart, 6f); } } - float damage = playerInfo - .getFloat("BlackHeart") - - event.ammount; + 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, - Math.abs(damage)); + 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); + player.worldObj.playSoundAtEntity(player, "game.player.hurt", 1.0F, + (EntityEventHandler.rand.nextFloat() - EntityEventHandler.rand.nextFloat()) * 0.2F + 1.0F); event.setCanceled(true); } } @@ -598,37 +381,18 @@ public class EntityEventHandler { public void onPlayerRespawn(PlayerEvent.Clone event) { EntityPlayer player = event.entityPlayer; if (!player.worldObj.isRemote) { - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.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); + if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") + || playerInfo.getBoolean("reselectCurses")) { + playerInfo.setInteger("curseTime", 23000); + playerInfo.setBoolean("reselectCurses", false); } } playerInfo.setFloat("BlueHeart", 0f); @@ -636,110 +400,57 @@ 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) - .getItem() instanceof ItemBaseJewelry) - ((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), - event); + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) + ((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), event); } - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + JewelrycraftMod.netWrapper.sendTo(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) { - if (ConfigHandler.CURSES_ENABLED - && Curse.availableCurses.size() > 0) { - Curse cur = ((WeightedRandomCurse) WeightedRandom - .getRandomItem(rand, - JewelrycraftUtil.getCurses( - player.worldObj, - player, - rand))).getCurse( - rand); + 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); playerInfo.setInteger(cur.getName(), 1); Curse.availableCurses.remove(cur); addedCurses = true; if (playerInfo.getInteger("activeCurses") == 0) playerInfo.setInteger("activeCurses", 1); else - playerInfo.setInteger("activeCurses", - playerInfo.getInteger( - "activeCurses") - + 1); - JewelrycraftMod.netWrapper.sendToAll( - new PacketSendServerPlayersInfo()); - JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo( - playerInfo), - (EntityPlayerMP) player); + playerInfo.setInteger("activeCurses", playerInfo.getInteger("activeCurses") + 1); + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); } } @SubscribeEvent public void itemToss(ItemTossEvent event) { - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(event.player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.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 - && 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.entityItem.getEntityItem()); + 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.entityItem.getEntityItem()); if (entityitem != null) { entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; - event.player.worldObj - .spawnEntityInWorld( - entityitem); - MinecraftServer.getServer() - .getConfigurationManager() - .sendChatMsg(new ChatComponentText( - "<" + event.player - .getDisplayName() - + "> I shouldn't drop this. I might need it later.")); + event.player.worldObj.spawnEntityInWorld(entityitem); + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("<" + + event.player.getDisplayName() + "> I shouldn't drop this. I might need it later.")); event.setCanceled(true); } } @@ -747,23 +458,16 @@ public class EntityEventHandler { @SubscribeEvent public void playerFileSave(PlayerEvent.SaveToFile event) { - if (event.entity instanceof EntityPlayer - && !(event.entity instanceof EntityPlayerMP)) - JewelrycraftMod.netWrapper.sendToServer( - new PacketRequestPlayerInfo()); + if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) + JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); } public int calculateLuck(EntityPlayer player) { int luck = 0; - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.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; } @@ -771,38 +475,21 @@ public class EntityEventHandler { public static void spawnHearts(Entity entity, int chance) { EntityLiving live = (EntityLiving) entity; String type = types.get(rand.nextInt(types.size())); - if (rand.nextInt(chance) == 0 && live - .getCreatureAttribute() != JewelrycraftUtil.HEARTS) { + 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, - MathHelper.wrapAngleTo180_float( - rand.nextFloat() * 360.0F), - 0.0F); + 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++) { - EntityHeart[] hearts = { - new EntityHeart(live.worldObj), - new EntityHalfHeart( - entity.worldObj) - }; - EntityHeart h = hearts[rand - .nextInt(2)]; + 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)]; h.setType(type); - h.setLocationAndAngles(live.posX, - live.posY, - live.posZ, - MathHelper.wrapAngleTo180_float( - rand.nextFloat() * 360.0F), - 0.0F); - live.worldObj.spawnEntityInWorld( - h); + h.setLocationAndAngles(live.posX, live.posY, live.posZ, + MathHelper.wrapAngleTo180_float(rand.nextFloat() * 360.0F), 0.0F); + live.worldObj.spawnEntityInWorld(h); } } } @@ -811,129 +498,69 @@ public class EntityEventHandler { @SubscribeEvent public void onEntityDead(LivingDeathEvent event) { final Entity entity = event.entity; - if (!entity.worldObj.isRemote - && !(entity instanceof EntityPlayer) - && entity instanceof EntityLiving - && event.source.getEntity() != null - && event.source.getEntity() 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(); - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + NBTTagCompound playerInfo = PlayerUtils.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); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); playerInfo.setFloat("BlueHeart", 0f); playerInfo.setFloat("BlackHeart", 0f); playerInfo.setFloat("WhiteHeart", 0f); - if (playerInfo.hasKey("reselectCurses") - && playerInfo.getBoolean( - "reselectCurses")) { + if (playerInfo.hasKey("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 - .sendToServer(new PacketRequestPlayerInfo()); + JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); } if (ConfigHandler.CURSES_ENABLED) { for (Curse curse : Curse.getCurseList()) - if (curse.canCurseBeActivated( - player.worldObj) - && playerInfo.getInteger( - curse.getName()) > 0) - curse.playerDeathAction( - player.worldObj, - player, - event); + 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) - .getItem() instanceof ItemBaseJewelry) - ((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); + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) + ((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); } } - if (event.entity instanceof EntityPlayer - && !(event.entity instanceof EntityPlayerMP)) - JewelrycraftMod.netWrapper.sendToServer( - new PacketRequestPlayerInfo()); + if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) + JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); } @SubscribeEvent public void onEntityHeal(LivingHealEvent event) { if (event.entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entity; - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.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, - event); + if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) + curse.playerHealAction(player.worldObj, player, event); } } } @@ -942,20 +569,12 @@ public class EntityEventHandler { public void onPlayerSleep(PlayerSleepInBedEvent event) { if (event.entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entity; - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.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, - event); + if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) + curse.playerSleepAction(player.worldObj, player, event); } } } -- cgit v1.2.3