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/BlockEventHandler.java | 56 +- .../jewelrycraft/events/BucketHandler.java | 35 +- .../jewelrycraft/events/EntityEventHandler.java | 787 ++++++-------------- .../darkknight/jewelrycraft/events/EventList.java | 12 +- .../jewelrycraft/events/KeyBindings.java | 17 +- .../jewelrycraft/events/PlayerRenderHandler.java | 809 +++++---------------- .../jewelrycraft/events/ScreenHandler.java | 96 +-- .../jewelrycraft/events/TextureEvent.java | 5 +- 8 files changed, 441 insertions(+), 1376 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/events') diff --git a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java index 964ebd2..210f9e5 100755 --- a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java @@ -24,40 +24,18 @@ public class BlockEventHandler { @SubscribeEvent public void onBlockDestroyed(BlockEvent.BreakEvent event) { if (event.getPlayer() != null) { - ItemStack item = event.getPlayer().inventory - .getCurrentItem(); - if (event.block instanceof BlockMidasTouch - && item != null - && item.getItem().getHarvestLevel( - item, - "pickaxe") >= event.block - .getHarvestLevel( - event.blockMetadata)) { - TileEntityMidasTouch te = (TileEntityMidasTouch) event.world - .getTileEntity(event.x, - event.y, - event.z); + ItemStack item = event.getPlayer().inventory.getCurrentItem(); + if (event.block instanceof BlockMidasTouch && item != null && item.getItem().getHarvestLevel(item, + "pickaxe") >= event.block.getHarvestLevel(event.blockMetadata)) { + TileEntityMidasTouch te = (TileEntityMidasTouch) event.world.getTileEntity(event.x, event.y, event.z); if (te.target != null) - dropItem(te.getWorldObj(), - te.xCoord, - te.yCoord, - te.zCoord, - new ItemStack(Items.gold_nugget, - (int) (te.target.width - * te.target.height - * 100), - 0)); + dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, + new ItemStack(Items.gold_nugget, (int) (te.target.width * te.target.height * 100), 0)); } - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag( - event.getPlayer(), - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.getPlayer(), Variables.MODID); for (Curse curse : Curse.getCurseList()) - if (playerInfo.getInteger( - curse.getName()) > 0) - curse.onBlockDestroyed( - event.getPlayer(), - event); + if (playerInfo.getInteger(curse.getName()) > 0) + curse.onBlockDestroyed(event.getPlayer(), event); } } @@ -65,21 +43,15 @@ public class BlockEventHandler { public void onBlockItemsDrop(BlockEvent.HarvestDropsEvent event) { EntityPlayer player = event.harvester; if (player != null) { - NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, - Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); for (Curse curse : Curse.getCurseList()) - if (playerInfo.getInteger( - curse.getName()) > 0) - curse.onBlockItemsDrop(player, - event); + if (playerInfo.getInteger(curse.getName()) > 0) + curse.onBlockItemsDrop(player, event); } } - 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); + 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.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java index 13948af..d00b8f5 100755 --- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java @@ -23,44 +23,31 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.FillBucketEvent; public class BucketHandler { - public static BucketHandler INSTANCE = new BucketHandler(); - public Map buckets = new HashMap(); + public static BucketHandler INSTANCE = new BucketHandler(); + public Map buckets = new HashMap(); private BucketHandler() { } @SubscribeEvent public void onBucketFill(FillBucketEvent event) { - ItemStack result = fillCustomBucket(event.world, - event.target); + ItemStack result = fillCustomBucket(event.world, event.target); if (result == null) return; event.result = result; event.setResult(Result.ALLOW); } - private ItemStack fillCustomBucket(World world, - MovingObjectPosition pos) { - Block block = world.getBlock(pos.blockX, pos.blockY, - pos.blockZ); + private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) { + Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); Item bucket = buckets.get(block); - if (bucket != null - && world.getBlock(pos.blockX, pos.blockY, - pos.blockZ) != Blocks.air - && world.getBlock(pos.blockX, pos.blockY, - pos.blockZ) instanceof BlockMoltenMetal) { + if (bucket != null && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) != Blocks.air + && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) instanceof BlockMoltenMetal) { ItemStack item = new ItemStack(bucket); - if (BlockMoltenMetal.getTileEntity(world, - pos.blockX, pos.blockY, - pos.blockZ) != null) - JewelryNBT.addMetal(item, BlockMoltenMetal - .getTileEntity(world, - pos.blockX, - pos.blockY, - pos.blockZ) - .getMetal()); - world.setBlockToAir(pos.blockX, pos.blockY, - pos.blockZ); + if (BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ) != null) + JewelryNBT.addMetal(item, + BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ).getMetal()); + world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); return item; } else return null; 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); } } } diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java index 17f6d0e..ed764f3 100755 --- a/src/main/java/darkknight/jewelrycraft/events/EventList.java +++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java @@ -21,15 +21,12 @@ import net.minecraftforge.common.MinecraftForge; public class EventList { public static void preInit(FMLPreInitializationEvent e) { - MinecraftForge.EVENT_BUS - .register(new EntityEventHandler()); + MinecraftForge.EVENT_BUS.register(new EntityEventHandler()); MinecraftForge.EVENT_BUS.register(new BlockEventHandler()); MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); - FMLCommonHandler.instance().bus() - .register(new EventCommonHandler()); - BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, - ItemList.bucket); + FMLCommonHandler.instance().bus().register(new EventCommonHandler()); + BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, ItemList.bucket); JewelrycraftMod.proxy.preInit(); } @@ -37,8 +34,7 @@ public class EventList { GameRegistry.registerWorldGenerator(new Generation(), 0); JewelrycraftMod.proxy.init(); new GuiHandler(); - FMLCommonHandler.instance().bus() - .register(ConfigHandler.INSTANCE); + FMLCommonHandler.instance().bus().register(ConfigHandler.INSTANCE); } public static void postInit(FMLPostInitializationEvent e) { diff --git a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java index d196a05..ac22df3 100755 --- a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java +++ b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java @@ -11,14 +11,9 @@ import darkknight.jewelrycraft.util.Variables; import net.minecraft.client.settings.KeyBinding; public class KeyBindings { - public static KeyBinding render = new KeyBinding( - "Pretty Render", Keyboard.KEY_Z, - Variables.MODNAME); - public static KeyBinding inventory = new KeyBinding( - "Jewelry Inventory", Keyboard.KEY_J, - Variables.MODNAME); - public static KeyBinding curses = new KeyBinding( - "Curses Tab", Keyboard.KEY_C, Variables.MODNAME); + public static KeyBinding render = new KeyBinding("Pretty Render", Keyboard.KEY_Z, Variables.MODNAME); + public static KeyBinding inventory = new KeyBinding("Jewelry Inventory", Keyboard.KEY_J, Variables.MODNAME); + public static KeyBinding curses = new KeyBinding("Curses Tab", Keyboard.KEY_C, Variables.MODNAME); /** * @@ -37,10 +32,8 @@ public class KeyBindings { if (render.isPressed()) JewelrycraftMod.fancyRender = !JewelrycraftMod.fancyRender; if (inventory.isPressed()) - JewelrycraftMod.netWrapper.sendToServer( - new PacketKeyPressEvent(0)); + JewelrycraftMod.netWrapper.sendToServer(new PacketKeyPressEvent(0)); if (curses.isPressed()) - JewelrycraftMod.netWrapper.sendToServer( - new PacketKeyPressEvent(1)); + JewelrycraftMod.netWrapper.sendToServer(new PacketKeyPressEvent(1)); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java index 40be3e5..3e5e80d 100755 --- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java @@ -23,12 +23,12 @@ import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.RenderPlayerEvent; public class PlayerRenderHandler { - EarringsRender earrings = new EarringsRender(); - BraceletRender bracelet = new BraceletRender(); - NecklaceRender necklace = new NecklaceRender(); - RingRender ring = new RingRender(); - public static NBTTagCompound playersInfo = new NBTTagCompound(); - float size = 0.055F; + EarringsRender earrings = new EarringsRender(); + BraceletRender bracelet = new BraceletRender(); + NecklaceRender necklace = new NecklaceRender(); + RingRender ring = new RingRender(); + public static NBTTagCompound playersInfo = new NBTTagCompound(); + float size = 0.055F; @SubscribeEvent public void renderScreen(RenderPlayerEvent.Specials.Post event) { @@ -37,716 +37,271 @@ public class PlayerRenderHandler { ModelRenderer leftArm = event.renderer.modelBipedMain.bipedLeftArm; ModelRenderer head = event.renderer.modelBipedMain.bipedHead; ModelRenderer body = event.renderer.modelBipedMain.bipedBody; - Iterator players = event.entityPlayer.worldObj.playerEntities - .iterator(); + Iterator players = event.entityPlayer.worldObj.playerEntities.iterator(); float rotAngleX = 0F, rotAngleY = 0F, rotAngleZ = 0F; if (playersInfo != null) { while (players.hasNext()) { - int[] gemColor = { - -1, -1, -1, -1 - }; - int[] ingotColor = { - -1, -1, -1, -1 - }; + int[] gemColor = { -1, -1, -1, -1 }; + int[] ingotColor = { -1, -1, -1, -1 }; int gem = -1; int ingot = -1; EntityPlayer player = players.next(); - NBTTagCompound playerInfo = (NBTTagCompound) playersInfo - .getTag(player.getDisplayName()); + NBTTagCompound playerInfo = (NBTTagCompound) playersInfo.getTag(player.getDisplayName()); if (ConfigHandler.CURSES_ENABLED) - for (Curse curse : Curse - .getCurseList()) - if (curse != null && curse - .canCurseBeActivated( - player.worldObj) - && playerInfo != null - && curse.getName() != null - && playerInfo.getInteger( - curse.getName()) > 0 - && event.entityPlayer != null - && player != null - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName()) - && playerInfo.getInteger( - "cursePoints") > 0) - curse.playerRender( - player, - event); + for (Curse curse : Curse.getCurseList()) + if (curse != null && curse.canCurseBeActivated(player.worldObj) && playerInfo != null + && curse.getName() != null && playerInfo.getInteger(curse.getName()) > 0 + && event.entityPlayer != null && player != null + && event.entityPlayer.getDisplayName().equals(player.getDisplayName()) + && playerInfo.getInteger("cursePoints") > 0) + curse.playerRender(player, event); int no = 0; ModelRenderer arm = rightArm; for (int i = 0; i <= 9; i++) - if (playerInfo != null - && event.entityPlayer != null - && player != null - && playerInfo.hasKey( - "ext" + i) - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { + if (playerInfo != null && event.entityPlayer != null && player != null + && playerInfo.hasKey("ext" + i) + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { gem = -1; ingot = -1; if (i > 4) arm = leftArm; float s = 0.055F; - NBTTagCompound nbt = (NBTTagCompound) playerInfo - .getTag("ext" + i); - ItemStack item = ItemStack - .loadItemStackFromNBT( - nbt); + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) arm = body; GL11.glPushMatrix(); - if (arm.rotateAngleX == 0.0F - && arm.rotateAngleY == 0.0F - && arm.rotateAngleZ == 0.0F) { - if ((arm.rotationPointX - + rotAngleX) != 0.0F - || (arm.rotationPointY - + rotAngleY) != 0.0F - || (arm.rotationPointZ - + rotAngleZ) != 0.0F) - GL11.glTranslatef( - (arm.rotationPointX - + rotAngleX) - * s, - (arm.rotationPointY - + rotAngleY) - * s, - (arm.rotationPointZ - + rotAngleZ) - * s); + if (arm.rotateAngleX == 0.0F && arm.rotateAngleY == 0.0F && arm.rotateAngleZ == 0.0F) { + if ((arm.rotationPointX + rotAngleX) != 0.0F || (arm.rotationPointY + rotAngleY) != 0.0F + || (arm.rotationPointZ + rotAngleZ) != 0.0F) + GL11.glTranslatef((arm.rotationPointX + rotAngleX) * s, + (arm.rotationPointY + rotAngleY) * s, (arm.rotationPointZ + rotAngleZ) * s); } else if (!Loader .isModLoaded("alpaca") /* - * || - * (Loader - * . - * isModLoaded( - * "alpaca") - * && - * !fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer - * ) - * ) - */) { - GL11.glTranslatef( - (arm.rotationPointX - + rotAngleX) - * s, - (arm.rotationPointY - + rotAngleY) - * s, - (arm.rotationPointZ - + rotAngleZ) - * s); + * || (Loader . isModLoaded( "alpaca") && !fiskfille . alpaca . + * AlpacaAPI. isAlpacaClient ( event. entityPlayer ) ) + */) { + GL11.glTranslatef((arm.rotationPointX + rotAngleX) * s, + (arm.rotationPointY + rotAngleY) * s, (arm.rotationPointZ + rotAngleZ) * s); if (arm.rotateAngleZ != 0.0F) - GL11.glRotatef(arm.rotateAngleZ - * (180F / (float) Math.PI), - 0.0F, - 0.0F, - 1.0F); + GL11.glRotatef(arm.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); if (arm.rotateAngleY != 0.0F) - GL11.glRotatef(arm.rotateAngleY - * (180F / (float) Math.PI), - 0.0F, - 1.0F, - 0.0F); + GL11.glRotatef(arm.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); if (arm.rotateAngleX != 0.0F) - GL11.glRotatef(arm.rotateAngleX - * (180F / (float) Math.PI), - 1.0F, - 0.0F, - 0.0F); + GL11.glRotatef(arm.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } - if (JewelryNBT.ingot( - item) != null) - ingot = JewelrycraftUtil - .getColor(JewelryNBT - .ingot(item)); - if (JewelryNBT.gem( - item) != null) - gem = JewelrycraftUtil - .getColor(JewelryNBT - .gem(item)); + if (JewelryNBT.ingot(item) != null) + ingot = JewelrycraftUtil.getColor(JewelryNBT.ingot(item)); + if (JewelryNBT.gem(item) != null) + gem = JewelrycraftUtil.getColor(JewelryNBT.gem(item)); float scale = 0.1f; if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) { + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) { if (i <= 4) { - GL11.glTranslatef( - 0.35F, - -4.35F, - -2.8F + 0.15F * i); - GL11.glRotatef(90f, - 0F, - 1F, - 0F); + GL11.glTranslatef(0.35F, -4.35F, -2.8F + 0.15F * i); + GL11.glRotatef(90f, 0F, 1F, 0F); } else { - GL11.glTranslatef( - -0.35F, - -4.35F, - 1.48F + 0.15F * i); - GL11.glRotatef(-90f, - 0F, - 1F, - 0F); + GL11.glTranslatef(-0.35F, -4.35F, 1.48F + 0.15F * i); + GL11.glRotatef(-90f, 0F, 1F, 0F); } scale = 0.3F; } else { if (i <= 4) - GL11.glTranslatef( - 0.64F + 0.05F * i, - -1.15F, - 0.07F); + GL11.glTranslatef(0.64F + 0.05F * i, -1.15F, 0.07F); else - GL11.glTranslatef( - 0.59F + 0.05F * i, - -1.15F, - 0.07F); + GL11.glTranslatef(0.59F + 0.05F * i, -1.15F, 0.07F); } - GL11.glScalef(scale, scale - + scale / 2, - scale); - ring.doRender(event.entityPlayer, - 0F, 0F, - (float) ingot, - (float) gem, - 0F); + GL11.glScalef(scale, scale + scale / 2, scale); + ring.doRender(event.entityPlayer, 0F, 0F, (float) ingot, (float) gem, 0F); GL11.glPopMatrix(); // no++; } for (int i = 10; i <= 13; i++) - if (playerInfo != null - && event.entityPlayer != null - && player != null - && playerInfo.hasKey( - "ext" + i) - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo - .getTag("ext" + i); - ItemStack item = ItemStack - .loadItemStackFromNBT( - nbt); - if (JewelryNBT.ingot( - item) != null) - ingotColor[i - 10] = JewelrycraftUtil - .getColor(JewelryNBT - .ingot(item)); - if (JewelryNBT.gem( - item) != null) - gemColor[i - 10] = JewelrycraftUtil - .getColor(JewelryNBT - .gem(item)); + if (playerInfo != null && event.entityPlayer != null && player != null + && playerInfo.hasKey("ext" + i) + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); + if (JewelryNBT.ingot(item) != null) + ingotColor[i - 10] = JewelrycraftUtil.getColor(JewelryNBT.ingot(item)); + if (JewelryNBT.gem(item) != null) + gemColor[i - 10] = JewelrycraftUtil.getColor(JewelryNBT.gem(item)); } - if (playerInfo != null - && event.entityPlayer != null - && player != null - && (playerInfo.hasKey( - "ext10") - || playerInfo.hasKey( - "ext11")) - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { + if (playerInfo != null && event.entityPlayer != null && player != null + && (playerInfo.hasKey("ext10") || playerInfo.hasKey("ext11")) + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { GL11.glPushMatrix(); GL11.glColor4f(1, 1, 1, 1); if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) { + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) { rightArm = body; - GL11.glTranslatef(0.0F, - 0.05F, - 0.0F); - GL11.glRotatef(-30F, 0.0F, - 1.0F, - 0.0F); + GL11.glTranslatef(0.0F, 0.05F, 0.0F); + GL11.glRotatef(-30F, 0.0F, 1.0F, 0.0F); } - if (rightArm.rotateAngleX == 0.0F - && rightArm.rotateAngleY == 0.0F + if (rightArm.rotateAngleX == 0.0F && rightArm.rotateAngleY == 0.0F && rightArm.rotateAngleZ == 0.0F) { - if ((rightArm.rotationPointX - + rotAngleX) != 0.0F - || (rightArm.rotationPointY - + rotAngleY) != 0.0F - || (rightArm.rotationPointZ - + rotAngleZ) != 0.0F) - GL11.glTranslatef( - (rightArm.rotationPointX - + rotAngleX) - * size, - (rightArm.rotationPointY - + rotAngleY) - * size, - (rightArm.rotationPointZ - + rotAngleZ) - * size); - } else if (!Loader.isModLoaded( - "alpaca") /* - * || - * (Loader - * . - * isModLoaded - * ( - * "alpaca") - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer - * ) - * ) - */) { - GL11.glTranslatef( - (rightArm.rotationPointX - + rotAngleX) - * size, - (rightArm.rotationPointY - + rotAngleY) - * size, - (rightArm.rotationPointZ - + rotAngleZ) - * size); + if ((rightArm.rotationPointX + rotAngleX) != 0.0F + || (rightArm.rotationPointY + rotAngleY) != 0.0F + || (rightArm.rotationPointZ + rotAngleZ) != 0.0F) + GL11.glTranslatef((rightArm.rotationPointX + rotAngleX) * size, + (rightArm.rotationPointY + rotAngleY) * size, + (rightArm.rotationPointZ + rotAngleZ) * size); + } else if (!Loader + .isModLoaded("alpaca") /* + * || (Loader . isModLoaded ( "alpaca") && fiskfille . alpaca . + * AlpacaAPI. isAlpacaClient ( event. entityPlayer ) ) + */) { + GL11.glTranslatef((rightArm.rotationPointX + rotAngleX) * size, + (rightArm.rotationPointY + rotAngleY) * size, + (rightArm.rotationPointZ + rotAngleZ) * size); if (rightArm.rotateAngleZ != 0.0F) - GL11.glRotatef(rightArm.rotateAngleZ - * (180F / (float) Math.PI), - 0.0F, - 0.0F, - 1.0F); + GL11.glRotatef(rightArm.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); if (rightArm.rotateAngleY != 0.0F) - GL11.glRotatef(rightArm.rotateAngleY - * (180F / (float) Math.PI), - 0.0F, - 1.0F, - 0.0F); + GL11.glRotatef(rightArm.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); if (rightArm.rotateAngleX != 0.0F) - GL11.glRotatef(rightArm.rotateAngleX - * (180F / (float) Math.PI), - 1.0F, - 0.0F, - 0.0F); + GL11.glRotatef(rightArm.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } GL11.glScalef(0.05f, 0.03f, 0.05f); - bracelet.doRender( - event.entityPlayer, - (float) ingotColor[0], - (float) gemColor[0], - (float) ingotColor[1], - (float) gemColor[1], - 0.0F); + bracelet.doRender(event.entityPlayer, (float) ingotColor[0], (float) gemColor[0], + (float) ingotColor[1], (float) gemColor[1], 0.0F); GL11.glPopMatrix(); } - if (playerInfo != null - && event.entityPlayer != null - && player != null - && (playerInfo.hasKey( - "ext12") - || playerInfo.hasKey( - "ext13")) - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { + if (playerInfo != null && event.entityPlayer != null && player != null + && (playerInfo.hasKey("ext12") || playerInfo.hasKey("ext13")) + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { GL11.glPushMatrix(); GL11.glColor4f(1, 1, 1, 1); if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) { + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) { leftArm = body; - GL11.glTranslatef(-0.1F, - 0.0F, - 0.1F); - GL11.glRotatef(-140F, 0.0F, - 1.0F, - 0.0F); + GL11.glTranslatef(-0.1F, 0.0F, 0.1F); + GL11.glRotatef(-140F, 0.0F, 1.0F, 0.0F); } - if (leftArm.rotateAngleX == 0.0F - && leftArm.rotateAngleY == 0.0F - && leftArm.rotateAngleZ == 0.0F) { - if ((leftArm.rotationPointX - + rotAngleX) != 0.0F - || (leftArm.rotationPointY - + rotAngleY) != 0.0F - || (leftArm.rotationPointZ - + rotAngleZ) != 0.0F) - GL11.glTranslatef( - (leftArm.rotationPointX - + rotAngleX) - * size, - (leftArm.rotationPointY - + rotAngleY) - * size, - (leftArm.rotationPointZ - + rotAngleZ) - * size); - } else if (!Loader.isModLoaded( - "alpaca") /* - * || - * (Loader - * . - * isModLoaded - * ( - * "alpaca") - * && - * !fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer - * ) - * ) - */) { - GL11.glTranslatef( - (leftArm.rotationPointX - + rotAngleX) - * size - + 0.2F, - (leftArm.rotationPointY - + rotAngleY) - * size, - (leftArm.rotationPointZ - + rotAngleZ) - * size); + if (leftArm.rotateAngleX == 0.0F && leftArm.rotateAngleY == 0.0F && leftArm.rotateAngleZ == 0.0F) { + if ((leftArm.rotationPointX + rotAngleX) != 0.0F || (leftArm.rotationPointY + rotAngleY) != 0.0F + || (leftArm.rotationPointZ + rotAngleZ) != 0.0F) + GL11.glTranslatef((leftArm.rotationPointX + rotAngleX) * size, + (leftArm.rotationPointY + rotAngleY) * size, + (leftArm.rotationPointZ + rotAngleZ) * size); + } else if (!Loader + .isModLoaded("alpaca") /* + * || (Loader . isModLoaded ( "alpaca") && !fiskfille . alpaca . + * AlpacaAPI. isAlpacaClient ( event. entityPlayer ) ) + */) { + GL11.glTranslatef((leftArm.rotationPointX + rotAngleX) * size + 0.2F, + (leftArm.rotationPointY + rotAngleY) * size, + (leftArm.rotationPointZ + rotAngleZ) * size); if (leftArm.rotateAngleZ != 0.0F) - GL11.glRotatef(leftArm.rotateAngleZ - * (180F / (float) Math.PI), - 0.0F, - 0.0F, - 1.0F); + GL11.glRotatef(leftArm.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); if (leftArm.rotateAngleY != 0.0F) - GL11.glRotatef(leftArm.rotateAngleY - * (180F / (float) Math.PI), - 0.0F, - 1.0F, - 0.0F); + GL11.glRotatef(leftArm.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); if (leftArm.rotateAngleX != 0.0F) - GL11.glRotatef(leftArm.rotateAngleX - * (180F / (float) Math.PI), - 1.0F, - 0.0F, - 0.0F); + GL11.glRotatef(leftArm.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } GL11.glScalef(0.05f, 0.03f, 0.05f); - bracelet.doRender( - event.entityPlayer, - (float) ingotColor[2], - (float) gemColor[2], - (float) ingotColor[3], - (float) gemColor[3], - 0F); + bracelet.doRender(event.entityPlayer, (float) ingotColor[2], (float) gemColor[2], + (float) ingotColor[3], (float) gemColor[3], 0F); GL11.glPopMatrix(); } no = 0; for (int i = 14; i <= 16; i++) - if (playerInfo != null - && event.entityPlayer != null - && player != null - && playerInfo.hasKey( - "ext" + i) - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { + if (playerInfo != null && event.entityPlayer != null && player != null + && playerInfo.hasKey("ext" + i) + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { gem = -1; ingot = -1; - NBTTagCompound nbt = (NBTTagCompound) playerInfo - .getTag("ext" + i); - ItemStack item = ItemStack - .loadItemStackFromNBT( - nbt); + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); GL11.glPushMatrix(); - if (body.rotateAngleX == 0.0F - && body.rotateAngleY == 0.0F - && body.rotateAngleZ == 0.0F) { - if (body.rotationPointX != 0.0F - || body.rotationPointY != 0.0F + if (body.rotateAngleX == 0.0F && body.rotateAngleY == 0.0F && body.rotateAngleZ == 0.0F) { + if (body.rotationPointX != 0.0F || body.rotationPointY != 0.0F || body.rotationPointZ != 0.0F) - GL11.glTranslatef( - body.rotationPointX - * size, - body.rotationPointY - * size, - body.rotationPointZ - * size); + GL11.glTranslatef(body.rotationPointX * size, body.rotationPointY * size, + body.rotationPointZ * size); } else if (!Loader .isModLoaded("alpaca") /* - * || - * (Loader - * . - * isModLoaded( - * "alpaca") - * && - * !fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer - * ) - * ) - */) { - GL11.glTranslatef( - body.rotationPointX - * size, - body.rotationPointY - * size, - body.rotationPointZ - * size); + * || (Loader . isModLoaded( "alpaca") && !fiskfille . alpaca . + * AlpacaAPI. isAlpacaClient ( event. entityPlayer ) ) + */) { + GL11.glTranslatef(body.rotationPointX * size, body.rotationPointY * size, + body.rotationPointZ * size); if (body.rotateAngleZ != 0.0F) - GL11.glRotatef(body.rotateAngleZ - * (180F / (float) Math.PI), - 0.0F, - 0.0F, - 1.0F); + GL11.glRotatef(body.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); if (body.rotateAngleY != 0.0F) - GL11.glRotatef(body.rotateAngleY - * (180F / (float) Math.PI), - 0.0F, - 1.0F, - 0.0F); + GL11.glRotatef(body.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); if (body.rotateAngleX != 0.0F) - GL11.glRotatef(body.rotateAngleX - * (180F / (float) Math.PI), - 1.0F, - 0.0F, - 0.0F); + GL11.glRotatef(body.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) - GL11.glTranslatef( - 0.0F, - 0.55F, - -0.28F); - GL11.glScalef(0.0625f, - 0.0625f, - 0.0625f); - if (JewelryNBT.ingot( - item) != null) - ingot = JewelrycraftUtil - .getColor(JewelryNBT - .ingot(item)); - if (JewelryNBT.gem( - item) != null) - gem = JewelrycraftUtil - .getColor(JewelryNBT - .gem(item)); + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) + GL11.glTranslatef(0.0F, 0.55F, -0.28F); + GL11.glScalef(0.0625f, 0.0625f, 0.0625f); + if (JewelryNBT.ingot(item) != null) + ingot = JewelrycraftUtil.getColor(JewelryNBT.ingot(item)); + if (JewelryNBT.gem(item) != null) + gem = JewelrycraftUtil.getColor(JewelryNBT.gem(item)); if (no > 0) { - GL11.glRotatef(no == 1 - ? 25f - : -25f, - 0F, - 0f, - 1f); - GL11.glRotatef(no == 1 - ? -5f - : -10f, - 1F, - 0f, - 0f); + GL11.glRotatef(no == 1 ? 25f : -25f, 0F, 0f, 1f); + GL11.glRotatef(no == 1 ? -5f : -10f, 1F, 0f, 0f); } - necklace.doRender( - event.entityPlayer, - 0F, 0F, - (float) ingot, - (float) gem, - 0F); + necklace.doRender(event.entityPlayer, 0F, 0F, (float) ingot, (float) gem, 0F); GL11.glPopMatrix(); no++; } - if (playerInfo != null - && event.entityPlayer != null - && player != null - && playerInfo.hasKey( - "ext17") - && event.entityPlayer - .getDisplayName() - .equals(player.getDisplayName())) { + if (playerInfo != null && event.entityPlayer != null && player != null && playerInfo.hasKey("ext17") + && event.entityPlayer.getDisplayName().equals(player.getDisplayName())) { gem = -1; ingot = -1; - NBTTagCompound nbt = (NBTTagCompound) playerInfo - .getTag("ext17"); - ItemStack item = ItemStack - .loadItemStackFromNBT( - nbt); + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext17"); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); GL11.glPushMatrix(); float s = 0.0625F; if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) head = body; - if (head.rotateAngleX == 0.0F - && head.rotateAngleY == 0.0F - && head.rotateAngleZ == 0.0F) { - if (head.rotationPointX != 0.0F - || head.rotationPointY != 0.0F - || head.rotationPointZ != 0.0F) - GL11.glTranslatef( - head.rotationPointX - * size, - head.rotationPointY - * size, - head.rotationPointZ - * size); - } else if (!Loader.isModLoaded( - "alpaca") /* - * || - * (Loader - * . - * isModLoaded - * ( - * "alpaca") - * && - * !fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer - * ) - * ) - */) { - GL11.glTranslatef( - head.rotationPointX - * size, - head.rotationPointY - * size, - head.rotationPointZ - * size); + if (head.rotateAngleX == 0.0F && head.rotateAngleY == 0.0F && head.rotateAngleZ == 0.0F) { + if (head.rotationPointX != 0.0F || head.rotationPointY != 0.0F || head.rotationPointZ != 0.0F) + GL11.glTranslatef(head.rotationPointX * size, head.rotationPointY * size, + head.rotationPointZ * size); + } else if (!Loader + .isModLoaded("alpaca") /* + * || (Loader . isModLoaded ( "alpaca") && !fiskfille . alpaca . + * AlpacaAPI. isAlpacaClient ( event. entityPlayer ) ) + */) { + GL11.glTranslatef(head.rotationPointX * size, head.rotationPointY * size, + head.rotationPointZ * size); if (head.rotateAngleZ != 0.0F) - GL11.glRotatef(head.rotateAngleZ - * (180F / (float) Math.PI), - 0.0F, - 0.0F, - 1.0F); + GL11.glRotatef(head.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); if (head.rotateAngleY != 0.0F) - GL11.glRotatef(head.rotateAngleY - * (180F / (float) Math.PI), - 0.0F, - 1.0F, - 0.0F); + GL11.glRotatef(head.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); if (head.rotateAngleX != 0.0F) - GL11.glRotatef(head.rotateAngleX - * (180F / (float) Math.PI), - 1.0F, - 0.0F, - 0.0F); + GL11.glRotatef(head.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } if (Loader.isModLoaded( "alpaca") /* - * && - * fiskfille - * . - * alpaca - * . - * AlpacaAPI. - * isAlpacaClient - * ( - * event. - * entityPlayer) - */) - GL11.glTranslatef(0.0F, - 0.7F, - -0.2F); + * && fiskfille . alpaca . AlpacaAPI. isAlpacaClient ( event. entityPlayer) + */) + GL11.glTranslatef(0.0F, 0.7F, -0.2F); GL11.glScalef(s, s, s); - GL11.glTranslatef(0.0F, 1.0F, - -2.0F); + GL11.glTranslatef(0.0F, 1.0F, -2.0F); if (JewelryNBT.ingot(item) != null) - ingot = JewelrycraftUtil - .getColor(JewelryNBT - .ingot(item)); + ingot = JewelrycraftUtil.getColor(JewelryNBT.ingot(item)); if (JewelryNBT.gem(item) != null) - gem = JewelrycraftUtil - .getColor(JewelryNBT - .gem(item)); - earrings.doRender( - event.entityPlayer, - 0F, 0F, - (float) ingot, - (float) gem, 0F); + gem = JewelrycraftUtil.getColor(JewelryNBT.gem(item)); + earrings.doRender(event.entityPlayer, 0F, 0F, (float) ingot, (float) gem, 0F); GL11.glPopMatrix(); } } @@ -759,29 +314,15 @@ public class PlayerRenderHandler { @SubscribeEvent public void renderHand(RenderHandEvent event) { if (playersInfo != null) { - EntityPlayer player = Minecraft - .getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; if (player != null) { - NBTTagCompound playerInfo = (NBTTagCompound) playersInfo - .getTag(player.getDisplayName()); + NBTTagCompound playerInfo = (NBTTagCompound) playersInfo.getTag(player.getDisplayName()); if (ConfigHandler.CURSES_ENABLED) - for (Curse curse : Curse - .getCurseList()) - if (curse.canCurseBeActivated( - player.worldObj) - && curse != null - && playerInfo != null - && playerInfo.hasKey( - curse.getName()) - && playerInfo.getInteger( - curse.getName()) > 0 - && playerInfo.hasKey( - "cursePoints") - && playerInfo.getInteger( - "cursePoints") > 0) - curse.playerHandRender( - player, - event); + for (Curse curse : Curse.getCurseList()) + if (curse.canCurseBeActivated(player.worldObj) && curse != null && playerInfo != null + && playerInfo.hasKey(curse.getName()) && playerInfo.getInteger(curse.getName()) > 0 + && playerInfo.hasKey("cursePoints") && playerInfo.getInteger("cursePoints") > 0) + curse.playerHandRender(player, event); } } } diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java index 9df771d..a46f45b 100755 --- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java @@ -13,9 +13,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; public class ScreenHandler extends Gui { - private Minecraft mc; - public static NBTTagCompound tagCache = null; - public static int cooldown; + private Minecraft mc; + public static NBTTagCompound tagCache = null; + public static int cooldown; public ScreenHandler(Minecraft mc) { super(); @@ -24,92 +24,52 @@ public class ScreenHandler extends Gui { @SubscribeEvent public void renderScreen(RenderGameOverlayEvent event) { - if (event.isCancelable() || event.type != ElementType.ALL - || tagCache == null) + if (event.isCancelable() || event.type != ElementType.ALL || tagCache == null) return; int count = 0; int size = 32; - ScaledResolution resolution = new ScaledResolution(mc, - mc.displayWidth, mc.displayHeight); + ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); GL11.glPushMatrix(); GL11.glColor4f(1f, 1f, 1f, 1.0f); mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); count = 0; size = 16; if (tagCache.getFloat("BlueHeart") > 0) { - drawTexturedModalRect( - resolution.getScaledWidth() / 2 - + 90 + 35 * count, - resolution.getScaledHeight() - 40, + drawTexturedModalRect(resolution.getScaledWidth() / 2 + 90 + 35 * count, resolution.getScaledHeight() - 40, 0 * size, 0 * size, size, size); - mc.fontRenderer.drawStringWithShadow("x" - + (MathHelper.ceiling_float_int( - tagCache.getFloat( - "BlueHeart")) - / 2.0F), - resolution.getScaledWidth() / 2 - + 105 + 35 * count, - resolution.getScaledHeight() - 36, - 16777215); + mc.fontRenderer.drawStringWithShadow( + "x" + (MathHelper.ceiling_float_int(tagCache.getFloat("BlueHeart")) / 2.0F), + resolution.getScaledWidth() / 2 + 105 + 35 * count, resolution.getScaledHeight() - 36, 16777215); } count++; mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); if (tagCache.getFloat("BlackHeart") > 0) { - drawTexturedModalRect(resolution.getScaledWidth() - / 2 - + 90 + drawTexturedModalRect(resolution.getScaledWidth() / 2 + 90 + (mc.fontRenderer.getStringWidth( - String.valueOf((MathHelper - .ceiling_float_int( - tagCache.getFloat( - "BlueHeart")) - / 2.0F))) - - 14) - + 35 * count, - resolution.getScaledHeight() - 40, - 1 * size, 0 * size, size, size); - mc.fontRenderer.drawStringWithShadow("x" - + (MathHelper.ceiling_float_int( - tagCache.getFloat( - "BlackHeart")) - / 2.0F), - resolution.getScaledWidth() / 2 - + 105 - + (mc.fontRenderer - .getStringWidth(String - .valueOf((MathHelper - .ceiling_float_int( - tagCache.getFloat( - "BlueHeart")) - / 2.0F))) + String.valueOf((MathHelper.ceiling_float_int(tagCache.getFloat("BlueHeart")) / 2.0F))) - 14) + + 35 * count, resolution.getScaledHeight() - 40, 1 * size, 0 * size, size, size); + mc.fontRenderer.drawStringWithShadow( + "x" + (MathHelper.ceiling_float_int(tagCache.getFloat("BlackHeart")) / 2.0F), + resolution.getScaledWidth() / 2 + 105 + + (mc.fontRenderer.getStringWidth(String + .valueOf((MathHelper.ceiling_float_int(tagCache.getFloat("BlueHeart")) / 2.0F))) - 14) + 35 * count, - resolution.getScaledHeight() - 36, - 16777215); + resolution.getScaledHeight() - 36, 16777215); } count++; mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); if (tagCache.getFloat("WhiteHeart") > 0) - drawTexturedModalRect(resolution.getScaledWidth() - / 2 - + 90 - + (mc.fontRenderer.getStringWidth( - String.valueOf((MathHelper - .ceiling_float_int( - tagCache.getFloat( - "BlueHeart")) - / 2.0F))) - - 14) - + (mc.fontRenderer.getStringWidth( - String.valueOf((MathHelper - .ceiling_float_int( - tagCache.getFloat( - "BlackHeart")) - / 2.0F))) - - 14) - + 35 * count, - resolution.getScaledHeight() - 40, - 2 * size, 1 * size, size, size); + drawTexturedModalRect( + resolution.getScaledWidth() / 2 + 90 + + (mc.fontRenderer.getStringWidth(String + .valueOf((MathHelper.ceiling_float_int(tagCache.getFloat("BlueHeart")) / 2.0F))) + - 14) + + (mc.fontRenderer.getStringWidth(String + .valueOf((MathHelper.ceiling_float_int(tagCache.getFloat("BlackHeart")) / 2.0F))) + - 14) + + 35 * count, + resolution.getScaledHeight() - 40, 2 * size, 1 * size, size, size); GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java index 0fed13f..a08579f 100755 --- a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java +++ b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java @@ -11,9 +11,6 @@ public class TextureEvent { @SideOnly(Side.CLIENT) public void textureFix(TextureStitchEvent.Post e) { if (e.map.getTextureType() == 0) - BlockList.moltenMetalFluid - .setIcons(BlockList.moltenMetal - .getBlockTextureFromSide( - 0)); + BlockList.moltenMetalFluid.setIcons(BlockList.moltenMetal.getBlockTextureFromSide(0)); } } \ No newline at end of file -- cgit v1.2.3