Bulk update back to sanity

33 files changed, 147 insertions, 275 deletions

diff --git a/YWD/src/main/java/fyresmodjam/blessings/Blessing.java b/YWD/src/main/java/fyresmodjam/blessings/Blessing.java
index afa167a..e85dfad 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/Blessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/Blessing.java
@@ -5,6 +5,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
+import net.minecraftforge.event.entity.player.PlayerDropsEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 
 /**
@@ -39,7 +40,7 @@ public abstract class Blessing {
 	}
 
 	public String customName() {
-		return type().displayPrefix + name();
+		return type().displayPrefix + " " + name();
 	}
 
 	/**
@@ -69,7 +70,7 @@ public abstract class Blessing {
 	 * Modify the player's break speed.
 	 * 
 	 * @param pebsev
-	 *                The break speed event.
+	 *            The break speed event.
 	 */
 	public void checkBreakSpeed(PlayerEvent.BreakSpeed pebsev) {
 		return;
@@ -79,7 +80,7 @@ public abstract class Blessing {
 	 * Correct inappropriate blessings for mobs.
 	 * 
 	 * @param ent
-	 *                The mob to correct for.
+	 *            The mob to correct for.
 	 */
 	public void correctBlessing(Entity ent) {
 		return;
@@ -89,7 +90,7 @@ public abstract class Blessing {
 	 * Do something on every tick.
 	 * 
 	 * @param stev
-	 *                The tick event
+	 *            The tick event
 	 */
 	public void commonTick(ServerTickEvent stev, EntityPlayer play) {
 		return;
@@ -99,15 +100,14 @@ public abstract class Blessing {
 	 * Handle adjusting the damage multiplier for mob knowledge.
 	 * 
 	 * @param lhev
-	 *                The event being dealt with.
+	 *            The event being dealt with.
 	 * 
 	 * @param pickedDamageBonus
-	 *                The base damage bonus for mob knowledge.
+	 *            The base damage bonus for mob knowledge.
 	 * 
 	 * @return The new damage bonus for mob knowledge
 	 */
-	public float adjustMobKnowledgeBonus(LivingHurtEvent lhev,
-			float pickedDamageBonus) {
+	public float adjustMobKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) {
 		return pickedDamageBonus;
 	}
 
@@ -115,29 +115,30 @@ public abstract class Blessing {
 	 * Handle adjusting the damage multiplier for weapon knowledge.
 	 * 
 	 * @param lhev
-	 *                The event being dealt with.
+	 *            The event being dealt with.
 	 * 
 	 * @param pickedDamageBonus
-	 *                The base damage bonus for weapon knowledge.
+	 *            The base damage bonus for weapon knowledge.
 	 * 
 	 * @return The new damage bonus for weapon knowledge
 	 */
-	public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev,
-			float pickedDamageBonus) {
+	public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) {
 		return pickedDamageBonus;
 	}
 
-	public float onIncomingDamage(LivingHurtEvent lhev,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		return damageMultiplier;
 	}
 
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		return damageMultiplier;
 	}
 
 	public void onMobKill(LivingDeathEvent event) {
 		return;
 	}
+
+	public void onPlayerDrops(PlayerDropsEvent event) {
+		
+	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/BlessingType.java b/YWD/src/main/java/fyresmodjam/blessings/BlessingType.java
index 21bc72c..adc44ae 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/BlessingType.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/BlessingType.java
@@ -20,8 +20,8 @@ public enum BlessingType {
 	 */
 	MARK("Mark", "Mark of");
 
-	public final String	internalPrefix;
-	public final String	displayPrefix;
+	public final String internalPrefix;
+	public final String displayPrefix;
 
 	private BlessingType(String internalPrefix, String displayPrefix) {
 		this.internalPrefix = internalPrefix;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java b/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java
index c240a7a..ec29a1a 100755
--- a/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java
@@ -12,12 +12,13 @@ import fyresmodjam.blessings.standard.*;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.config.Configuration;
 
 public class BlessingUtils {
-	public final static Map<String, Blessing>	playerBlessings;
-	public final static Map<String, Blessing>	mobBlessings;
+	public static Map<String, Blessing> playerBlessings;
+	public static Map<String, Blessing> mobBlessings;
 
-	static {
+	public static void loadBlessings(Configuration cfg) {
 		playerBlessings = new HashMap<String, Blessing>();
 		mobBlessings = new HashMap<String, Blessing>();
 
@@ -31,14 +32,14 @@ public class BlessingUtils {
 		GuardingMark guardingMark = new GuardingMark();
 		HuntingMark huntingMark = new HuntingMark();
 		ScoutingMark scoutingMark = new ScoutingMark();
-		VampirismMark vampirismMark = new VampirismMark();
+		// VampirismMark vampirismMark = new VampirismMark();
 		WarMark warMark = new WarMark();
 
 		addOmniBlessing("MarkBerserking", berserkingMark);
 		addOmniBlessing("MarkFalseLife", falseLifeMark);
 		addOmniBlessing("MarkGuarding", guardingMark);
 		addOmniBlessing("MarkHunting", huntingMark);
-		addOmniBlessing("MarkVampirism", vampirismMark);
+		// addOmniBlessing("MarkVampirism", vampirismMark);
 		addOmniBlessing("MarkWar", warMark);
 
 		playerBlessings.put("MarkScouting", scoutingMark);
@@ -73,22 +74,17 @@ public class BlessingUtils {
 		addOmniBlessing("BlessingVampire", vampireBlessing);
 		addOmniBlessing("BlessingInferno", infernoBlessing);
 		addOmniBlessing("BlessingLoner", lonerBlessing);
-		addOmniBlessing("BlessingParatrooper",
-				paratrooperBlessing);
+		addOmniBlessing("BlessingParatrooper", paratrooperBlessing);
 		addOmniBlessing("BlessingPorcupine", porcupineBlessing);
-		addOmniBlessing("BlessingThick-Skinned",
-				thickSkinnedBlessing);
+		addOmniBlessing("BlessingThick-Skinned", thickSkinnedBlessing);
 
 		PaladinBlessing paladinBlessing = new PaladinBlessing();
 
-		playerBlessings.put("BlessingAlchemist",
-				alchemistBlessing);
-		playerBlessings.put("BlessingBerserker",
-				berserkerBlessing);
+		playerBlessings.put("BlessingAlchemist", alchemistBlessing);
+		playerBlessings.put("BlessingBerserker", berserkerBlessing);
 		playerBlessings.put("BlessingDiver", diverBlessing);
 		playerBlessings.put("BlessingLooter", looterBlessing);
-		playerBlessings.put("BlessingLumberjack",
-				lumberjackBlessing);
+		playerBlessings.put("BlessingLumberjack", lumberjackBlessing);
 		playerBlessings.put("BlessingMechanic", mechanicBlessing);
 		playerBlessings.put("BlessingMiner", minerBlessing);
 		playerBlessings.put("BlessingNinja", ninjaBlessing);
@@ -97,20 +93,16 @@ public class BlessingUtils {
 		playerBlessings.put("BlessingThief", thiefBlessing);
 	}
 
-	private static void addOmniBlessing(String blessName,
-			Blessing blessInst) {
+	private static void addOmniBlessing(String blessName, Blessing blessInst) {
 		playerBlessings.put(blessName, blessInst);
 		mobBlessings.put(blessName, blessInst);
 	}
 
 	public static boolean hasDisadvantage() {
 		if (CommonTickHandler.worldData != null) {
-			String currentDisadvantage = CommonTickHandler.worldData
-					.getDisadvantage();
+			String currentDisadvantage = CommonTickHandler.worldData.getDisadvantage();
 
-			return currentDisadvantage != null
-					&& !(currentDisadvantage
-							.equals(""));
+			return currentDisadvantage != null && !(currentDisadvantage.equals(""));
 		}
 
 		return false;
@@ -118,9 +110,7 @@ public class BlessingUtils {
 
 	public static boolean hasDisadvantage(String disadvantage) {
 		if (hasDisadvantage()) {
-			return CommonTickHandler.worldData
-					.getDisadvantage()
-					.equals(disadvantage);
+			return CommonTickHandler.worldData.getDisadvantage().equals(disadvantage);
 		}
 
 		return false;
@@ -137,14 +127,12 @@ public class BlessingUtils {
 	public static boolean hasBlessing(Entity ent) {
 		NBTTagCompound entityData = ent.getEntityData();
 
-		return entityData.hasKey("Blessing") && !(entityData
-				.getString("Blessing").equals(""));
+		return entityData.hasKey("Blessing") && !(entityData.getString("Blessing").equals(""));
 	}
 
 	public static boolean hasBlessing(Entity ent, String blessing) {
 		if (hasBlessing(ent)) {
-			return ent.getEntityData().getString("Blessing")
-					.equals(blessing);
+			return ent.getEntityData().getString("Blessing").equals(blessing);
 		}
 
 		return false;
@@ -155,23 +143,18 @@ public class BlessingUtils {
 	}
 
 	public static int getBlessingCounter(Entity ent) {
-		return Integer.parseInt(EntityStatHelper.getStat(ent,
-				"BlessingCounter"));
+		return Integer.parseInt(EntityStatHelper.getStat(ent, "BlessingCounter"));
 	}
 
 	public static boolean isBlessingActive(Entity ent) {
-		return ent.getEntityData().hasKey("BlessingActive")
-				&& ent.getEntityData().getBoolean(
-						"BlessingActive");
+		return ent.getEntityData().hasKey("BlessingActive") && ent.getEntityData().getBoolean("BlessingActive");
 	}
 
 	public static Blessing getBlessingInstance(String blessing) {
 		if (playerBlessings.containsKey(blessing)) {
 			return playerBlessings.get(blessing);
 		} else {
-			System.err.printf(
-					"ERROR: Blessing '%s' not found, using default blessing\n",
-					blessing);
+			System.err.printf("ERROR: Blessing '%s' not found, using default blessing\n", blessing);
 			return playerBlessings.get("BlessingGuardian");
 		}
 	}
@@ -188,8 +171,7 @@ public class BlessingUtils {
 			i += 1;
 		}
 
-		System.err.println(
-				"ERROR: Couldn't get blessing for player; using default.");
+		System.err.println("ERROR: Couldn't get blessing for player; using default.");
 		return "BlessingGuardian";
 	}
 
@@ -205,8 +187,7 @@ public class BlessingUtils {
 			i += 1;
 		}
 
-		System.err.println(
-				"ERROR: Couldn't get blessing for mob; using default.");
+		System.err.println("ERROR: Couldn't get blessing for mob; using default.");
 		return "BlessingGuardian";
 	}
 
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;
 		}
 
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java
index aed4e0e..e78fa1b 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java
@@ -6,7 +6,7 @@ public class AlchemistBlessing extends StandardBlessing {
 	public AlchemistBlessing() {
 		super("Alchemist", false);
 	}
-	
+
 	@Override
 	public String name() {
 		return "Alchemist";
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java
index fc11ebf..0fa022f 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java
@@ -17,10 +17,8 @@ public class BerserkerBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		if (BlessingUtils.isBlessingActive(
-				event.source.getEntity())) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
+		if (BlessingUtils.isBlessingActive(event.source.getEntity())) {
 			return damageMultiplier + 0.3f;
 		}
 
@@ -29,18 +27,11 @@ public class BerserkerBlessing extends StandardBlessing {
 
 	@Override
 	public void onMobKill(LivingDeathEvent event) {
-		if (!EntityStatHelper.hasStat(event.source.getEntity(),
-				"BlessingCounter")) {
-			EntityStatHelper.giveStat(event.source.getEntity(),
-					"BlessingCounter", 0);
+		if (!EntityStatHelper.hasStat(event.source.getEntity(), "BlessingCounter")) {
+			EntityStatHelper.giveStat(event.source.getEntity(), "BlessingCounter", 0);
 		}
 
-		EntityStatHelper.giveStat(event.source.getEntity(),
-				"BlessingCounter",
-				Math.min(10, Integer.parseInt(
-						EntityStatHelper.getStat(
-								event.source.getEntity(),
-								"BlessingCounter"))
-						+ 1));
+		EntityStatHelper.giveStat(event.source.getEntity(), "BlessingCounter", Math.min(10,
+				Integer.parseInt(EntityStatHelper.getStat(event.source.getEntity(), "BlessingCounter")) + 1));
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java
index a103221..cf1388c 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java
@@ -7,7 +7,7 @@ public class GuardianBlessing extends StandardBlessing {
 	public GuardianBlessing() {
 		super("Guardian");
 	}
-	
+
 	@Override
 	public String name() {
 		return "Guardian";
@@ -19,8 +19,7 @@ public class GuardianBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent lhev,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		return damageMultiplier - 0.2f;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java
index 88100e1..baf9d8c 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java
@@ -18,14 +18,12 @@ public class HunterBlessing extends StandardBlessing {
 	@Override
 	public void correctBlessing(Entity ent) {
 		if (!(ent instanceof IRangedAttackMob)) {
-			ent.getEntityData().setString("Blessing",
-					"BlessingWarrior");
+			ent.getEntityData().setString("Blessing", "BlessingWarrior");
 		}
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.source.isProjectile()) {
 			return damageMultiplier + 0.2f;
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java
index c3d3b3f..942673f 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java
@@ -21,7 +21,10 @@ public class InfernoBlessing extends StandardBlessing {
 
 	@Override
 	public String description() {
-		return "Benefit: Take no fire damage, and do increased damage while on fire\nDrawback: Take damge while wet";
+		return "Benefit: Take no fire damage";
+
+		// return "Benefit: Take no fire damage, and do increased damage while on
+		// fire\nDrawback: Take damge while wet";
 	}
 
 	@Override
@@ -32,15 +35,9 @@ public class InfernoBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		if (event.source.isFireDamage()
-				|| event.source.getDamageType()
-						.equals("inFire")
-				|| event.source.getDamageType()
-						.equals("onFire")
-				|| event.source.getDamageType()
-						.equals("lava")) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
+		if (event.source.isFireDamage() || event.source.getDamageType().equals("inFire")
+				|| event.source.getDamageType().equals("onFire") || event.source.getDamageType().equals("lava")) {
 			event.setCanceled(true);
 
 			return 0;
@@ -50,10 +47,9 @@ public class InfernoBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.source.getEntity().isBurning()) {
-			return damageMultiplier + 0.35f;
+			// return damageMultiplier + 0.35f;
 		}
 
 		return damageMultiplier;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java
index fa44795..3bae3dc 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java
@@ -15,14 +15,10 @@ public class LonerBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.source.getEntity() instanceof EntityLivingBase) {
-			float scaleFactor = 1.0F
-					- (((EntityLivingBase) event.source
-							.getEntity()).getHealth()
-							/ ((EntityLivingBase) event.source
-									.getEntity()).getMaxHealth());
+			float scaleFactor = 1.0F - (((EntityLivingBase) event.source.getEntity()).getHealth()
+					/ ((EntityLivingBase) event.source.getEntity()).getMaxHealth());
 
 			return damageMultiplier + 0.35F * scaleFactor;
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java
index 80fed2b..cb1cb38 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java
@@ -9,7 +9,7 @@ public class LooterBlessing extends StandardBlessing {
 	public LooterBlessing() {
 		super("Looter", false);
 	}
-	
+
 	@Override
 	public String description() {
 		return "Enemies have a chance to drop dungeon loot";
@@ -19,10 +19,7 @@ public class LooterBlessing extends StandardBlessing {
 	public void onMobKill(LivingDeathEvent event) {
 		if (ModjamMod.r.nextInt(50) == 0) {
 			if (!event.entity.worldObj.isRemote) {
-				event.entity.dropItem(ChestGenHooks
-						.getOneItem(ChestGenHooks.DUNGEON_CHEST,
-								ModjamMod.r)
-						.getItem(), 1);
+				event.entity.dropItem(ChestGenHooks.getOneItem(ChestGenHooks.DUNGEON_CHEST, ModjamMod.r).getItem(), 1);
 			}
 		}
 	}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java
index e4136dc..c180671 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java
@@ -26,13 +26,11 @@ public class LumberjackBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		ItemStack held = null;
 
 		if (event.source.getEntity() instanceof EntityLivingBase) {
-			held = ((EntityLivingBase) event.source
-					.getEntity()).getHeldItem();
+			held = ((EntityLivingBase) event.source.getEntity()).getHeldItem();
 		}
 
 		if (held != null && itemIsAxe(held)) {
@@ -44,9 +42,7 @@ public class LumberjackBlessing extends StandardBlessing {
 
 	private boolean itemIsAxe(ItemStack held) {
 		if (held.getItem() instanceof ItemTool) {
-			return ((ItemTool) held.getItem())
-					.getToolClasses(held)
-					.contains("axe");
+			return ((ItemTool) held.getItem()).getToolClasses(held).contains("axe");
 		}
 
 		return false;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java
index e992d17..c1e8138 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java
@@ -6,7 +6,7 @@ public class MechanicBlessing extends StandardBlessing {
 	public MechanicBlessing() {
 		super("Mechanic", false);
 	}
-	
+
 	@Override
 	public String name() {
 		return "Mechanic";
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java
index a73d019..5eb9d36 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java
@@ -20,20 +20,17 @@ public class MinerBlessing extends StandardBlessing {
 
 	@Override
 	public void checkBreakSpeed(BreakSpeed pebsev) {
-		if (pebsev.block.getMaterial() == Material.rock
-				|| pebsev.block.getMaterial() == Material.iron) {
+		if (pebsev.block.getMaterial() == Material.rock || pebsev.block.getMaterial() == Material.iron) {
 			pebsev.newSpeed = pebsev.originalSpeed * 1.25F;
 		}
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		ItemStack held = null;
 
 		if (event.source.getEntity() instanceof EntityLivingBase) {
-			held = ((EntityLivingBase) event.source
-					.getEntity()).getHeldItem();
+			held = ((EntityLivingBase) event.source.getEntity()).getHeldItem();
 		}
 
 		if (held != null && itemIsPickaxe(held)) {
@@ -45,9 +42,7 @@ public class MinerBlessing extends StandardBlessing {
 
 	private boolean itemIsPickaxe(ItemStack held) {
 		if (held.getItem() instanceof ItemTool) {
-			return ((ItemTool) held.getItem())
-					.getToolClasses(held)
-					.contains("pickaxe");
+			return ((ItemTool) held.getItem()).getToolClasses(held).contains("pickaxe");
 		}
 
 		return false;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java
index 1d61065..b4f66e6 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java
@@ -11,7 +11,7 @@ public class NinjaBlessing extends StandardBlessing {
 	public NinjaBlessing() {
 		super("Ninja", false);
 	}
-	
+
 	@Override
 	public String description() {
 		return "- Go invisible while sneaking\n- Attacks on enemies with full health deal 2x damage";
@@ -20,27 +20,18 @@ public class NinjaBlessing extends StandardBlessing {
 	@Override
 	public void commonTick(ServerTickEvent stev, EntityPlayer player) {
 		if (player.isSneaking()) {
-			PotionEffect e = player.getActivePotionEffect(
-					Potion.invisibility);
+			PotionEffect e = player.getActivePotionEffect(Potion.invisibility);
 
-			if (e == null || player.getActivePotionEffect(
-					Potion.invisibility)
-					.getDuration() < 10) {
-				player.addPotionEffect(new PotionEffect(
-						Potion.invisibility.id, 10,
-						1, false));
+			if (e == null || player.getActivePotionEffect(Potion.invisibility).getDuration() < 10) {
+				player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 10, 1, false));
 			}
 		}
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		if (event.entityLiving != null
-				&& event.source.getEntity().isSneaking()
-				&& event.entityLiving
-						.getHealth() == event.entityLiving
-								.getMaxHealth()) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
+		if (event.entityLiving != null && event.source.getEntity().isSneaking()
+				&& event.entityLiving.getHealth() == event.entityLiving.getMaxHealth()) {
 			return damageMultiplier + 1.0F;
 		}
 
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java
index b5be58b..0b8a3ab 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java
@@ -14,8 +14,7 @@ public class PaladinBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.entityLiving.isEntityUndead()) {
 			return damageMultiplier + .2f;
 		}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java
index ec02d76..3010873 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java
@@ -7,21 +7,20 @@ public class ParatrooperBlessing extends StandardBlessing {
 	public ParatrooperBlessing() {
 		super("Paratrooper");
 	}
-	
+
 	@Override
 	public String description() {
 		return "Take no fall damage";
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
-		if(event.source.damageType.equals("fall")) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
+		if (event.source.damageType.equals("fall")) {
 			event.setCanceled(true);
-			
+
 			return 0;
 		}
-		
+
 		return damageMultiplier;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java
index 73f5dc2..7763bac 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java
@@ -18,24 +18,17 @@ public class PorcupineBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onIncomingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) {
 		DamageSource damageSource = event.source;
 
 		Entity source = damageSource.getEntity();
 
-		if (source != null && source instanceof EntityLivingBase
-				&& !damageSource.isProjectile()
-				&& (damageSource.getDamageType()
-						.equals("mob")
-						|| damageSource.getDamageType()
-								.equals("player"))) {
+		if (source != null && source instanceof EntityLivingBase && !damageSource.isProjectile()
+				&& (damageSource.getDamageType().equals("mob") || damageSource.getDamageType().equals("player"))) {
 
-			DamageSource damage = DamageSource
-					.causeThornsDamage(source);
+			DamageSource damage = DamageSource.causeThornsDamage(source);
 
-			((EntityLivingBase) source).attackEntityFrom(
-					damage, event.ammount * 0.07F);
+			((EntityLivingBase) source).attackEntityFrom(damage, event.ammount * 0.07F);
 		}
 
 		return damageMultiplier;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java
index f4cbe65..d89d232 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java
@@ -14,14 +14,12 @@ public class ScholarBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float adjustMobKnowledgeBonus(LivingHurtEvent lhev,
-			float pickedDamageBonus) {
+	public float adjustMobKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) {
 		return pickedDamageBonus + (pickedDamageBonus * 0.5f);
 	}
-	
+
 	@Override
-	public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev,
-			float pickedDamageBonus) {
+	public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) {
 		return pickedDamageBonus + (pickedDamageBonus * 0.5f);
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java
index 21c3fc8..24c9f35 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java
@@ -16,15 +16,11 @@ public class SwampBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.entityLiving != null) {
-			event.entityLiving
-					.addPotionEffect(new PotionEffect(
-							Potion.moveSlowdown.id,
-							100, 1, false));
+			event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 1, false));
 		}
-		
+
 		return damageMultiplier;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java
index 9504eb0..978d962 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java
@@ -7,7 +7,7 @@ public class ThickSkinnedBlessing extends StandardBlessing {
 	public ThickSkinnedBlessing() {
 		super("Thick-Skinned");
 	}
-	
+
 	@Override
 	public String description() {
 		return "Reduce damage taken by a flat amount";
@@ -16,7 +16,7 @@ public class ThickSkinnedBlessing extends StandardBlessing {
 	@Override
 	public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) {
 		lhev.ammount = Math.max(0.5f, lhev.ammount - 1f);
-		
+
 		return damageMultiplier;
 	}
 }
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java
index 267054f..b83472a 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java
@@ -16,10 +16,9 @@ public class ThiefBlessing extends StandardBlessing {
 
 	@Override
 	public void onMobKill(LivingDeathEvent event) {
-		if(ModjamMod.r.nextInt(20) == 0) {
+		if (ModjamMod.r.nextInt(20) == 0) {
 			if (!event.entity.worldObj.isRemote) {
-				event.entity.dropItem(Items.gold_nugget,
-						1);
+				event.entity.dropItem(Items.gold_nugget, 1);
 			}
 		}
 	}
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java
index 914f9c6..25515ee 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java
@@ -14,12 +14,9 @@ public class VampireBlessing extends StandardBlessing {
 	}
 
 	@Override
-	public float onOutgoingDamage(LivingHurtEvent event,
-			float damageMultiplier) {
+	public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) {
 		if (event.source.getEntity() instanceof EntityLivingBase) {
-			((EntityLivingBase) event.source.getEntity()).heal(
-					(event.ammount * damageMultiplier)
-							* 0.07F);
+			((EntityLivingBase) event.source.getEntity()).heal((event.ammount * damageMultiplier) * 0.07F);
 		}
 
 		return damageMultiplier;
diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java
index 83fed42..e264531 100644
--- a/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java
+++ b/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java
@@ -17,17 +17,13 @@ public class WarriorBlessing extends StandardBlessing {
 	@Override
 	public void correctBlessing(Entity ent) {
 		if (ent instanceof IRangedAttackMob) {
-			ent.getEntityData().setString("Blessing",
-					"BlessingHunter");
+			ent.getEntityData().setString("Blessing", "BlessingHunter");
 		}
 	}
 
 	@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.2f;
 		}