Bulk update back to sanity

10 files changed, 40 insertions, 86 deletions

diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/ArcaneNullityMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/ArcaneNullityMark.java
index 594bafd..6cf6db3 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/ArcaneNullityMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/ArcaneNullityMark.java
@@ -18,8 +18,7 @@ public class ArcaneNullityMark extends Mark {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent lhev,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		if (lhev.source.isMagicDamage()) {
 			lhev.setCanceled(true);
 		}
@@ -28,8 +27,7 @@ public class ArcaneNullityMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent lhev,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		if (lhev.source.isMagicDamage()) {
 			lhev.setCanceled(true);
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/BerserkingMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/BerserkingMark.java
index 6ac0ca1..f3b6785 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/BerserkingMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/BerserkingMark.java
@@ -18,14 +18,12 @@ public class BerserkingMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		return damageMultiplier + .5f;
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
 		return damageMultiplier + .5f;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/FalseLifeMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/FalseLifeMark.java
index 74bda57..c7ac9a0 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/FalseLifeMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/FalseLifeMark.java
@@ -21,35 +21,20 @@ public class FalseLifeMark extends Mark {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		float totalAmount = Math.max(0.5f,
-				event.ammount * damageMultiplier);
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
+		float totalAmount = Math.max(0.5f, event.ammount * damageMultiplier);
 
 		if (totalAmount > event.entityLiving.getMaxHealth()) {
 			event.setCanceled(true);
 
-			event.entityLiving.getEntityAttribute(
-					SharedMonsterAttributes.maxHealth)
-					.setBaseValue(event.entityLiving
-							.getMaxHealth()
-							/ 0.75f);
-
-			event.entityLiving.setHealth(
-					event.entityLiving.getMaxHealth());
-
-			event.entityLiving
-					.addPotionEffect(new PotionEffect(
-							Potion.moveSpeed.id,
-							30, 1));
-			event.entityLiving
-					.addPotionEffect(new PotionEffect(
-							Potion.resistance.id,
-							20, 1));
-			event.entityLiving
-					.addPotionEffect(new PotionEffect(
-							Potion.damageBoost.id,
-							20, 1));
+			event.entityLiving.getEntityAttribute(SharedMonsterAttributes.maxHealth)
+					.setBaseValue(event.entityLiving.getMaxHealth() / 0.75f);
+
+			event.entityLiving.setHealth(event.entityLiving.getMaxHealth());
+
+			event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 30, 1));
+			event.entityLiving.addPotionEffect(new PotionEffect(Potion.resistance.id, 20, 1));
+			event.entityLiving.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 20, 1));
 
 			return 0;
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/GuardingMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/GuardingMark.java
index 1914dcc..992c31b 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/GuardingMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/GuardingMark.java
@@ -18,14 +18,12 @@ public class GuardingMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		return damageMultiplier - 1f;
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent lhev,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		return damageMultiplier - 1f;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/HolyLightMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/HolyLightMark.java
index 4895b79..1298419 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/HolyLightMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/HolyLightMark.java
@@ -18,15 +18,12 @@ public class HolyLightMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.entityLiving.isEntityUndead()) {
 			return damageMultiplier + .5f;
 		}
 
-		float healed = Math.max(0.5f,
-				(event.ammount * damageMultiplier)
-						* 0.25f);
+		float healed = Math.max(0.5f, (event.ammount * damageMultiplier) * 0.25f);
 
 		event.entityLiving.heal(healed);
 
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/HuntingMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/HuntingMark.java
index c3349b8..24a8404 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/HuntingMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/HuntingMark.java
@@ -22,14 +22,12 @@ public class HuntingMark extends Mark {
 	@Override
 	public void correctBlessing(Entity ent) {
 		if (!(ent instanceof IRangedAttackMob)) {
-			ent.getEntityData().setString("Blessing",
-					"MarkWar");
+			ent.getEntityData().setString("Blessing", "MarkWar");
 		}
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.source.isProjectile()) {
 			return damageMultiplier + 0.4f;
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/Mark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/Mark.java
index b768dfa..f0f4639 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/Mark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/Mark.java
@@ -7,20 +7,20 @@ public abstract class Mark extends Blessing {
 	protected Mark(String name) {
 		this(name, true);
 	}
-	
+
 	protected Mark(String name, boolean mobAppropriate) {
 		super(name, mobAppropriate);
 	}
-	
+
 	public abstract String benefit();
-	
+
 	public abstract String drawback();
-	
+
 	@Override
 	public String description() {
 		return String.format("BENEFIT - %s\nDRAWBACK - %s", benefit(), drawback());
 	}
-	
+
 	@Override
 	public BlessingType type() {
 		return BlessingType.MARK;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/RetaliationMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/RetaliationMark.java
index c138d11..527dd30 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/RetaliationMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/RetaliationMark.java
@@ -21,30 +21,25 @@ public class RetaliationMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		doRetaliation(event, damageMultiplier);
 
 		return damageMultiplier;
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
 		doRetaliation(event, damageMultiplier);
 
 		return damageMultiplier;
 	}
 
-	private void doRetaliation(LivingHurtEvent event,
-			float damageMultiplier) {
+	private void doRetaliation(LivingHurtEvent event, float damageMultiplier) {
 		if (!event.source.damageType.equals("retaliation")) {
 			// Don't retaliate for retaliation
 			if (ModjamMod.r.nextDouble() < ConfigData.RETALIATION_CHANCE) {
-				event.entityLiving.attackEntityFrom(
-						DamageSources.retaliation,
-						Math.max(0.5f, event.ammount
-								* damageMultiplier));
+				event.entityLiving.attackEntityFrom(DamageSources.retaliation,
+						Math.max(0.5f, event.ammount * damageMultiplier));
 
 				event.setCanceled(true);
 			}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/VampirismMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/VampirismMark.java
index 63d242f..5b4f2a5 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/VampirismMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/VampirismMark.java
@@ -23,13 +23,10 @@ public class VampirismMark extends Mark {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
 		Entity targetEntity = event.entity;
 
-		if (targetEntity.getBrightness(1.0F) > 0.5F
-				&& canSeeTheWorld(targetEntity.worldObj,
-						targetEntity)) {
+		if (targetEntity.getBrightness(1.0F) > 0.5F && canSeeTheWorld(targetEntity.worldObj, targetEntity)) {
 			return damageMultiplier + 0.4F;
 		}
 
@@ -37,21 +34,15 @@ public class VampirismMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		Entity sourceEntity = event.source.getEntity();
 
 		if (sourceEntity instanceof EntityLivingBase) {
-			((EntityLivingBase) sourceEntity).heal(
-					(event.ammount * damageMultiplier)
-							* 0.25F);
+			((EntityLivingBase) sourceEntity).heal((event.ammount * damageMultiplier) * 0.25F);
 
-			boolean seeTheSky = canSeeTheWorld(
-					sourceEntity.worldObj,
-					sourceEntity);
+			boolean seeTheSky = canSeeTheWorld(sourceEntity.worldObj, sourceEntity);
 
-			if (sourceEntity.getBrightness(1.0F) > 0.5F
-					&& seeTheSky) {
+			if (sourceEntity.getBrightness(1.0F) > 0.5F && seeTheSky) {
 				return damageMultiplier - 0.4F;
 			}
 		}
@@ -61,15 +52,12 @@ public class VampirismMark extends Mark {
 
 	@Override
 	public void commonTick(ServerTickEvent stev, EntityPlayer play) {
-		if (play.getBrightness(1.0f) > 0.5f
-				&& canSeeTheWorld(play.worldObj, play)
-				&& play.ticksExisted % 20 == 0) {
+		if (play.getBrightness(1.0f) > 0.5f && canSeeTheWorld(play.worldObj, play) && play.ticksExisted % 20 == 0) {
 			play.setFire(5);
 		}
 	}
 
 	private boolean canSeeTheWorld(World wld, Entity ent) {
-		return wld.canBlockSeeTheSky((int) (ent.posX),
-				(int) (ent.posY), (int) (ent.posZ));
+		return wld.canBlockSeeTheSky((int) (ent.posX), (int) (ent.posY), (int) (ent.posZ));
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/marks/WarMark.java b/YWD/src/main/java/fyresmodjam/blessings/marks/WarMark.java
index 208a1e4..afa8837 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/marks/WarMark.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/marks/WarMark.java
@@ -18,11 +18,8 @@ public class WarMark extends Mark {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		if ((event.source.getDamageType().equals("player")
-				|| event.source.getDamageType()
-						.equals("mob"))) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
+		if ((event.source.getDamageType().equals("player") || event.source.getDamageType().equals("mob"))) {
 			return damageMultiplier + 0.4f;
 		}