From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../jewelrycraft/entities/EntityHeart.java | 83 ++++++++++++++-------- .../jewelrycraft/entities/EntityList.java | 36 +++++----- .../jewelrycraft/entities/renders/HeartRender.java | 32 +++++---- .../entities/renders/RenderHelper.java | 9 ++- 4 files changed, 96 insertions(+), 64 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/entities') diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index cbfc21a..2590e55 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -57,10 +57,12 @@ public class EntityHeart extends EntityLiving { @Override protected void collideWithEntity(Entity entity) { super.collideWithEntity(entity); - if (!this.worldObj.isRemote && entity instanceof EntityHeart - && getType().equals(((EntityHeart) entity).getType())) { - setQuantity( - getQuantity() + ((EntityHeart) entity).getQuantity()); + if (!this.worldObj.isRemote + && entity instanceof EntityHeart + && getType().equals(((EntityHeart) entity) + .getType())) { + setQuantity(getQuantity() + ((EntityHeart) entity) + .getQuantity()); entity.setDead(); } } @@ -69,49 +71,68 @@ public class EntityHeart extends EntityLiving { public void onCollideWithPlayer(EntityPlayer player) { if (!this.worldObj.isRemote) { NBTTagCompound playerInfo = PlayerUtils - .getModPlayerPersistTag(player, Variables.MODID); + .getModPlayerPersistTag(player, + Variables.MODID); if (playerInfo != null) { - if (getType().equals("Red") - && player.getHealth() < player.getMaxHealth()) { - float healAmount = - player.getMaxHealth() - player.getHealth(); + if (getType().equals("Red") && player + .getHealth() < player + .getMaxHealth()) { + float healAmount = player + .getMaxHealth() + - player.getHealth(); if (getQuantity() > healAmount) { player.heal(healAmount); - this.setQuantity(getQuantity() - healAmount); + this.setQuantity( + getQuantity() - healAmount); } else { player.heal(getQuantity()); this.setDead(); } } else if (getType().equals("White") - && playerInfo.getFloat("WhiteHeart") > 0.1F) { - playerInfo.setFloat(getType() + "Heart", 0F); + && playerInfo.getFloat( + "WhiteHeart") > 0.1F) { + playerInfo.setFloat(getType() + + "Heart", 0F); if (player.getMaxHealth() < 40F) { player.getEntityAttribute( SharedMonsterAttributes.maxHealth) - .setBaseValue(player.getMaxHealth() + 2f); - player.setHealth(player.getHealth() + 2f); + .setBaseValue(player + .getMaxHealth() + + 2f); + player.setHealth(player + .getHealth() + + 2f); } JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); this.setDead(); } else if (!getType().equals("Red") - && ((getType().equals("Black") + && ((getType().equals( + "Black") && playerInfo.getFloat( "BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) - || (getType().equals("Blue") + || (getType().equals( + "Blue") && playerInfo.getFloat( "BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP) - || getType().equals("White"))) { - if (playerInfo.hasKey(getType() + "Heart")) - playerInfo.setFloat(getType() + "Heart", - playerInfo.getFloat(getType() + "Heart") + || getType().equals( + "White"))) { + if (playerInfo.hasKey(getType() + + "Heart")) + playerInfo.setFloat( + getType() + "Heart", + playerInfo.getFloat( + getType() + "Heart") + getQuantity()); else - playerInfo.setFloat(getType() + "Heart", + playerInfo.setFloat( + getType() + "Heart", getQuantity()); JewelrycraftMod.netWrapper.sendTo( - new PacketSendClientPlayerInfo(playerInfo), + new PacketSendClientPlayerInfo( + playerInfo), (EntityPlayerMP) player); this.setDead(); } @@ -122,12 +143,14 @@ public class EntityHeart extends EntityLiving { @Override public void onDeath(DamageSource source) { super.onDeath(source); - if (source.getEntity() != null - && source.getEntity() instanceof EntityPlayer) + if (source.getEntity() != null && source + .getEntity() instanceof EntityPlayer) ((EntityPlayer) source.getEntity()).addChatMessage( - new ChatComponentText(StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".heartKilled." + this.getType()))); + new ChatComponentText(StatCollector + .translateToLocal( + "chatmessage." + Variables.MODID + + ".heartKilled." + + this.getType()))); } @Override @@ -151,8 +174,8 @@ public class EntityHeart extends EntityLiving { } /** - * (abstract) Protected helper method to read subclass entity data from - * NBT. + * (abstract) Protected helper method to read subclass entity data + * from NBT. */ @Override public void readEntityFromNBT(NBTTagCompound nbt) { diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java index 8a23598..6df9ada 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java @@ -9,22 +9,23 @@ import net.minecraft.entity.EntityLiving; public class EntityList { public static void preInit(FMLPreInitializationEvent e) { - registerEntity(1, EntityHeart.class, "Heart", 0x000000, 0xFF0000); // Red - ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", 2, - 0x000000, 0xFFFFFF); // White - ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", 3, - 0x000000, 0x006BBD); // Blue - ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", 4, - 0x000000, 0x404040); // Black - - registerEntity(5, EntityHalfHeart.class, "HalfHeart", 0x000000, + registerEntity(1, EntityHeart.class, "Heart", 0x000000, 0xFF0000); // Red - ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, "HalfHeart", - 6, 0x000000, 0xFFFFFF); // White - ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, "HalfHeart", - 7, 0x000000, 0x006BBD); // Blue - ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, "HalfHeart", - 8, 0x000000, 0x404040); // Black + ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", + 2, 0x000000, 0xFFFFFF); // White + ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", + 3, 0x000000, 0x006BBD); // Blue + ItemSpawnEgg.registerSpawnEgg(EntityHeart.class, "Heart", + 4, 0x000000, 0x404040); // Black + + registerEntity(5, EntityHalfHeart.class, "HalfHeart", + 0x000000, 0xFF0000); // Red + ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, + "HalfHeart", 6, 0x000000, 0xFFFFFF); // White + ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, + "HalfHeart", 7, 0x000000, 0x006BBD); // Blue + ItemSpawnEgg.registerSpawnEgg(EntityHalfHeart.class, + "HalfHeart", 8, 0x000000, 0x404040); // Black } @@ -35,8 +36,9 @@ public class EntityList { } private static final void registerEntity(int id, - Class entityClass, String name, - int eggBackgroundColor, int eggForegroundColor) { + Class entityClass, + String name, int eggBackgroundColor, + int eggForegroundColor) { registerEntity(id, entityClass, name); ItemSpawnEgg.registerSpawnEgg(entityClass, name, id, eggBackgroundColor, eggForegroundColor); diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java index 41f7a85..b5419a4 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java @@ -17,45 +17,53 @@ import net.minecraft.util.ResourceLocation; */ public class HeartRender extends RenderLiving { protected ResourceLocation texture; - Random rnd = new Random(); + Random rnd = new Random(); public HeartRender(ModelBase modelBase, float shadowSize) { super(modelBase, shadowSize); } @Override - protected void renderModel(EntityLivingBase entity, float x, float y, - float z, float rot1, float rot2, float rot3) { + protected void renderModel(EntityLivingBase entity, float x, + float y, float z, float rot1, float rot2, + float rot3) { super.renderModel(entity, x, y, z, rot1, rot2, rot3); rnd.setSeed(1542372345); if (((EntityHeart) entity).getQuantity() > 2f) { - for (int i = 0; i < ((EntityHeart) entity).getQuantity() / 10f; - i++) { + for (int i = 0; i < ((EntityHeart) entity) + .getQuantity() / 10f; i++) { float posX = rnd.nextFloat() * 0.2f - * (rnd.nextBoolean() ? 1 : -1); + * (rnd.nextBoolean() ? 1 + : -1); float posY = rnd.nextFloat() * 0.2f - * (rnd.nextBoolean() ? 1 : -1); + * (rnd.nextBoolean() ? 1 + : -1); float rotY = rnd.nextFloat() * 35f - * (rnd.nextBoolean() ? 1 : -1); + * (rnd.nextBoolean() ? 1 + : -1); float rotZ = rnd.nextFloat() * 35f - * (rnd.nextBoolean() ? 1 : -1); + * (rnd.nextBoolean() ? 1 + : -1); GL11.glTranslatef(-0.15F, 0.0F, 0.0F); GL11.glTranslatef(posX, posY, 0F); GL11.glRotatef(rotY, 0F, 1F, 0F); GL11.glRotatef(rotZ, 0F, 0F, 1F); GL11.glPushMatrix(); - this.mainModel.render(entity, x, y, z, rot1, rot2, rot3); + this.mainModel.render(entity, x, y, z, + rot1, rot2, rot3); GL11.glPopMatrix(); } } } @Override - protected void preRenderCallback(EntityLivingBase entity, float f) { + protected void preRenderCallback(EntityLivingBase entity, + float f) { preRenderCallbackHeart((EntityHeart) entity, f); } - protected void preRenderCallbackHeart(EntityHeart entity, float f) { + protected void preRenderCallbackHeart(EntityHeart entity, + float f) { GL11.glScalef(0.4F, 0.4F, 0.4F); GL11.glRotatef(55F, 1F, 0F, 0F); String type = entity.getType(); diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java index 8080251..cf2278a 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java @@ -16,10 +16,9 @@ public class RenderHelper { } public static void translateToHeadLevel(EntityPlayer player) { - GL11.glTranslated(0, - (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - - player.getDefaultEyeHeight() - + (player.isSneaking() ? 0.0625 : 0), - 0); + GL11.glTranslated(0, (player != Minecraft + .getMinecraft().thePlayer ? 1.62F : 0F) + - player.getDefaultEyeHeight() + + (player.isSneaking() ? 0.0625 : 0), 0); } } \ No newline at end of file -- cgit v1.2.3