Launch update

Only a week behind...

2114 files changed, 9149 insertions, 6812 deletions

diff --git a/Gimp files/heatershield/heaterShieldx32.xcf b/Gimp files/heatershield/heaterShieldx32.xcf
index 9377b84..d6d2db7 100644
--- a/Gimp files/heatershield/heaterShieldx32.xcf
+++ b/Gimp files/heatershield/heaterShieldx32.xcf
diff --git a/build.gradle b/build.gradle
index 65a6705..05437e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.3.5a"
+version = "1.3.6"
 group= "gmail.lance5057.com" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tinkersdefense"
 
diff --git a/src/api/java/buildcraft/api/tools/IToolWrench.java b/src/api/java/buildcraft/api/tools/IToolWrench.java
index c5c9d86..e48ae06 100644
--- a/src/api/java/buildcraft/api/tools/IToolWrench.java
+++ b/src/api/java/buildcraft/api/tools/IToolWrench.java
@@ -13,7 +13,8 @@ import net.minecraft.entity.player.EntityPlayer;
 /***
  * Implement this interface on subclasses of Item to have that item work as a wrench for buildcraft
  */
-public interface IToolWrench {
+public interface IToolWrench
+{
 
 	/***
 	 * Called to ensure that the wrench can be used. To get the ItemStack that is used, check player.inventory.getCurrentItem()
diff --git a/src/api/java/cofh/api/block/IDismantleable.java b/src/api/java/cofh/api/block/IDismantleable.java
index 12c09e3..9a9c19a 100644
--- a/src/api/java/cofh/api/block/IDismantleable.java
+++ b/src/api/java/cofh/api/block/IDismantleable.java
@@ -12,7 +12,8 @@ import net.minecraft.world.World;
  * @author King Lemming
  *
  */
-public interface IDismantleable {
+public interface IDismantleable
+{
 
 	/**
 	 * Dismantles the block. If returnDrops is true, the drop(s) should be placed into the player's inventory.
diff --git a/src/api/java/cofh/api/energy/EnergyStorage.java b/src/api/java/cofh/api/energy/EnergyStorage.java
index 25e0126..01ec59b 100644
--- a/src/api/java/cofh/api/energy/EnergyStorage.java
+++ b/src/api/java/cofh/api/energy/EnergyStorage.java
@@ -8,80 +8,95 @@ import net.minecraft.nbt.NBTTagCompound;
  * @author King Lemming
  *
  */
-public class EnergyStorage implements IEnergyStorage {
+public class EnergyStorage implements IEnergyStorage
+{
 
-	protected int energy;
-	protected int capacity;
-	protected int maxReceive;
-	protected int maxExtract;
+	protected int	energy;
+	protected int	capacity;
+	protected int	maxReceive;
+	protected int	maxExtract;
 
-	public EnergyStorage(int capacity) {
+	public EnergyStorage(int capacity)
+	{
 
 		this(capacity, capacity, capacity);
 	}
 
-	public EnergyStorage(int capacity, int maxTransfer) {
+	public EnergyStorage(int capacity, int maxTransfer)
+	{
 
 		this(capacity, maxTransfer, maxTransfer);
 	}
 
-	public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
+	public EnergyStorage(int capacity, int maxReceive, int maxExtract)
+	{
 
 		this.capacity = capacity;
 		this.maxReceive = maxReceive;
 		this.maxExtract = maxExtract;
 	}
 
-	public EnergyStorage readFromNBT(NBTTagCompound nbt) {
+	public EnergyStorage readFromNBT(NBTTagCompound nbt)
+	{
 
-		this.energy = nbt.getInteger("Energy");
+		energy = nbt.getInteger("Energy");
 
-		if (energy > capacity) {
+		if(energy > capacity)
+		{
 			energy = capacity;
 		}
 		return this;
 	}
 
-	public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+	public NBTTagCompound writeToNBT(NBTTagCompound nbt)
+	{
 
-		if (energy < 0) {
+		if(energy < 0)
+		{
 			energy = 0;
 		}
 		nbt.setInteger("Energy", energy);
 		return nbt;
 	}
 
-	public void setCapacity(int capacity) {
+	public void setCapacity(int capacity)
+	{
 
 		this.capacity = capacity;
 
-		if (energy > capacity) {
+		if(energy > capacity)
+		{
 			energy = capacity;
 		}
 	}
 
-	public void setMaxTransfer(int maxTransfer) {
+	public void setMaxTransfer(int maxTransfer)
+	{
 
 		setMaxReceive(maxTransfer);
 		setMaxExtract(maxTransfer);
 	}
 
-	public void setMaxReceive(int maxReceive) {
+	public void setMaxReceive(int maxReceive)
+	{
 
 		this.maxReceive = maxReceive;
 	}
 
-	public void setMaxExtract(int maxExtract) {
+	public void setMaxExtract(int maxExtract)
+	{
 
 		this.maxExtract = maxExtract;
 	}
 
-	public int getMaxReceive() {
+	public int getMaxReceive()
+	{
 
 		return maxReceive;
 	}
 
-	public int getMaxExtract() {
+	public int getMaxExtract()
+	{
 
 		return maxExtract;
 	}
@@ -92,13 +107,17 @@ public class EnergyStorage implements IEnergyStorage {
 	 *
 	 * @param energy
 	 */
-	public void setEnergyStored(int energy) {
+	public void setEnergyStored(int energy)
+	{
 
 		this.energy = energy;
 
-		if (this.energy > capacity) {
+		if(this.energy > capacity)
+		{
 			this.energy = capacity;
-		} else if (this.energy < 0) {
+		}
+		else if(this.energy < 0)
+		{
 			this.energy = 0;
 		}
 	}
@@ -109,48 +128,58 @@ public class EnergyStorage implements IEnergyStorage {
 	 *
 	 * @param energy
 	 */
-	public void modifyEnergyStored(int energy) {
+	public void modifyEnergyStored(int energy)
+	{
 
 		this.energy += energy;
 
-		if (this.energy > capacity) {
+		if(this.energy > capacity)
+		{
 			this.energy = capacity;
-		} else if (this.energy < 0) {
+		}
+		else if(this.energy < 0)
+		{
 			this.energy = 0;
 		}
 	}
 
 	/* IEnergyStorage */
 	@Override
-	public int receiveEnergy(int maxReceive, boolean simulate) {
+	public int receiveEnergy(int maxReceive, boolean simulate)
+	{
 
-		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+		final int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
 
-		if (!simulate) {
+		if(!simulate)
+		{
 			energy += energyReceived;
 		}
 		return energyReceived;
 	}
 
 	@Override
-	public int extractEnergy(int maxExtract, boolean simulate) {
+	public int extractEnergy(int maxExtract, boolean simulate)
+	{
 
-		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+		final int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
 
-		if (!simulate) {
+		if(!simulate)
+		{
 			energy -= energyExtracted;
 		}
 		return energyExtracted;
 	}
 
 	@Override
-	public int getEnergyStored() {
+	public int getEnergyStored()
+	{
 
 		return energy;
 	}
 
 	@Override
-	public int getMaxEnergyStored() {
+	public int getMaxEnergyStored()
+	{
 
 		return capacity;
 	}
diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java
index 301271e..a1fad46 100644
--- a/src/api/java/cofh/api/energy/IEnergyConnection.java
+++ b/src/api/java/cofh/api/energy/IEnergyConnection.java
@@ -11,7 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public interface IEnergyConnection {
+public interface IEnergyConnection
+{
 
 	/**
 	 * Returns TRUE if the TileEntity can connect on a given side.
diff --git a/src/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/api/java/cofh/api/energy/IEnergyContainerItem.java
index 3ef7257..43a570b 100644
--- a/src/api/java/cofh/api/energy/IEnergyContainerItem.java
+++ b/src/api/java/cofh/api/energy/IEnergyContainerItem.java
@@ -10,7 +10,8 @@ import net.minecraft.item.ItemStack;
  * @author King Lemming
  *
  */
-public interface IEnergyContainerItem {
+public interface IEnergyContainerItem
+{
 
 	/**
 	 * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java
index 6a4600a..ea6d8fa 100644
--- a/src/api/java/cofh/api/energy/IEnergyHandler.java
+++ b/src/api/java/cofh/api/energy/IEnergyHandler.java
@@ -10,7 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver {
+public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver
+{
 
 	// merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things)
 
diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java
index 05287b3..0437e11 100644
--- a/src/api/java/cofh/api/energy/IEnergyProvider.java
+++ b/src/api/java/cofh/api/energy/IEnergyProvider.java
@@ -10,7 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public interface IEnergyProvider extends IEnergyConnection {
+public interface IEnergyProvider extends IEnergyConnection
+{
 
 	/**
 	 * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java
index c726e09..226e61d 100644
--- a/src/api/java/cofh/api/energy/IEnergyReceiver.java
+++ b/src/api/java/cofh/api/energy/IEnergyReceiver.java
@@ -10,7 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public interface IEnergyReceiver extends IEnergyConnection {
+public interface IEnergyReceiver extends IEnergyConnection
+{
 
 	/**
 	 * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
diff --git a/src/api/java/cofh/api/energy/IEnergyStorage.java b/src/api/java/cofh/api/energy/IEnergyStorage.java
index 414b265..4ea5935 100644
--- a/src/api/java/cofh/api/energy/IEnergyStorage.java
+++ b/src/api/java/cofh/api/energy/IEnergyStorage.java
@@ -9,7 +9,8 @@ package cofh.api.energy;
  * @author King Lemming
  *
  */
-public interface IEnergyStorage {
+public interface IEnergyStorage
+{
 
 	/**
 	 * Adds energy to the storage. Returns quantity of energy that was accepted.
diff --git a/src/api/java/cofh/api/energy/ItemEnergyContainer.java b/src/api/java/cofh/api/energy/ItemEnergyContainer.java
index 2d3659c..3e8e4fb 100644
--- a/src/api/java/cofh/api/energy/ItemEnergyContainer.java
+++ b/src/api/java/cofh/api/energy/ItemEnergyContainer.java
@@ -10,66 +10,78 @@ import net.minecraft.nbt.NBTTagCompound;
  * @author King Lemming
  *
  */
-public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
+public class ItemEnergyContainer extends Item implements IEnergyContainerItem
+{
 
-	protected int capacity;
-	protected int maxReceive;
-	protected int maxExtract;
+	protected int	capacity;
+	protected int	maxReceive;
+	protected int	maxExtract;
 
-	public ItemEnergyContainer() {
+	public ItemEnergyContainer()
+	{
 
 	}
 
-	public ItemEnergyContainer(int capacity) {
+	public ItemEnergyContainer(int capacity)
+	{
 
 		this(capacity, capacity, capacity);
 	}
 
-	public ItemEnergyContainer(int capacity, int maxTransfer) {
+	public ItemEnergyContainer(int capacity, int maxTransfer)
+	{
 
 		this(capacity, maxTransfer, maxTransfer);
 	}
 
-	public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
+	public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract)
+	{
 
 		this.capacity = capacity;
 		this.maxReceive = maxReceive;
 		this.maxExtract = maxExtract;
 	}
 
-	public ItemEnergyContainer setCapacity(int capacity) {
+	public ItemEnergyContainer setCapacity(int capacity)
+	{
 
 		this.capacity = capacity;
 		return this;
 	}
 
-	public void setMaxTransfer(int maxTransfer) {
+	public void setMaxTransfer(int maxTransfer)
+	{
 
 		setMaxReceive(maxTransfer);
 		setMaxExtract(maxTransfer);
 	}
 
-	public void setMaxReceive(int maxReceive) {
+	public void setMaxReceive(int maxReceive)
+	{
 
 		this.maxReceive = maxReceive;
 	}
 
-	public void setMaxExtract(int maxExtract) {
+	public void setMaxExtract(int maxExtract)
+	{
 
 		this.maxExtract = maxExtract;
 	}
 
 	/* IEnergyContainerItem */
 	@Override
-	public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+	public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
+	{
 
-		if (container.stackTagCompound == null) {
+		if(container.stackTagCompound == null)
+		{
 			container.stackTagCompound = new NBTTagCompound();
 		}
 		int energy = container.stackTagCompound.getInteger("Energy");
-		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+		final int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
 
-		if (!simulate) {
+		if(!simulate)
+		{
 			energy += energyReceived;
 			container.stackTagCompound.setInteger("Energy", energy);
 		}
@@ -77,15 +89,18 @@ public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
 	}
 
 	@Override
-	public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+	public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
+	{
 
-		if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
+		if(container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy"))
+		{
 			return 0;
 		}
 		int energy = container.stackTagCompound.getInteger("Energy");
-		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+		final int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
 
-		if (!simulate) {
+		if(!simulate)
+		{
 			energy -= energyExtracted;
 			container.stackTagCompound.setInteger("Energy", energy);
 		}
@@ -93,16 +108,19 @@ public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
 	}
 
 	@Override
-	public int getEnergyStored(ItemStack container) {
+	public int getEnergyStored(ItemStack container)
+	{
 
-		if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
+		if(container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy"))
+		{
 			return 0;
 		}
 		return container.stackTagCompound.getInteger("Energy");
 	}
 
 	@Override
-	public int getMaxEnergyStored(ItemStack container) {
+	public int getMaxEnergyStored(ItemStack container)
+	{
 
 		return capacity;
 	}
diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/api/java/cofh/api/energy/TileEnergyHandler.java
index 7cc655e..b50940b 100644
--- a/src/api/java/cofh/api/energy/TileEnergyHandler.java
+++ b/src/api/java/cofh/api/energy/TileEnergyHandler.java
@@ -10,19 +10,22 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
+public class TileEnergyHandler extends TileEntity implements IEnergyHandler
+{
 
-	protected EnergyStorage storage = new EnergyStorage(32000);
+	protected EnergyStorage	storage	= new EnergyStorage(32000);
 
 	@Override
-	public void readFromNBT(NBTTagCompound nbt) {
+	public void readFromNBT(NBTTagCompound nbt)
+	{
 
 		super.readFromNBT(nbt);
 		storage.readFromNBT(nbt);
 	}
 
 	@Override
-	public void writeToNBT(NBTTagCompound nbt) {
+	public void writeToNBT(NBTTagCompound nbt)
+	{
 
 		super.writeToNBT(nbt);
 		storage.writeToNBT(nbt);
@@ -30,34 +33,39 @@ public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
 
 	/* IEnergyConnection */
 	@Override
-	public boolean canConnectEnergy(ForgeDirection from) {
+	public boolean canConnectEnergy(ForgeDirection from)
+	{
 
 		return true;
 	}
 
 	/* IEnergyReceiver */
 	@Override
-	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
+	{
 
 		return storage.receiveEnergy(maxReceive, simulate);
 	}
 
 	/* IEnergyProvider */
 	@Override
-	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
+	{
 
 		return storage.extractEnergy(maxExtract, simulate);
 	}
 
 	/* IEnergyReceiver and IEnergyProvider */
 	@Override
-	public int getEnergyStored(ForgeDirection from) {
+	public int getEnergyStored(ForgeDirection from)
+	{
 
 		return storage.getEnergyStored();
 	}
 
 	@Override
-	public int getMaxEnergyStored(ForgeDirection from) {
+	public int getMaxEnergyStored(ForgeDirection from)
+	{
 
 		return storage.getMaxEnergyStored();
 	}
diff --git a/src/api/java/cofh/api/item/IToolHammer.java b/src/api/java/cofh/api/item/IToolHammer.java
index f1b4bb9..efa5d07 100644
--- a/src/api/java/cofh/api/item/IToolHammer.java
+++ b/src/api/java/cofh/api/item/IToolHammer.java
@@ -6,7 +6,8 @@ import net.minecraft.item.ItemStack;
 /**
  * Implement this interface on subclasses of Item to have that item work as a tool for CoFH mods.
  */
-public interface IToolHammer {
+public interface IToolHammer
+{
 
 	/**
 	 * Called to ensure that the tool can be used.
diff --git a/src/api/java/cofh/core/item/IEqualityOverrideItem.java b/src/api/java/cofh/core/item/IEqualityOverrideItem.java
index c2dc3ac..e09423e 100644
--- a/src/api/java/cofh/core/item/IEqualityOverrideItem.java
+++ b/src/api/java/cofh/core/item/IEqualityOverrideItem.java
@@ -2,8 +2,9 @@ package cofh.core.item;
 
 import net.minecraft.item.ItemStack;
 
-public interface IEqualityOverrideItem {
+public interface IEqualityOverrideItem
+{
 
 	public boolean isLastHeldItemEqual(ItemStack current, ItemStack previous);
 
-}
\ No newline at end of file
+}
diff --git a/src/api/java/cofh/lib/util/helpers/BlockHelper.java b/src/api/java/cofh/lib/util/helpers/BlockHelper.java
index 5342727..3b06035 100644
--- a/src/api/java/cofh/lib/util/helpers/BlockHelper.java
+++ b/src/api/java/cofh/lib/util/helpers/BlockHelper.java
@@ -24,64 +24,69 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author King Lemming
  *
  */
-public final class BlockHelper {
+public final class BlockHelper
+{
 
-	private BlockHelper() {
+	private BlockHelper()
+	{
 
 	}
 
-	public static int MAX_ID = 1024;
-	public static byte[] rotateType = new byte[MAX_ID];
-	public static final int[][] SIDE_COORD_MOD = { { 0, -1, 0 }, { 0, 1, 0 }, { 0, 0, -1 }, { 0, 0, 1 }, { -1, 0, 0 }, { 1, 0, 0 } };
-	public static float[][] SIDE_COORD_AABB = { { 1, -2, 1 }, { 1, 2, 1 }, { 1, 1, 1 }, { 1, 1, 2 }, { 1, 1, 1 }, { 2, 1, 1 } };
-	public static final byte[] SIDE_LEFT = { 4, 5, 5, 4, 2, 3 };
-	public static final byte[] SIDE_RIGHT = { 5, 4, 4, 5, 3, 2 };
-	public static final byte[] SIDE_OPPOSITE = { 1, 0, 3, 2, 5, 4 };
-	public static final byte[] SIDE_ABOVE = { 3, 2, 1, 1, 1, 1 };
-	public static final byte[] SIDE_BELOW = { 2, 3, 0, 0, 0, 0 };
+	public static int				MAX_ID				= 1024;
+	public static byte[]			rotateType			= new byte[MAX_ID];
+	public static final int[][]		SIDE_COORD_MOD		= { {0, -1, 0}, {0, 1, 0}, {0, 0, -1}, {0, 0, 1}, {-1, 0, 0}, {1, 0, 0}};
+	public static float[][]			SIDE_COORD_AABB		= { {1, -2, 1}, {1, 2, 1}, {1, 1, 1}, {1, 1, 2}, {1, 1, 1}, {2, 1, 1}};
+	public static final byte[]		SIDE_LEFT			= {4, 5, 5, 4, 2, 3};
+	public static final byte[]		SIDE_RIGHT			= {5, 4, 4, 5, 3, 2};
+	public static final byte[]		SIDE_OPPOSITE		= {1, 0, 3, 2, 5, 4};
+	public static final byte[]		SIDE_ABOVE			= {3, 2, 1, 1, 1, 1};
+	public static final byte[]		SIDE_BELOW			= {2, 3, 0, 0, 0, 0};
 
 	// These assume facing is towards negative - looking AT side 1, 3, or 5.
-	public static final byte[] ROTATE_CLOCK_Y = { 0, 1, 4, 5, 3, 2 };
-	public static final byte[] ROTATE_CLOCK_Z = { 5, 4, 2, 3, 0, 1 };
-	public static final byte[] ROTATE_CLOCK_X = { 2, 3, 1, 0, 4, 5 };
+	public static final byte[]		ROTATE_CLOCK_Y		= {0, 1, 4, 5, 3, 2};
+	public static final byte[]		ROTATE_CLOCK_Z		= {5, 4, 2, 3, 0, 1};
+	public static final byte[]		ROTATE_CLOCK_X		= {2, 3, 1, 0, 4, 5};
 
-	public static final byte[] ROTATE_COUNTER_Y = { 0, 1, 5, 4, 2, 3 };
-	public static final byte[] ROTATE_COUNTER_Z = { 4, 5, 2, 3, 1, 0 };
-	public static final byte[] ROTATE_COUNTER_X = { 3, 2, 0, 1, 4, 5 };
+	public static final byte[]		ROTATE_COUNTER_Y	= {0, 1, 5, 4, 2, 3};
+	public static final byte[]		ROTATE_COUNTER_Z	= {4, 5, 2, 3, 1, 0};
+	public static final byte[]		ROTATE_COUNTER_X	= {3, 2, 0, 1, 4, 5};
 
-	public static final byte[] INVERT_AROUND_Y = { 0, 1, 3, 2, 5, 4 };
-	public static final byte[] INVERT_AROUND_Z = { 1, 0, 2, 3, 5, 4 };
-	public static final byte[] INVERT_AROUND_X = { 1, 0, 3, 2, 4, 5 };
+	public static final byte[]		INVERT_AROUND_Y		= {0, 1, 3, 2, 5, 4};
+	public static final byte[]		INVERT_AROUND_Z		= {1, 0, 2, 3, 5, 4};
+	public static final byte[]		INVERT_AROUND_X		= {1, 0, 3, 2, 4, 5};
 
 	// Map which gives relative Icon to use on a block which can be placed on any side.
-	public static final byte[][] ICON_ROTATION_MAP = new byte[6][];
-
-	static {
-		ICON_ROTATION_MAP[0] = new byte[] { 0, 1, 2, 3, 4, 5 };
-		ICON_ROTATION_MAP[1] = new byte[] { 1, 0, 2, 3, 4, 5 };
-		ICON_ROTATION_MAP[2] = new byte[] { 3, 2, 0, 1, 4, 5 };
-		ICON_ROTATION_MAP[3] = new byte[] { 3, 2, 1, 0, 5, 4 };
-		ICON_ROTATION_MAP[4] = new byte[] { 3, 2, 5, 4, 0, 1 };
-		ICON_ROTATION_MAP[5] = new byte[] { 3, 2, 4, 5, 1, 0 };
-	}
-
-	public static final class RotationType {
-
-		public static final int PREVENT = -1;
-		public static final int FOUR_WAY = 1;
-		public static final int SIX_WAY = 2;
-		public static final int RAIL = 3;
-		public static final int PUMPKIN = 4;
-		public static final int STAIRS = 5;
-		public static final int REDSTONE = 6;
-		public static final int LOG = 7;
-		public static final int SLAB = 8;
-		public static final int CHEST = 9;
-		public static final int LEVER = 10;
-		public static final int SIGN = 11;
-	}
-
-	static { // TODO: review which of these can be removed in favor of the vanilla handler
+	public static final byte[][]	ICON_ROTATION_MAP	= new byte[6][];
+
+	static
+	{
+		ICON_ROTATION_MAP[0] = new byte[] {0, 1, 2, 3, 4, 5};
+		ICON_ROTATION_MAP[1] = new byte[] {1, 0, 2, 3, 4, 5};
+		ICON_ROTATION_MAP[2] = new byte[] {3, 2, 0, 1, 4, 5};
+		ICON_ROTATION_MAP[3] = new byte[] {3, 2, 1, 0, 5, 4};
+		ICON_ROTATION_MAP[4] = new byte[] {3, 2, 5, 4, 0, 1};
+		ICON_ROTATION_MAP[5] = new byte[] {3, 2, 4, 5, 1, 0};
+	}
+
+	public static final class RotationType
+	{
+
+		public static final int	PREVENT		= -1;
+		public static final int	FOUR_WAY	= 1;
+		public static final int	SIX_WAY		= 2;
+		public static final int	RAIL		= 3;
+		public static final int	PUMPKIN		= 4;
+		public static final int	STAIRS		= 5;
+		public static final int	REDSTONE	= 6;
+		public static final int	LOG			= 7;
+		public static final int	SLAB		= 8;
+		public static final int	CHEST		= 9;
+		public static final int	LEVER		= 10;
+		public static final int	SIGN		= 11;
+	}
+
+	static
+	{ // TODO: review which of these can be removed in favor of the vanilla handler
 		rotateType[Block.getIdFromBlock(Blocks.bed)] = RotationType.PREVENT;
 
 		rotateType[Block.getIdFromBlock(Blocks.stone_slab)] = RotationType.SLAB;
@@ -129,144 +134,167 @@ public final class BlockHelper {
 		rotateType[Block.getIdFromBlock(Blocks.quartz_stairs)] = RotationType.STAIRS;
 	}
 
-	public static int getMicroBlockAngle(int side, float hitX, float hitY, float hitZ) {
+	public static int getMicroBlockAngle(int side, float hitX, float hitY, float hitZ)
+	{
 
 		int direction = side ^ 1;
-		float degreeCenter = 0.32f / 2;
+		final float degreeCenter = 0.32f / 2;
 
 		float x = 0, y = 0;
-		switch (side >> 1) {
-		case 0:
-			x = hitX;
-			y = hitZ;
-			break;
-		case 1:
-			x = hitX;
-			y = hitY;
-			break;
-		case 2:
-			x = hitY;
-			y = hitZ;
-			break;
+		switch(side >> 1)
+		{
+			case 0:
+				x = hitX;
+				y = hitZ;
+				break;
+			case 1:
+				x = hitX;
+				y = hitY;
+				break;
+			case 2:
+				x = hitY;
+				y = hitZ;
+				break;
 		}
 		x -= .5f;
 		y -= .5f;
 
-		if (x * x + y * y > degreeCenter * degreeCenter) {
+		if(x * x + y * y > degreeCenter * degreeCenter)
+		{
 
 			int a = (int) ((Math.atan2(x, y) + Math.PI) * 4 / Math.PI);
 			a = ++a & 7;
-			switch (a >> 1) {
-			case 0:
-			case 4:
-				direction = 2;
-				break;
-			case 1:
-				direction = 4;
-				break;
-			case 2:
-				direction = 3;
-				break;
-			case 3:
-				direction = 5;
-				break;
+			switch(a >> 1)
+			{
+				case 0:
+				case 4:
+					direction = 2;
+					break;
+				case 1:
+					direction = 4;
+					break;
+				case 2:
+					direction = 3;
+					break;
+				case 3:
+					direction = 5;
+					break;
 			}
 		}
 		return direction;
 	}
 
-	public static ForgeDirection getMicroBlockAngle(ForgeDirection side, float hitX, float hitY, float hitZ) {
+	public static ForgeDirection getMicroBlockAngle(ForgeDirection side, float hitX, float hitY, float hitZ)
+	{
 
 		return ForgeDirection.VALID_DIRECTIONS[getMicroBlockAngle(side.ordinal(), hitX, hitY, hitZ)];
 	}
 
-	public static int getHighestY(World world, int x, int z) {
+	public static int getHighestY(World world, int x, int z)
+	{
 
 		return world.getChunkFromBlockCoords(x, z).getTopFilledSegment() + 16;
 	}
 
-	public static int getSurfaceBlockY(World world, int x, int z) {
+	public static int getSurfaceBlockY(World world, int x, int z)
+	{
 
 		int y = world.getChunkFromBlockCoords(x, z).getTopFilledSegment() + 16;
 
 		Block block;
-		do {
-			if (--y < 0) {
+		do
+		{
+			if(--y < 0)
+			{
 				break;
 			}
 			block = world.getBlock(x, y, z);
-		} while (block.isAir(world, x, y, z) || block.isReplaceable(world, x, y, z) || block.isLeaves(world, x, y, z) || block.isFoliage(world, x, y, z)
-				|| block.canBeReplacedByLeaves(world, x, y, z));
+		}
+		while(block.isAir(world, x, y, z) || block.isReplaceable(world, x, y, z) || block.isLeaves(world, x, y, z) || block.isFoliage(world, x, y, z) || block.canBeReplacedByLeaves(world, x, y, z));
 		return y;
 	}
 
-	public static int getTopBlockY(World world, int x, int z) {
+	public static int getTopBlockY(World world, int x, int z)
+	{
 
 		int y = world.getChunkFromBlockCoords(x, z).getTopFilledSegment() + 16;
 
 		Block block;
-		do {
-			if (--y < 0) {
+		do
+		{
+			if(--y < 0)
+			{
 				break;
 			}
 			block = world.getBlock(x, y, z);
-		} while (block.isAir(world, x, y, z));
+		}
+		while(block.isAir(world, x, y, z));
 		return y;
 	}
 
-	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, double distance, boolean fluid) {
+	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, double distance, boolean fluid)
+	{
 
-		Vec3 posVec = Vec3.createVectorHelper(player.posX, player.posY, player.posZ);
+		final Vec3 posVec = Vec3.createVectorHelper(player.posX, player.posY, player.posZ);
 		Vec3 lookVec = player.getLook(1);
 		posVec.yCoord += player.getEyeHeight();
 		lookVec = posVec.addVector(lookVec.xCoord * distance, lookVec.yCoord * distance, lookVec.zCoord * distance);
 		return player.worldObj.rayTraceBlocks(posVec, lookVec, fluid);
 	}
 
-	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, double distance) {
+	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, double distance)
+	{
 
 		return getCurrentMovingObjectPosition(player, distance, false);
 	}
 
-	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, boolean fluid) {
+	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player, boolean fluid)
+	{
 
 		return getCurrentMovingObjectPosition(player, player.capabilities.isCreativeMode ? 5.0F : 4.5F, fluid);
 	}
 
-	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player) {
+	public static MovingObjectPosition getCurrentMovingObjectPosition(EntityPlayer player)
+	{
 
 		return getCurrentMovingObjectPosition(player, player.capabilities.isCreativeMode ? 5.0F : 4.5F, false);
 	}
 
-	public static int getCurrentMousedOverSide(EntityPlayer player) {
+	public static int getCurrentMousedOverSide(EntityPlayer player)
+	{
 
-		MovingObjectPosition mouseOver = getCurrentMovingObjectPosition(player);
+		final MovingObjectPosition mouseOver = getCurrentMovingObjectPosition(player);
 		return mouseOver == null ? 0 : mouseOver.sideHit;
 	}
 
-	public static int determineXZPlaceFacing(EntityLivingBase living) {
+	public static int determineXZPlaceFacing(EntityLivingBase living)
+	{
 
-		int quadrant = MathHelper.floor_double(living.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		final int quadrant = MathHelper.floor_double(living.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
 
-		switch (quadrant) {
-		case 0:
-			return 2;
-		case 1:
-			return 5;
-		case 2:
-			return 3;
-		case 3:
-			return 4;
+		switch(quadrant)
+		{
+			case 0:
+				return 2;
+			case 1:
+				return 5;
+			case 2:
+				return 3;
+			case 3:
+				return 4;
 		}
 		return 3;
 	}
 
-	public static boolean isEqual(Block blockA, Block blockB) {
+	public static boolean isEqual(Block blockA, Block blockB)
+	{
 
-		if (blockA == blockB) {
+		if(blockA == blockB)
+		{
 			return true;
 		}
-		if (blockA == null | blockB == null) {
+		if(blockA == null | blockB == null)
+		{
 			return false;
 		}
 		return blockA.equals(blockB) || blockA.isAssociatedBlock(blockB);
@@ -298,7 +326,8 @@ public final class BlockHelper {
 	// ForgeDirection.values()[side]);
 	// }
 
-	public static Block getAdjacentBlock(World world, int x, int y, int z, ForgeDirection dir) {
+	public static Block getAdjacentBlock(World world, int x, int y, int z, ForgeDirection dir)
+	{
 
 		x += dir.offsetX;
 		y += dir.offsetY;
@@ -306,13 +335,15 @@ public final class BlockHelper {
 		return world == null || !world.blockExists(x, y, z) ? Blocks.air : world.getBlock(x, y, z);
 	}
 
-	public static Block getAdjacentBlock(World world, int x, int y, int z, int side) {
+	public static Block getAdjacentBlock(World world, int x, int y, int z, int side)
+	{
 
 		return world == null ? Blocks.air : getAdjacentBlock(world, x, y, z, ForgeDirection.getOrientation(side));
 	}
 
 	/* Safe Tile Entity Retrieval */
-	public static TileEntity getAdjacentTileEntity(World world, int x, int y, int z, ForgeDirection dir) {
+	public static TileEntity getAdjacentTileEntity(World world, int x, int y, int z, ForgeDirection dir)
+	{
 
 		x += dir.offsetX;
 		y += dir.offsetY;
@@ -320,233 +351,283 @@ public final class BlockHelper {
 		return world == null || !world.blockExists(x, y, z) ? null : world.getTileEntity(x, y, z);
 	}
 
-	public static TileEntity getAdjacentTileEntity(World world, int x, int y, int z, int side) {
+	public static TileEntity getAdjacentTileEntity(World world, int x, int y, int z, int side)
+	{
 
 		return world == null ? null : getAdjacentTileEntity(world, x, y, z, ForgeDirection.getOrientation(side));
 	}
 
-	public static TileEntity getAdjacentTileEntity(TileEntity refTile, ForgeDirection dir) {
+	public static TileEntity getAdjacentTileEntity(TileEntity refTile, ForgeDirection dir)
+	{
 
 		return refTile == null ? null : getAdjacentTileEntity(refTile.getWorldObj(), refTile.xCoord, refTile.yCoord, refTile.zCoord, dir);
 	}
 
-	public static TileEntity getAdjacentTileEntity(TileEntity refTile, int side) {
+	public static TileEntity getAdjacentTileEntity(TileEntity refTile, int side)
+	{
 
-		return refTile == null ? null : getAdjacentTileEntity(refTile.getWorldObj(), refTile.xCoord, refTile.yCoord, refTile.zCoord,
-				ForgeDirection.values()[side]);
+		return refTile == null ? null : getAdjacentTileEntity(refTile.getWorldObj(), refTile.xCoord, refTile.yCoord, refTile.zCoord, ForgeDirection.values()[side]);
 	}
 
-	public static int determineAdjacentSide(TileEntity refTile, int x, int y, int z) {
+	public static int determineAdjacentSide(TileEntity refTile, int x, int y, int z)
+	{
 
 		return y > refTile.yCoord ? 1 : y < refTile.yCoord ? 0 : z > refTile.zCoord ? 3 : z < refTile.zCoord ? 2 : x > refTile.xCoord ? 5 : 4;
 	}
 
 	/* COORDINATE TRANSFORM */
-	public static int[] getAdjacentCoordinatesForSide(MovingObjectPosition pos) {
+	public static int[] getAdjacentCoordinatesForSide(MovingObjectPosition pos)
+	{
 
 		return getAdjacentCoordinatesForSide(pos.blockX, pos.blockY, pos.blockZ, pos.sideHit);
 	}
 
-	public static int[] getAdjacentCoordinatesForSide(int x, int y, int z, int side) {
+	public static int[] getAdjacentCoordinatesForSide(int x, int y, int z, int side)
+	{
 
-		return new int[] { x + SIDE_COORD_MOD[side][0], y + SIDE_COORD_MOD[side][1], z + SIDE_COORD_MOD[side][2] };
+		return new int[] {x + SIDE_COORD_MOD[side][0], y + SIDE_COORD_MOD[side][1], z + SIDE_COORD_MOD[side][2]};
 	}
 
-	public static AxisAlignedBB getAdjacentAABBForSide(MovingObjectPosition pos) {
+	public static AxisAlignedBB getAdjacentAABBForSide(MovingObjectPosition pos)
+	{
 
 		return getAdjacentAABBForSide(pos.blockX, pos.blockY, pos.blockZ, pos.sideHit);
 	}
 
-	public static AxisAlignedBB getAdjacentAABBForSide(int x, int y, int z, int side) {
+	public static AxisAlignedBB getAdjacentAABBForSide(int x, int y, int z, int side)
+	{
 
-		return AxisAlignedBB.getBoundingBox(x + SIDE_COORD_MOD[side][0], y + SIDE_COORD_MOD[side][1], z + SIDE_COORD_MOD[side][2],
-				x + SIDE_COORD_AABB[side][0], y + SIDE_COORD_AABB[side][1], z + SIDE_COORD_AABB[side][2]);
+		return AxisAlignedBB.getBoundingBox(x + SIDE_COORD_MOD[side][0], y + SIDE_COORD_MOD[side][1], z + SIDE_COORD_MOD[side][2], x + SIDE_COORD_AABB[side][0], y + SIDE_COORD_AABB[side][1], z + SIDE_COORD_AABB[side][2]);
 	}
 
-	public static int getLeftSide(int side) {
+	public static int getLeftSide(int side)
+	{
 
 		return SIDE_LEFT[side];
 	}
 
-	public static int getRightSide(int side) {
+	public static int getRightSide(int side)
+	{
 
 		return SIDE_RIGHT[side];
 	}
 
-	public static int getOppositeSide(int side) {
+	public static int getOppositeSide(int side)
+	{
 
 		return SIDE_OPPOSITE[side];
 	}
 
-	public static int getAboveSide(int side) {
+	public static int getAboveSide(int side)
+	{
 
 		return SIDE_ABOVE[side];
 	}
 
-	public static int getBelowSide(int side) {
+	public static int getBelowSide(int side)
+	{
 
 		return SIDE_BELOW[side];
 	}
 
 	/* BLOCK ROTATION */
-	public static boolean canRotate(Block block) {
+	public static boolean canRotate(Block block)
+	{
 
-		int bId = Block.getIdFromBlock(block);
+		final int bId = Block.getIdFromBlock(block);
 		return bId < MAX_ID ? rotateType[Block.getIdFromBlock(block)] != 0 : false;
 	}
 
-	public static int rotateVanillaBlock(World world, Block block, int x, int y, int z) {
+	public static int rotateVanillaBlock(World world, Block block, int x, int y, int z)
+	{
 
-		int bId = Block.getIdFromBlock(block), bMeta = world.getBlockMetadata(x, y, z);
-		switch (rotateType[bId]) {
-		case RotationType.FOUR_WAY:
-			return SIDE_LEFT[bMeta];
-		case RotationType.SIX_WAY:
-			if (bMeta < 6) {
-				return ++bMeta % 6;
-			}
-			return bMeta;
-		case RotationType.RAIL:
-			if (bMeta < 2) {
-				return ++bMeta % 2;
-			}
-			return bMeta;
-		case RotationType.PUMPKIN:
-			return ++bMeta % 4;
-		case RotationType.STAIRS:
-			return ++bMeta % 8;
-		case RotationType.REDSTONE:
-			int upper = bMeta & 0xC;
-			int lower = bMeta & 0x3;
-			return upper + ++lower % 4;
-		case RotationType.LOG:
-			return (bMeta + 4) % 12;
-		case RotationType.SLAB:
-			return (bMeta + 8) % 16;
-		case RotationType.CHEST:
-			int coords[] = new int[3];
-			for (int i = 2; i < 6; i++) {
-				coords = getAdjacentCoordinatesForSide(x, y, z, i);
-				if (isEqual(world.getBlock(coords[0], coords[1], coords[2]), block)) {
-					world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[bMeta], 1);
-					return SIDE_OPPOSITE[bMeta];
+		final int bId = Block.getIdFromBlock(block);
+		int bMeta = world.getBlockMetadata(x, y, z);
+		switch(rotateType[bId])
+		{
+			case RotationType.FOUR_WAY:
+				return SIDE_LEFT[bMeta];
+			case RotationType.SIX_WAY:
+				if(bMeta < 6)
+				{
+					return ++bMeta % 6;
 				}
-			}
-			return SIDE_LEFT[bMeta];
-		case RotationType.LEVER:
-			int shift = 0;
-			if (bMeta > 7) {
-				bMeta -= 8;
-				shift = 8;
-			}
-			if (bMeta == 5) {
-				return 6 + shift;
-			} else if (bMeta == 6) {
-				return 5 + shift;
-			} else if (bMeta == 7) {
-				return 0 + shift;
-			} else if (bMeta == 0) {
-				return 7 + shift;
-			}
-			return bMeta + shift;
-		case RotationType.SIGN:
-			return ++bMeta % 16;
-		case RotationType.PREVENT:
-		default:
-			return bMeta;
+				return bMeta;
+			case RotationType.RAIL:
+				if(bMeta < 2)
+				{
+					return ++bMeta % 2;
+				}
+				return bMeta;
+			case RotationType.PUMPKIN:
+				return ++bMeta % 4;
+			case RotationType.STAIRS:
+				return ++bMeta % 8;
+			case RotationType.REDSTONE:
+				final int upper = bMeta & 0xC;
+				int lower = bMeta & 0x3;
+				return upper + ++lower % 4;
+			case RotationType.LOG:
+				return (bMeta + 4) % 12;
+			case RotationType.SLAB:
+				return (bMeta + 8) % 16;
+			case RotationType.CHEST:
+				int coords[] = new int[3];
+				for(int i = 2; i < 6; i++)
+				{
+					coords = getAdjacentCoordinatesForSide(x, y, z, i);
+					if(isEqual(world.getBlock(coords[0], coords[1], coords[2]), block))
+					{
+						world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[bMeta], 1);
+						return SIDE_OPPOSITE[bMeta];
+					}
+				}
+				return SIDE_LEFT[bMeta];
+			case RotationType.LEVER:
+				int shift = 0;
+				if(bMeta > 7)
+				{
+					bMeta -= 8;
+					shift = 8;
+				}
+				if(bMeta == 5)
+				{
+					return 6 + shift;
+				}
+				else if(bMeta == 6)
+				{
+					return 5 + shift;
+				}
+				else if(bMeta == 7)
+				{
+					return 0 + shift;
+				}
+				else if(bMeta == 0)
+				{
+					return 7 + shift;
+				}
+				return bMeta + shift;
+			case RotationType.SIGN:
+				return ++bMeta % 16;
+			case RotationType.PREVENT:
+			default:
+				return bMeta;
 		}
 	}
 
-	public static int rotateVanillaBlockAlt(World world, Block block, int x, int y, int z) {
+	public static int rotateVanillaBlockAlt(World world, Block block, int x, int y, int z)
+	{
 
-		int bId = Block.getIdFromBlock(block), bMeta = world.getBlockMetadata(x, y, z);
-		switch (rotateType[bId]) {
-		case RotationType.FOUR_WAY:
-			return SIDE_RIGHT[bMeta];
-		case RotationType.SIX_WAY:
-			if (bMeta < 6) {
-				return (bMeta + 5) % 6;
-			}
-			return bMeta;
-		case RotationType.RAIL:
-			if (bMeta < 2) {
-				return ++bMeta % 2;
-			}
-			return bMeta;
-		case RotationType.PUMPKIN:
-			return (bMeta + 3) % 4;
-		case RotationType.STAIRS:
-			return (bMeta + 7) % 8;
-		case RotationType.REDSTONE:
-			int upper = bMeta & 0xC;
-			int lower = bMeta & 0x3;
-			return upper + (lower + 3) % 4;
-		case RotationType.LOG:
-			return (bMeta + 8) % 12;
-		case RotationType.SLAB:
-			return (bMeta + 8) % 16;
-		case RotationType.CHEST:
-			int coords[] = new int[3];
-			for (int i = 2; i < 6; i++) {
-				coords = getAdjacentCoordinatesForSide(x, y, z, i);
-				if (isEqual(world.getBlock(coords[0], coords[1], coords[2]), block)) {
-					world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[bMeta], 1);
-					return SIDE_OPPOSITE[bMeta];
+		final int bId = Block.getIdFromBlock(block);
+		int bMeta = world.getBlockMetadata(x, y, z);
+		switch(rotateType[bId])
+		{
+			case RotationType.FOUR_WAY:
+				return SIDE_RIGHT[bMeta];
+			case RotationType.SIX_WAY:
+				if(bMeta < 6)
+				{
+					return (bMeta + 5) % 6;
 				}
-			}
-			return SIDE_RIGHT[bMeta];
-		case RotationType.LEVER:
-			int shift = 0;
-			if (bMeta > 7) {
-				bMeta -= 8;
-				shift = 8;
-			}
-			if (bMeta == 5) {
-				return 6 + shift;
-			} else if (bMeta == 6) {
-				return 5 + shift;
-			} else if (bMeta == 7) {
-				return 0 + shift;
-			} else if (bMeta == 0) {
-				return 7 + shift;
-			}
-		case RotationType.SIGN:
-			return ++bMeta % 16;
-		case RotationType.PREVENT:
-		default:
-			return bMeta;
+				return bMeta;
+			case RotationType.RAIL:
+				if(bMeta < 2)
+				{
+					return ++bMeta % 2;
+				}
+				return bMeta;
+			case RotationType.PUMPKIN:
+				return (bMeta + 3) % 4;
+			case RotationType.STAIRS:
+				return (bMeta + 7) % 8;
+			case RotationType.REDSTONE:
+				final int upper = bMeta & 0xC;
+				final int lower = bMeta & 0x3;
+				return upper + (lower + 3) % 4;
+			case RotationType.LOG:
+				return (bMeta + 8) % 12;
+			case RotationType.SLAB:
+				return (bMeta + 8) % 16;
+			case RotationType.CHEST:
+				int coords[] = new int[3];
+				for(int i = 2; i < 6; i++)
+				{
+					coords = getAdjacentCoordinatesForSide(x, y, z, i);
+					if(isEqual(world.getBlock(coords[0], coords[1], coords[2]), block))
+					{
+						world.setBlockMetadataWithNotify(coords[0], coords[1], coords[2], SIDE_OPPOSITE[bMeta], 1);
+						return SIDE_OPPOSITE[bMeta];
+					}
+				}
+				return SIDE_RIGHT[bMeta];
+			case RotationType.LEVER:
+				int shift = 0;
+				if(bMeta > 7)
+				{
+					bMeta -= 8;
+					shift = 8;
+				}
+				if(bMeta == 5)
+				{
+					return 6 + shift;
+				}
+				else if(bMeta == 6)
+				{
+					return 5 + shift;
+				}
+				else if(bMeta == 7)
+				{
+					return 0 + shift;
+				}
+				else if(bMeta == 0)
+				{
+					return 7 + shift;
+				}
+			case RotationType.SIGN:
+				return ++bMeta % 16;
+			case RotationType.PREVENT:
+			default:
+				return bMeta;
 		}
 	}
 
-	public static List<ItemStack> breakBlock(World worldObj, int x, int y, int z, Block block, int fortune, boolean doBreak, boolean silkTouch) {
+	public static List<ItemStack> breakBlock(World worldObj, int x, int y, int z, Block block, int fortune, boolean doBreak, boolean silkTouch)
+	{
 
 		return breakBlock(worldObj, null, x, y, z, block, fortune, doBreak, silkTouch);
 	}
 
-	public static List<ItemStack> breakBlock(World worldObj, EntityPlayer player, int x, int y, int z, Block block, int fortune, boolean doBreak,
-			boolean silkTouch) {
+	public static List<ItemStack> breakBlock(World worldObj, EntityPlayer player, int x, int y, int z, Block block, int fortune, boolean doBreak, boolean silkTouch)
+	{
 
-		if (block.getBlockHardness(worldObj, x, y, z) == -1) {
+		if(block.getBlockHardness(worldObj, x, y, z) == -1)
+		{
 			return new LinkedList<ItemStack>();
 		}
-		int meta = worldObj.getBlockMetadata(x, y, z);
+		final int meta = worldObj.getBlockMetadata(x, y, z);
 		List<ItemStack> stacks = null;
-		if (silkTouch && block.canSilkHarvest(worldObj, player, x, y, z, meta)) {
+		if(silkTouch && block.canSilkHarvest(worldObj, player, x, y, z, meta))
+		{
 			stacks = new LinkedList<ItemStack>();
 			stacks.add(createStackedBlock(block, meta));
-		} else {
+		}
+		else
+		{
 			stacks = block.getDrops(worldObj, x, y, z, meta, fortune);
 		}
-		if (!doBreak) {
+		if(!doBreak)
+		{
 			return stacks;
 		}
 		worldObj.playAuxSFXAtEntity(player, 2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
 		worldObj.setBlockToAir(x, y, z);
 
-		List<EntityItem> result = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - 2, y - 2, z - 2, x + 3, y + 3, z + 3));
-		for (int i = 0; i < result.size(); i++) {
-			EntityItem entity = result.get(i);
-			if (entity.isDead || entity.getEntityItem().stackSize <= 0) {
+		final List<EntityItem> result = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - 2, y - 2, z - 2, x + 3, y + 3, z + 3));
+		for(int i = 0; i < result.size(); i++)
+		{
+			final EntityItem entity = result.get(i);
+			if(entity.isDead || entity.getEntityItem().stackSize <= 0)
+			{
 				continue;
 			}
 			stacks.add(entity.getEntityItem());
@@ -555,10 +636,12 @@ public final class BlockHelper {
 		return stacks;
 	}
 
-	public static ItemStack createStackedBlock(Block block, int bMeta) {
+	public static ItemStack createStackedBlock(Block block, int bMeta)
+	{
 
-		Item item = Item.getItemFromBlock(block);
-		if (item.getHasSubtypes()) {
+		final Item item = Item.getItemFromBlock(block);
+		if(item.getHasSubtypes())
+		{
 			return new ItemStack(item, 1, bMeta);
 		}
 		return new ItemStack(item, 1, 0);
diff --git a/src/api/java/dynamicswordskills/api/ISword.java b/src/api/java/dynamicswordskills/api/ISword.java
index d8f309b..9d81357 100644
--- a/src/api/java/dynamicswordskills/api/ISword.java
+++ b/src/api/java/dynamicswordskills/api/ISword.java
@@ -22,6 +22,7 @@ package dynamicswordskills.api;
  * {@link LeapingBlow}, {@link MortalDraw}, and {@link RisingCut}
  *
  */
-public interface ISword {
+public interface ISword
+{
 
-}
\ No newline at end of file
+}
diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java
index 13279ef..b917269 100644
--- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java
+++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java
@@ -4,8 +4,9 @@ package exterminatorJeff.undergroundBiomes.api;
  * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API
  * @author Zeno410
  */
-public class UBAPIHook {
-    public static final UBAPIHook ubAPIHook = new UBAPIHook();
-    //public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes
-    public UBOreTexturizer ubOreTexturizer;
+public class UBAPIHook
+{
+	public static final UBAPIHook	ubAPIHook	= new UBAPIHook();
+	//public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes
+	public UBOreTexturizer			ubOreTexturizer;
 }
diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java
index 947b156..2b9b6de 100644
--- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java
+++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java
@@ -5,9 +5,9 @@
 
 package exterminatorJeff.undergroundBiomes.api;
 
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 /**
  * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API
@@ -15,56 +15,70 @@ import net.minecraft.world.World;
  * It creates three new blocks for each texturized ore.
  * @author Zeno410
  */
-public interface UBOreTexturizer {
-    // usage: Block is the ore block.
-    // Overlay name is the fully qualified name, e.g. modname:overlayName
-    // that static vars are fully qualified names for all the textures in the UB pack, just pass as is
-    // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick"
-    public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event);
-    public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event);
-    public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event);
+public interface UBOreTexturizer
+{
+	// usage: Block is the ore block.
+	// Overlay name is the fully qualified name, e.g. modname:overlayName
+	// that static vars are fully qualified names for all the textures in the UB pack, just pass as is
+	// the event isn't needed per se, but if this is called anytime else, the blocks will not "stick"
+	public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event);
+
+	public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event);
+
+	public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event);
+
+	public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet;
+
+	public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet;
+
+	public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet;
+
+	public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld);
 
-    public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet;
-    public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet;
-    public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet;
-    public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld) ;
+	public static String	amber_overlay			= "undergroundbiomes:amber_overlay";
+	public static String	cinnabar_overlay		= "undergroundbiomes:cinnabar_overlay";
+	public static String	coal_overlay			= "undergroundbiomes:coal_overlay";
+	public static String	copper_overlay			= "undergroundbiomes:copper_overlay";
+	public static String	diamond_overlay			= "undergroundbiomes:diamond_overlay";
+	public static String	emerald_overlay			= "undergroundbiomes:emerald_overlay";
+	public static String	gold_overlay			= "undergroundbiomes:gold_overlay";
+	public static String	iron_overlay			= "undergroundbiomes:iron_overlay";
+	public static String	lapis_overlay			= "undergroundbiomes:lapis_overlay";
+	public static String	lead_overlay			= "undergroundbiomes:lead_overlay";
+	public static String	olivine_peridot_overlay	= "undergroundbiomes:olivine-peridot_overlay";
+	public static String	redstone_overlay		= "undergroundbiomes:redstone_overlay";
+	public static String	ruby_overlay			= "undergroundbiomes:ruby_overlay";
+	public static String	sapphire_overlay		= "undergroundbiomes:sapphire_overlay";
+	public static String	tin_overlay				= "undergroundbiomes:tin_overlay";
+	public static String	uranium_overlay			= "undergroundbiomes:uranium_overlay";
 
-    public static String amber_overlay = "undergroundbiomes:amber_overlay";
-    public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay";
-    public static String coal_overlay = "undergroundbiomes:coal_overlay";
-    public static String copper_overlay = "undergroundbiomes:copper_overlay";
-    public static String diamond_overlay = "undergroundbiomes:diamond_overlay";
-    public static String emerald_overlay = "undergroundbiomes:emerald_overlay";
-    public static String gold_overlay = "undergroundbiomes:gold_overlay";
-    public static String iron_overlay = "undergroundbiomes:iron_overlay";
-    public static String lapis_overlay = "undergroundbiomes:lapis_overlay";
-    public static String lead_overlay = "undergroundbiomes:lead_overlay";
-    public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay";
-    public static String redstone_overlay = "undergroundbiomes:redstone_overlay";
-    public static String ruby_overlay = "undergroundbiomes:ruby_overlay";
-    public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay";
-    public static String tin_overlay = "undergroundbiomes:tin_overlay";
-    public static String uranium_overlay = "undergroundbiomes:uranium_overlay";
+	public class BlocksAreAlreadySet extends RuntimeException
+	{
+		// this is thrown if UB has already run its pre-initialization step and can no longer register blocks
+		public final Block	oreBlock;
+		public final String	overlayName;
 
-    public class BlocksAreAlreadySet extends RuntimeException {
-        // this is thrown if UB has already run its pre-initialization step and can no longer register blocks
-        public final Block oreBlock;
-        public final String overlayName;
-        
-        public BlocksAreAlreadySet(Block oreBlock, String overlayName) {
-            this.oreBlock = oreBlock;
-            this.overlayName = overlayName;
-        }
+		public BlocksAreAlreadySet(Block oreBlock, String overlayName)
+		{
+			this.oreBlock = oreBlock;
+			this.overlayName = overlayName;
+		}
 
-        @Override
-        public String toString() {
-            String blockDescription = "undefined block";
-            String overlayDescription = "undefined overlay";
-            if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName();
-            if (overlayName != null) overlayDescription = overlayName;
-            return "Attempt to create Underground Biomes ore for "+blockDescription+" with "+overlayDescription +
-                    " after blocks have already been defined";
-        }
+		@Override
+		public String toString()
+		{
+			String blockDescription = "undefined block";
+			String overlayDescription = "undefined overlay";
+			if(oreBlock != null)
+			{
+				blockDescription = oreBlock.getUnlocalizedName();
+			}
+			if(overlayName != null)
+			{
+				overlayDescription = overlayName;
+			}
+			return "Attempt to create Underground Biomes ore for " + blockDescription + " with " + overlayDescription + " after blocks have already been defined";
+		}
 
-    }
+	}
 }
diff --git a/src/api/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java
index b550ca3..ce0f077 100644
--- a/src/api/java/ic2/api/Direction.java
+++ b/src/api/java/ic2/api/Direction.java
@@ -5,13 +5,13 @@ import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
  * Represents the 6 possible directions along the axis of a block.
  */
-public enum Direction {
+public enum Direction
+{
 	/**
 	 * -X
 	 */
@@ -39,21 +39,27 @@ public enum Direction {
 	 */
 	ZP;
 
-	private Direction() {
-		int side = ordinal() / 2;
-		int sign = getSign();
+	private Direction()
+	{
+		final int side = ordinal() / 2;
+		final int sign = getSign();
 
 		xOffset = side == 0 ? sign : 0;
 		yOffset = side == 1 ? sign : 0;
 		zOffset = side == 2 ? sign : 0;
 	}
 
-	public static Direction fromSideValue(int side) {
+	public static Direction fromSideValue(int side)
+	{
 		return directions[(side + 2) % 6];
 	}
 
-	public static Direction fromForgeDirection(ForgeDirection dir) {
-		if (dir == ForgeDirection.UNKNOWN) return null;
+	public static Direction fromForgeDirection(ForgeDirection dir)
+	{
+		if(dir == ForgeDirection.UNKNOWN)
+		{
+			return null;
+		}
 
 		return fromSideValue(dir.ordinal());
 	}
@@ -64,7 +70,8 @@ public enum Direction {
 	 * @param tileEntity tile entity to check
 	 * @return Adjacent tile entity or null if none exists
 	 */
-	public TileEntity applyToTileEntity(TileEntity te) {
+	public TileEntity applyToTileEntity(TileEntity te)
+	{
 		return applyTo(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord);
 	}
 
@@ -77,16 +84,22 @@ public enum Direction {
 	 * @param z Z coordinate to check from
 	 * @return Adjacent tile entity or null if none exists
 	 */
-	public TileEntity applyTo(World world, int x, int y, int z) {
-		int coords[] = { x, y, z };
+	public TileEntity applyTo(World world, int x, int y, int z)
+	{
+		final int coords[] = {x, y, z};
 
 		coords[ordinal() / 2] += getSign();
 
-		if (world != null && world.blockExists(coords[0], coords[1], coords[2])) {
-			try {
+		if(world != null && world.blockExists(coords[0], coords[1], coords[2]))
+		{
+			try
+			{
 				return world.getTileEntity(coords[0], coords[1], coords[2]);
-			} catch (Exception e) {
-				throw new RuntimeException("error getting TileEntity at dim "+world.provider.dimensionId+" "+coords[0]+"/"+coords[1]+"/"+coords[2]);
+			}
+			catch(final Exception e)
+			{
+				throw new RuntimeException(
+						"error getting TileEntity at dim " + world.provider.dimensionId + " " + coords[0] + "/" + coords[1] + "/" + coords[2]);
 			}
 		}
 
@@ -98,7 +111,8 @@ public enum Direction {
 	 *
 	 * @return Inverse direction
 	 */
-	public Direction getInverse() {
+	public Direction getInverse()
+	{
 		return directions[ordinal() ^ 1];
 	}
 
@@ -107,7 +121,8 @@ public enum Direction {
 	 *
 	 * @return Minecraft side value
 	 */
-	public int toSideValue() {
+	public int toSideValue()
+	{
 		return (ordinal() + 4) % 6;
 	}
 
@@ -116,20 +131,21 @@ public enum Direction {
 	 *
 	 * @return -1 if the direction is negative, +1 if the direction is positive
 	 */
-	private int getSign() {
+	private int getSign()
+	{
 		return (ordinal() % 2) * 2 - 1;
 	}
 
-	public ForgeDirection toForgeDirection() {
+	public ForgeDirection toForgeDirection()
+	{
 		return ForgeDirection.getOrientation(toSideValue());
 	}
 
-	public final int xOffset;
-	public final int yOffset;
-	public final int zOffset;
+	public final int					xOffset;
+	public final int					yOffset;
+	public final int					zOffset;
 
-	public static final Direction[] directions = Direction.values();
-	public static final Set<Direction> noDirections = EnumSet.noneOf(Direction.class);
-	public static final Set<Direction> allDirections = EnumSet.allOf(Direction.class);
+	public static final Direction[]		directions		= Direction.values();
+	public static final Set<Direction>	noDirections	= EnumSet.noneOf(Direction.class);
+	public static final Set<Direction>	allDirections	= EnumSet.allOf(Direction.class);
 }
-
diff --git a/src/api/java/ic2/api/crops/BaseSeed.java b/src/api/java/ic2/api/crops/BaseSeed.java
index 89e7865..a7b55f6 100644
--- a/src/api/java/ic2/api/crops/BaseSeed.java
+++ b/src/api/java/ic2/api/crops/BaseSeed.java
@@ -3,7 +3,8 @@ package ic2.api.crops;
 /**
  * Base agriculture seed. Used to determine the state of a plant once it is planted from an item.
  */
-public class BaseSeed {
+public class BaseSeed
+{
 	/**
 	 * Create a BaseSeed object.
 	 *
@@ -15,10 +16,11 @@ public class BaseSeed {
 	 * @param stackSize1 for internal usage only
 	 */
 	@SuppressWarnings("deprecation")
-	public BaseSeed(CropCard crop, int size, int statGrowth, int statGain, int statResistance, int stackSize) {
+	public BaseSeed(CropCard crop, int size, int statGrowth, int statGain, int statResistance, int stackSize)
+	{
 		super();
 		this.crop = crop;
-		this.id = Crops.instance.getIdFor(crop);
+		id = Crops.instance.getIdFor(crop);
 		this.size = size;
 		this.statGrowth = statGrowth;
 		this.statGain = statGain;
@@ -30,53 +32,57 @@ public class BaseSeed {
 	 * @deprecated Use the CropCard version.
 	 */
 	@Deprecated
-	public BaseSeed(int id, int size, int statGrowth, int statGain, int statResistance, int stackSize) {
+	public BaseSeed(int id, int size, int statGrowth, int statGain, int statResistance, int stackSize)
+	{
 		this(getCropFromId(id), size, statGrowth, statGain, statResistance, stackSize);
 	}
 
 	@SuppressWarnings("deprecation")
-	private static CropCard getCropFromId(int id) {
-		CropCard[] crops = Crops.instance.getCropList();
+	private static CropCard getCropFromId(int id)
+	{
+		final CropCard[] crops = Crops.instance.getCropList();
 
-		if (id < 0 || id >= crops.length) return null;
+		if(id < 0 || id >= crops.length)
+		{
+			return null;
+		}
 
 		return crops[id];
 	}
 
-
 	/**
 	 * Plant.
 	 */
-	public final CropCard crop;
+	public final CropCard	crop;
 
 	/**
 	 * @deprecated IDs aren't used anymore.
 	 */
 	@Deprecated
-	public int id;
+	public int				id;
 
 	/**
 	 * Plant size.
 	 */
-	public int size;
+	public int				size;
 
 	/**
 	 * Plant growth stat.
 	 */
-	public int statGrowth;
+	public int				statGrowth;
 
 	/**
 	 * Plant gain stat.
 	 */
-	public int statGain;
+	public int				statGain;
 
 	/**
 	 * Plant resistance stat.
 	 */
-	public int statResistance;
+	public int				statResistance;
 
 	/**
 	 * For internal usage only.
 	 */
-	public int stackSize;
+	public int				stackSize;
 }
diff --git a/src/api/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java
index 1d2b640..e2a16d8 100644
--- a/src/api/java/ic2/api/crops/CropCard.java
+++ b/src/api/java/ic2/api/crops/CropCard.java
@@ -6,7 +6,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.relauncher.Side;
@@ -17,8 +16,10 @@ import cpw.mods.fml.relauncher.SideOnly;
  *
  * Any crop extending this can be registered using registerCrop to be added into the game.
  */
-public abstract class CropCard {
-	public CropCard() {
+public abstract class CropCard
+{
+	public CropCard()
+	{
 		modId = getModId(); // initialize mod id while we should be in the real owner's init event
 	}
 
@@ -46,7 +47,8 @@ public abstract class CropCard {
 	 *
 	 * @return Mod id.
 	 */
-	public String owner() { // TODO: make abstract
+	public String owner()
+	{ // TODO: make abstract
 		return modId;
 	}
 
@@ -59,7 +61,8 @@ public abstract class CropCard {
 	 *
 	 * @return Unlocalized name.
 	 */
-	public String displayName() {
+	public String displayName()
+	{
 		return name(); // return the raw name for backwards compatibility
 	}
 
@@ -68,7 +71,8 @@ public abstract class CropCard {
 	 *
 	 * @return Your name
 	 */
-	public String discoveredBy() {
+	public String discoveredBy()
+	{
 		return "unknown";
 	}
 
@@ -79,22 +83,37 @@ public abstract class CropCard {
 	 * @param i line to get, starting from 0
 	 * @return The line
 	 */
-	public String desc(int i) {
-		String[] att = attributes();
+	public String desc(int i)
+	{
+		final String[] att = attributes();
 
-		if (att == null || att.length == 0) return "";
+		if(att == null || att.length == 0)
+		{
+			return "";
+		}
 
-		if (i == 0) {
+		if(i == 0)
+		{
 			String s = att[0];
-			if (att.length >= 2) {
-				s+=", "+att[1];
-				if (att.length >= 3) s+=",";
+			if(att.length >= 2)
+			{
+				s += ", " + att[1];
+				if(att.length >= 3)
+				{
+					s += ",";
+				}
 			}
 			return s;
 		}
-		if (att.length < 3) return "";
+		if(att.length < 3)
+		{
+			return "";
+		}
 		String s = att[2];
-		if (att.length >= 4) s+=", "+att[3];
+		if(att.length >= 4)
+		{
+			s += ", " + att[3];
+		}
 		return s;
 	}
 
@@ -103,7 +122,8 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return roots lengt use in isBlockBelow
 	 */
-	public int getrootslength(ICropTile crop) { // TODO: camel case
+	public int getrootslength(ICropTile crop)
+	{ // TODO: camel case
 		return 1;
 	}
 
@@ -155,12 +175,14 @@ public abstract class CropCard {
 	 * ic2:crop/*, which will then read assets/yourmod/textures/blocks/crop/*.png.
 	 */
 	@SideOnly(Side.CLIENT)
-	public void registerSprites(IIconRegister iconRegister) {
+	public void registerSprites(IIconRegister iconRegister)
+	{
 		textures = new IIcon[maxSize()];
 
-		for (int i = 1; i <= textures.length; i++) {
+		for(int i = 1; i <= textures.length; i++)
+		{
 			// ic2:crop/blockCrop.NAME.n is the legacy name for backwards compatiblity
-			textures[i - 1] = iconRegister.registerIcon("ic2:crop/blockCrop."+name()+"."+i);
+			textures[i - 1] = iconRegister.registerIcon("ic2:crop/blockCrop." + name() + "." + i);
 		}
 	}
 
@@ -171,8 +193,12 @@ public abstract class CropCard {
 	 * @return 0-255, representing the sprite index on the crop's spritesheet.
 	 */
 	@SideOnly(Side.CLIENT)
-	public IIcon getSprite(ICropTile crop) {
-		if (crop.getSize() <= 0 || crop.getSize() > textures.length) return null;
+	public IIcon getSprite(ICropTile crop)
+	{
+		if(crop.getSize() <= 0 || crop.getSize() > textures.length)
+		{
+			return null;
+		}
 
 		return textures[crop.getSize() - 1];
 	}
@@ -181,7 +207,8 @@ public abstract class CropCard {
 	 * Amount of growth points needed to increase the plant's size.
 	 * Default is 200 * tier.
 	 */
-	public int growthDuration(ICropTile crop) {
+	public int growthDuration(ICropTile crop)
+	{
 		return tier() * 200;
 	}
 
@@ -214,7 +241,8 @@ public abstract class CropCard {
 	 * @param air air quality, influences by open gardens and less crops surrounding this one
 	 * @return 0-30
 	 */
-	public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) {
+	public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air)
+	{
 		return (int) (humidity + nutrients + air);
 	}
 
@@ -224,11 +252,11 @@ public abstract class CropCard {
 	 *
 	 * @param crop crop to crossbreed with
 	 */
-	public boolean canCross(ICropTile crop) {
+	public boolean canCross(ICropTile crop)
+	{
 		return crop.getSize() >= 3;
 	}
 
-
 	/**
 	 * Called when the plant is rightclicked by a player.
 	 * Default action is harvesting.
@@ -239,7 +267,8 @@ public abstract class CropCard {
 	 * @param player player rightclicking the crop
 	 * @return Whether the plant has changed
 	 */
-	public boolean rightclick(ICropTile crop, EntityPlayer player) {
+	public boolean rightclick(ICropTile crop, EntityPlayer player)
+	{
 		return crop.harvest(true);
 	}
 
@@ -266,7 +295,8 @@ public abstract class CropCard {
 	 *
 	 * @return Chance to drop the gains
 	 */
-	public float dropGainChance() { // TODO: change to double
+	public float dropGainChance()
+	{ // TODO: change to double
 		return (float) Math.pow(0.95, tier());
 	}
 
@@ -285,8 +315,10 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return Plant size after harvesting
 	 */
-	public byte getSizeAfterHarvest(ICropTile crop) {return 1;} // TODO: change to int
-
+	public byte getSizeAfterHarvest(ICropTile crop)
+	{
+		return 1;
+	} // TODO: change to int
 
 	/**
 	 * Called when the plant is left clicked by a player.
@@ -298,7 +330,8 @@ public abstract class CropCard {
 	 * @param player player left clicked the crop
 	 * @return Whether the plant has changed
 	 */
-	public boolean leftclick(ICropTile crop, EntityPlayer player) { // TODO: camel case
+	public boolean leftclick(ICropTile crop, EntityPlayer player)
+	{ // TODO: camel case
 		return crop.pick(true);
 	}
 
@@ -309,11 +342,21 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return Chance to drop the seeds
 	 */
-	public float dropSeedChance(ICropTile crop) {
-		if (crop.getSize() == 1) return 0;
+	public float dropSeedChance(ICropTile crop)
+	{
+		if(crop.getSize() == 1)
+		{
+			return 0;
+		}
 		float base = 0.5F;
-		if (crop.getSize() == 2) base/=2F;
-		for (int i = 0; i < tier(); i++) {base*=0.8;}
+		if(crop.getSize() == 2)
+		{
+			base /= 2F;
+		}
+		for(int i = 0; i < tier(); i++)
+		{
+			base *= 0.8;
+		}
 		return base;
 	}
 
@@ -325,7 +368,8 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return Seeds
 	 */
-	public ItemStack getSeeds(ICropTile crop) {
+	public ItemStack getSeeds(ICropTile crop)
+	{
 		return crop.generateSeeds(crop.getCrop(), crop.getGrowth(), crop.getGain(), crop.getResistance(), crop.getScanLevel());
 	}
 
@@ -334,7 +378,8 @@ public abstract class CropCard {
 	 *
 	 * @param crop reference to ICropTile
 	 */
-	public void onNeighbourChange(ICropTile crop) {
+	public void onNeighbourChange(ICropTile crop)
+	{
 		//
 	}
 
@@ -343,14 +388,18 @@ public abstract class CropCard {
 	 *
 	 * @return Whether the crop should emit redstone
 	 */
-	public int emitRedstone(ICropTile crop) {return 0;}
+	public int emitRedstone(ICropTile crop)
+	{
+		return 0;
+	}
 
 	/**
 	 * Called when the crop is destroyed.
 	 *
 	 * @param crop reference to ICropTile
 	 */
-	public void onBlockDestroyed(ICropTile crop) {
+	public void onBlockDestroyed(ICropTile crop)
+	{
 		//
 	}
 
@@ -360,7 +409,8 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return Light value emitted
 	 */
-	public int getEmittedLight(ICropTile crop) {
+	public int getEmittedLight(ICropTile crop)
+	{
 		return 0;
 	}
 
@@ -371,22 +421,24 @@ public abstract class CropCard {
 	 * @param entity entity colliding
 	 * @return Whether trampling calculation should happen, return false if the plant is no longer valid.
 	 */
-	public boolean onEntityCollision(ICropTile crop, Entity entity) {
-		if (entity instanceof EntityLivingBase) {
+	public boolean onEntityCollision(ICropTile crop, Entity entity)
+	{
+		if(entity instanceof EntityLivingBase)
+		{
 			return ((EntityLivingBase) entity).isSprinting();
 		}
 
 		return false;
 	}
 
-
 	/**
 	 * Called every time the crop ticks.
 	 * Should be called every 256 ticks or around 13 seconds.
 	 *
 	 * @param crop reference to ICropTile
 	 */
-	public void tick(ICropTile crop) {
+	public void tick(ICropTile crop)
+	{
 		// nothing by default
 	}
 
@@ -397,12 +449,11 @@ public abstract class CropCard {
 	 * @param crop reference to ICropTile
 	 * @return Whether the plant spreads weed
 	 */
-	public boolean isWeed(ICropTile crop) {
-		return crop.getSize() >= 2 &&
-				(crop.getCrop() == Crops.weed || crop.getGrowth() >= 24);
+	public boolean isWeed(ICropTile crop)
+	{
+		return crop.getSize() >= 2 && (crop.getCrop() == Crops.weed || crop.getGrowth() >= 24);
 	}
 
-
 	/**
 	 * Get this plant's ID.
 	 *
@@ -410,16 +461,21 @@ public abstract class CropCard {
 	 * @deprecated IDs aren't used anymore.
 	 */
 	@Deprecated
-	public final int getId() {
+	public final int getId()
+	{
 		return Crops.instance.getIdFor(this);
 	}
 
-	private static String getModId() {
-		ModContainer modContainer = Loader.instance().activeModContainer();
+	private static String getModId()
+	{
+		final ModContainer modContainer = Loader.instance().activeModContainer();
 
-		if (modContainer != null) {
+		if(modContainer != null)
+		{
 			return modContainer.getModId();
-		} else {
+		}
+		else
+		{
 			// this is bad if you are not actually IC2
 			assert false;
 
@@ -428,8 +484,8 @@ public abstract class CropCard {
 	}
 
 	@SideOnly(Side.CLIENT)
-	protected IIcon textures[];
+	protected IIcon			textures[];
 
-	private final String modId; // TODO: make owner abstract, remove modId auto detection
+	private final String	modId;		// TODO: make owner abstract, remove modId auto detection
 	// TODO: add a clean way to obtain world reference and position
 }
diff --git a/src/api/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java
index a11059a..c6f0745 100644
--- a/src/api/java/ic2/api/crops/Crops.java
+++ b/src/api/java/ic2/api/crops/Crops.java
@@ -5,19 +5,18 @@ import java.util.Collection;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
-
+import net.minecraftforge.common.BiomeDictionary.Type;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import net.minecraftforge.common.BiomeDictionary.Type;
-
 /**
  * General management of the crop system.
  */
-public abstract class Crops {
-	public static Crops instance;
+public abstract class Crops
+{
+	public static Crops		instance;
 
-	public static CropCard weed; // weed has special properties, thus it's exposed here
+	public static CropCard	weed;		// weed has special properties, thus it's exposed here
 
 	/**
 	 * Adds a crop nutrient biome bonus.
@@ -39,7 +38,6 @@ public abstract class Crops {
 	 */
 	public abstract void addBiomehumidityBonus(Type type, int humidityBonus);
 
-
 	/**
 	 * Gets the humidity bonus for a biome.
 	 *
diff --git a/src/api/java/ic2/api/crops/ICropTile.java b/src/api/java/ic2/api/crops/ICropTile.java
index dadf691..5ad2f6f 100644
--- a/src/api/java/ic2/api/crops/ICropTile.java
+++ b/src/api/java/ic2/api/crops/ICropTile.java
@@ -9,7 +9,8 @@ import net.minecraft.world.World;
 /**
  * Interface implemented by the crop tile entity.
  */
-public interface ICropTile {
+public interface ICropTile
+{
 	/**
 	 * Get the crop.
 	 *
diff --git a/src/api/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java
index 04b8253..018003a 100644
--- a/src/api/java/ic2/api/crops/package-info.java
+++ b/src/api/java/ic2/api/crops/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.crops;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/energy/EnergyNet.java b/src/api/java/ic2/api/energy/EnergyNet.java
index 822bfc2..05a2b59 100644
--- a/src/api/java/ic2/api/energy/EnergyNet.java
+++ b/src/api/java/ic2/api/energy/EnergyNet.java
@@ -1,6 +1,5 @@
 package ic2.api.energy;
 
-
 /**
  * Provides access to the energy network.
  * 
@@ -9,10 +8,10 @@ package ic2.api.energy;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public final class EnergyNet {
+public final class EnergyNet
+{
 	/**
 	 * Instance of the global EnergyNet class.
 	 */
-	public static IEnergyNet instance;
+	public static IEnergyNet	instance;
 }
-
diff --git a/src/api/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java
index 8f656e5..e3058ea 100644
--- a/src/api/java/ic2/api/energy/IEnergyNet.java
+++ b/src/api/java/ic2/api/energy/IEnergyNet.java
@@ -2,7 +2,6 @@ package ic2.api.energy;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
@@ -10,7 +9,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergyNet {
+public interface IEnergyNet
+{
 	/**
 	 * Get the EnergyNet-registered tile entity at the specified position.
 	 * 
diff --git a/src/api/java/ic2/api/energy/NodeStats.java b/src/api/java/ic2/api/energy/NodeStats.java
index db33da7..e38b5e2 100644
--- a/src/api/java/ic2/api/energy/NodeStats.java
+++ b/src/api/java/ic2/api/energy/NodeStats.java
@@ -1,25 +1,30 @@
 package ic2.api.energy;
 
-public class NodeStats {
-	public NodeStats(double energyIn, double energyOut, double voltage) {
+public class NodeStats
+{
+	public NodeStats(double energyIn, double energyOut, double voltage)
+	{
 		this.energyIn = energyIn;
 		this.energyOut = energyOut;
 		this.voltage = voltage;
 	}
 
-	public double getEnergyIn() {
+	public double getEnergyIn()
+	{
 		return energyIn;
 	}
 
-	public double getEnergyOut() {
+	public double getEnergyOut()
+	{
 		return energyOut;
 	}
 
-	public double getVoltage() {
+	public double getVoltage()
+	{
 		return voltage;
 	}
 
-	protected double energyIn;
-	protected double energyOut;
-	protected double voltage;
+	protected double	energyIn;
+	protected double	energyOut;
+	protected double	voltage;
 }
diff --git a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java
index 86b8dc2..1fc04d3 100644
--- a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java
+++ b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java
@@ -1,25 +1,27 @@
 package ic2.api.energy.event;
 
+import ic2.api.energy.tile.IEnergyTile;
 import net.minecraft.tileentity.TileEntity;
-
 import net.minecraftforge.event.world.WorldEvent;
 
-import ic2.api.energy.tile.IEnergyTile;
-
 /**
  * Base class for energy net events, don't use it directly.
  *
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public class EnergyTileEvent extends WorldEvent {
-	public final IEnergyTile energyTile;
+public class EnergyTileEvent extends WorldEvent
+{
+	public final IEnergyTile	energyTile;
 
-	public EnergyTileEvent(IEnergyTile energyTile1) {
+	public EnergyTileEvent(IEnergyTile energyTile1)
+	{
 		super(((TileEntity) energyTile1).getWorldObj());
 
-		if (world == null) throw new NullPointerException("world is null");
+		if(world == null)
+		{
+			throw new NullPointerException("world is null");
+		}
 
-		this.energyTile = energyTile1;
+		energyTile = energyTile1;
 	}
 }
-
diff --git a/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java
index bf019ae..62192f7 100644
--- a/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java
+++ b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java
@@ -18,9 +18,10 @@ import ic2.api.energy.tile.IEnergyTile;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public class EnergyTileLoadEvent extends EnergyTileEvent {
-	public EnergyTileLoadEvent(IEnergyTile energyTile1) {
+public class EnergyTileLoadEvent extends EnergyTileEvent
+{
+	public EnergyTileLoadEvent(IEnergyTile energyTile1)
+	{
 		super(energyTile1);
 	}
 }
-
diff --git a/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
index 2b22ae3..cf44877 100644
--- a/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
+++ b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
@@ -19,9 +19,10 @@ import ic2.api.energy.tile.IEnergyTile;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public class EnergyTileUnloadEvent extends EnergyTileEvent {
-	public EnergyTileUnloadEvent(IEnergyTile energyTile1) {
+public class EnergyTileUnloadEvent extends EnergyTileEvent
+{
+	public EnergyTileUnloadEvent(IEnergyTile energyTile1)
+	{
 		super(energyTile1);
 	}
 }
-
diff --git a/src/api/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java
index 40db6f8..de3bb9e 100644
--- a/src/api/java/ic2/api/energy/event/package-info.java
+++ b/src/api/java/ic2/api/energy/event/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.energy.event;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java
index 81d0bfe..0efa97f 100644
--- a/src/api/java/ic2/api/energy/package-info.java
+++ b/src/api/java/ic2/api/energy/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.energy;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java
index 48de061..4b93858 100644
--- a/src/api/java/ic2/api/energy/prefab/BasicSink.java
+++ b/src/api/java/ic2/api/energy/prefab/BasicSink.java
@@ -1,19 +1,16 @@
 package ic2.api.energy.prefab;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergySink;
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.common.FMLCommonHandler;
 
 /**
  * BasicSink is a simple adapter to provide an ic2 energy sink.
@@ -88,7 +85,8 @@ import ic2.api.item.ElectricItem;
  * }
  * @endcode
  */
-public class BasicSink extends TileEntity implements IEnergySink {
+public class BasicSink extends TileEntity implements IEnergySink
+{
 	// **********************************
 	// *** Methods for use by the mod ***
 	// **********************************
@@ -100,10 +98,11 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param capacity1 Maximum amount of eu to store.
 	 * @param tier1 IC2 tier, 1 = LV, 2 = MV, ...
 	 */
-	public BasicSink(TileEntity parent1, int capacity1, int tier1) {
-		this.parent = parent1;
-		this.capacity = capacity1;
-		this.tier = tier1;
+	public BasicSink(TileEntity parent1, int capacity1, int tier1)
+	{
+		parent = parent1;
+		capacity = capacity1;
+		tier = tier1;
 	}
 
 	// in-world te forwards	>>
@@ -113,18 +112,22 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * Either updateEntity or onLoaded have to be used.
 	 */
 	@Override
-	public void updateEntity() {
-		if (!addedToEnet) onLoaded();
+	public void updateEntity()
+	{
+		if(!addedToEnet)
+		{
+			onLoaded();
+		}
 	}
 
 	/**
 	 * Notification that the base TileEntity finished loaded, for advanced uses.
 	 * Either updateEntity or onLoaded have to be used.
 	 */
-	public void onLoaded() {
-		if (!addedToEnet &&
-				!FMLCommonHandler.instance().getEffectiveSide().isClient() &&
-				Info.isIc2Available()) {
+	public void onLoaded()
+	{
+		if(!addedToEnet && !FMLCommonHandler.instance().getEffectiveSide().isClient() && Info.isIc2Available())
+		{
 			worldObj = parent.getWorldObj();
 			xCoord = parent.xCoord;
 			yCoord = parent.yCoord;
@@ -141,7 +144,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * Both invalidate and onChunkUnload have to be used.
 	 */
 	@Override
-	public void invalidate() {
+	public void invalidate()
+	{
 		super.invalidate();
 
 		onChunkUnload();
@@ -152,9 +156,10 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * Both invalidate and onChunkUnload have to be used.
 	 */
 	@Override
-	public void onChunkUnload() {
-		if (addedToEnet &&
-				Info.isIc2Available()) {
+	public void onChunkUnload()
+	{
+		if(addedToEnet && Info.isIc2Available())
+		{
 			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
 
 			addedToEnet = false;
@@ -167,10 +172,11 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param tag Compound tag as supplied by TileEntity.readFromNBT()
 	 */
 	@Override
-	public void readFromNBT(NBTTagCompound tag) {
+	public void readFromNBT(NBTTagCompound tag)
+	{
 		super.readFromNBT(tag);
 
-		NBTTagCompound data = tag.getCompoundTag("IC2BasicSink");
+		final NBTTagCompound data = tag.getCompoundTag("IC2BasicSink");
 
 		energyStored = data.getDouble("energy");
 	}
@@ -181,14 +187,18 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param tag Compound tag as supplied by TileEntity.writeToNBT()
 	 */
 	@Override
-	public void writeToNBT(NBTTagCompound tag) {
-		try {
+	public void writeToNBT(NBTTagCompound tag)
+	{
+		try
+		{
 			super.writeToNBT(tag);
-		} catch (RuntimeException e) {
+		}
+		catch(final RuntimeException e)
+		{
 			// happens if this is a delegate, ignore
 		}
 
-		NBTTagCompound data = new NBTTagCompound();
+		final NBTTagCompound data = new NBTTagCompound();
 
 		data.setDouble("energy", energyStored);
 
@@ -203,7 +213,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @return Capacity in EU.
 	 */
-	public int getCapacity() {
+	public int getCapacity()
+	{
 		return capacity;
 	}
 
@@ -212,8 +223,9 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @param capacity1 Capacity in EU.
 	 */
-	public void setCapacity(int capacity1) {
-		this.capacity = capacity1;
+	public void setCapacity(int capacity1)
+	{
+		capacity = capacity1;
 	}
 
 	/**
@@ -221,7 +233,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @return IC2 Tier.
 	 */
-	public int getTier() {
+	public int getTier()
+	{
 		return tier;
 	}
 
@@ -230,8 +243,9 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @param tier1 IC2 Tier.
 	 */
-	public void setTier(int tier1) {
-		this.tier = tier1;
+	public void setTier(int tier1)
+	{
+		tier = tier1;
 	}
 
 	/**
@@ -239,7 +253,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @return amount in EU, may be above capacity
 	 */
-	public double getEnergyStored() {
+	public double getEnergyStored()
+	{
 		return energyStored;
 	}
 
@@ -251,7 +266,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * 
 	 * @param amount
 	 */
-	public void setEnergyStored(double amount) {
+	public void setEnergyStored(double amount)
+	{
 		energyStored = amount;
 	}
 
@@ -261,7 +277,8 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param amount in EU
 	 * @return true if the amount is available
 	 */
-	public boolean canUseEnergy(double amount) {
+	public boolean canUseEnergy(double amount)
+	{
 		return energyStored >= amount;
 	}
 
@@ -271,8 +288,10 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param amount amount to use
 	 * @return true if the amount was available
 	 */
-	public boolean useEnergy(double amount) {
-		if (canUseEnergy(amount) && !FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+	public boolean useEnergy(double amount)
+	{
+		if(canUseEnergy(amount) && !FMLCommonHandler.instance().getEffectiveSide().isClient())
+		{
 			energyStored -= amount;
 
 			return true;
@@ -287,13 +306,23 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	 * @param limit Transfer limit, values <= 0 will use the battery's limit
 	 * @return true if energy was transferred
 	 */
-	public boolean discharge(ItemStack stack, int limit) {
-		if (stack == null || !Info.isIc2Available()) return false;
+	public boolean discharge(ItemStack stack, int limit)
+	{
+		if(stack == null || !Info.isIc2Available())
+		{
+			return false;
+		}
 
 		double amount = capacity - energyStored;
-		if (amount <= 0) return false;
+		if(amount <= 0)
+		{
+			return false;
+		}
 
-		if (limit > 0 && limit < amount) amount = limit;
+		if(limit > 0 && limit < amount)
+		{
+			amount = limit;
+		}
 
 		amount = ElectricItem.manager.discharge(stack, amount, tier, limit > 0, true, false);
 
@@ -307,27 +336,32 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	// backwards compatibility (ignore these) >>
 
 	@Deprecated
-	public void onUpdateEntity() {
+	public void onUpdateEntity()
+	{
 		updateEntity();
 	}
 
 	@Deprecated
-	public void onInvalidate() {
+	public void onInvalidate()
+	{
 		invalidate();
 	}
 
 	@Deprecated
-	public void onOnChunkUnload() {
+	public void onOnChunkUnload()
+	{
 		onChunkUnload();
 	}
 
 	@Deprecated
-	public void onReadFromNbt(NBTTagCompound tag) {
+	public void onReadFromNbt(NBTTagCompound tag)
+	{
 		readFromNBT(tag);
 	}
 
 	@Deprecated
-	public void onWriteToNbt(NBTTagCompound tag) {
+	public void onWriteToNbt(NBTTagCompound tag)
+	{
 		writeToNBT(tag);
 	}
 
@@ -340,34 +374,37 @@ public class BasicSink extends TileEntity implements IEnergySink {
 	// energy net interface >>
 
 	@Override
-	public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {
+	public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
+	{
 		return true;
 	}
 
 	@Override
-	public double getDemandedEnergy() {
+	public double getDemandedEnergy()
+	{
 		return Math.max(0, capacity - energyStored);
 	}
 
 	@Override
-	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {
+	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
+	{
 		energyStored += amount;
 
 		return 0;
 	}
 
 	@Override
-	public int getSinkTier() {
+	public int getSinkTier()
+	{
 		return tier;
 	}
 
 	// << energy net interface
 
+	public final TileEntity	parent;
 
-	public final TileEntity parent;
-
-	protected int capacity;
-	protected int tier;
-	protected double energyStored;
-	protected boolean addedToEnet;
+	protected int			capacity;
+	protected int			tier;
+	protected double		energyStored;
+	protected boolean		addedToEnet;
 }
diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java
index 011e8cd..5be7e1c 100644
--- a/src/api/java/ic2/api/energy/prefab/BasicSource.java
+++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java
@@ -1,20 +1,17 @@
 package ic2.api.energy.prefab;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import ic2.api.energy.EnergyNet;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergySource;
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.common.FMLCommonHandler;
 
 /**
  * BasicSource is a simple adapter to provide an ic2 energy source.
@@ -87,7 +84,8 @@ import ic2.api.item.ElectricItem;
  * }
  * @endcode
  */
-public class BasicSource extends TileEntity implements IEnergySource {
+public class BasicSource extends TileEntity implements IEnergySource
+{
 	// **********************************
 	// *** Methods for use by the mod ***
 	// **********************************
@@ -99,12 +97,13 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * @param capacity1 Maximum amount of eu to store.
 	 * @param tier1 IC2 tier, 1 = LV, 2 = MV, ...
 	 */
-	public BasicSource(TileEntity parent1, double capacity1, int tier1) {
-		double power = EnergyNet.instance.getPowerFromTier(tier1);
+	public BasicSource(TileEntity parent1, double capacity1, int tier1)
+	{
+		final double power = EnergyNet.instance.getPowerFromTier(tier1);
 
-		this.parent = parent1;
-		this.capacity = capacity1 < power ? power : capacity1;
-		this.tier = tier1;
+		parent = parent1;
+		capacity = capacity1 < power ? power : capacity1;
+		tier = tier1;
 		this.power = power;
 	}
 
@@ -115,18 +114,22 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * Either updateEntity or onLoaded have to be used.
 	 */
 	@Override
-	public void updateEntity() {
-		if (!addedToEnet) onLoaded();
+	public void updateEntity()
+	{
+		if(!addedToEnet)
+		{
+			onLoaded();
+		}
 	}
 
 	/**
 	 * Notification that the base TileEntity finished loading, for advanced uses.
 	 * Either updateEntity or onLoaded have to be used.
 	 */
-	public void onLoaded() {
-		if (!addedToEnet &&
-				!FMLCommonHandler.instance().getEffectiveSide().isClient() &&
-				Info.isIc2Available()) {
+	public void onLoaded()
+	{
+		if(!addedToEnet && !FMLCommonHandler.instance().getEffectiveSide().isClient() && Info.isIc2Available())
+		{
 			worldObj = parent.getWorldObj();
 			xCoord = parent.xCoord;
 			yCoord = parent.yCoord;
@@ -143,7 +146,8 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * Both invalidate and onChunkUnload have to be used.
 	 */
 	@Override
-	public void invalidate() {
+	public void invalidate()
+	{
 		super.invalidate();
 
 		onChunkUnload();
@@ -154,9 +158,10 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * Both invalidate and onChunkUnload have to be used.
 	 */
 	@Override
-	public void onChunkUnload() {
-		if (addedToEnet &&
-				Info.isIc2Available()) {
+	public void onChunkUnload()
+	{
+		if(addedToEnet && Info.isIc2Available())
+		{
 			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
 
 			addedToEnet = false;
@@ -169,10 +174,11 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * @param tag Compound tag as supplied by TileEntity.readFromNBT()
 	 */
 	@Override
-	public void readFromNBT(NBTTagCompound tag) {
+	public void readFromNBT(NBTTagCompound tag)
+	{
 		super.readFromNBT(tag);
 
-		NBTTagCompound data = tag.getCompoundTag("IC2BasicSource");
+		final NBTTagCompound data = tag.getCompoundTag("IC2BasicSource");
 
 		energyStored = data.getDouble("energy");
 	}
@@ -183,14 +189,18 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * @param tag Compound tag as supplied by TileEntity.writeToNBT()
 	 */
 	@Override
-	public void writeToNBT(NBTTagCompound tag) {
-		try {
+	public void writeToNBT(NBTTagCompound tag)
+	{
+		try
+		{
 			super.writeToNBT(tag);
-		} catch (RuntimeException e) {
+		}
+		catch(final RuntimeException e)
+		{
 			// happens if this is a delegate, ignore
 		}
 
-		NBTTagCompound data = new NBTTagCompound();
+		final NBTTagCompound data = new NBTTagCompound();
 
 		data.setDouble("energy", energyStored);
 
@@ -205,7 +215,8 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @return Capacity in EU.
 	 */
-	public double getCapacity() {
+	public double getCapacity()
+	{
 		return capacity;
 	}
 
@@ -214,10 +225,14 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @param capacity1 Capacity in EU.
 	 */
-	public void setCapacity(double capacity1) {
-		if (capacity1 < power) capacity1 = power;
+	public void setCapacity(double capacity1)
+	{
+		if(capacity1 < power)
+		{
+			capacity1 = power;
+		}
 
-		this.capacity = capacity1;
+		capacity = capacity1;
 	}
 
 	/**
@@ -225,7 +240,8 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @return IC2 Tier.
 	 */
-	public int getTier() {
+	public int getTier()
+	{
 		return tier;
 	}
 
@@ -234,22 +250,26 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @param tier1 IC2 Tier.
 	 */
-	public void setTier(int tier1) {
-		double power = EnergyNet.instance.getPowerFromTier(tier1);
+	public void setTier(int tier1)
+	{
+		final double power = EnergyNet.instance.getPowerFromTier(tier1);
 
-		if (capacity < power) capacity = power;
+		if(capacity < power)
+		{
+			capacity = power;
+		}
 
-		this.tier = tier1;
+		tier = tier1;
 		this.power = power;
 	}
 
-
 	/**
 	 * Determine the energy stored in the source's output buffer.
 	 * 
 	 * @return amount in EU
 	 */
-	public double getEnergyStored() {
+	public double getEnergyStored()
+	{
 		return energyStored;
 	}
 
@@ -261,7 +281,8 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @param amount
 	 */
-	public void setEnergyStored(double amount) {
+	public void setEnergyStored(double amount)
+	{
 		energyStored = amount;
 	}
 
@@ -270,7 +291,8 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * 
 	 * @return amount in EU
 	 */
-	public double getFreeCapacity() {
+	public double getFreeCapacity()
+	{
 		return capacity - energyStored;
 	}
 
@@ -280,9 +302,16 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * @param amount maximum amount of energy to add
 	 * @return amount added/used, NOT remaining
 	 */
-	public double addEnergy(double amount) {
-		if (FMLCommonHandler.instance().getEffectiveSide().isClient()) return 0;
-		if (amount > capacity - energyStored) amount = capacity - energyStored;
+	public double addEnergy(double amount)
+	{
+		if(FMLCommonHandler.instance().getEffectiveSide().isClient())
+		{
+			return 0;
+		}
+		if(amount > capacity - energyStored)
+		{
+			amount = capacity - energyStored;
+		}
 
 		energyStored += amount;
 
@@ -295,10 +324,14 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	 * @param stack ItemStack to charge (null is ignored)
 	 * @return true if energy was transferred
 	 */
-	public boolean charge(ItemStack stack) {
-		if (stack == null || !Info.isIc2Available()) return false;
+	public boolean charge(ItemStack stack)
+	{
+		if(stack == null || !Info.isIc2Available())
+		{
+			return false;
+		}
 
-		double amount = ElectricItem.manager.charge(stack, energyStored, tier, false, false);
+		final double amount = ElectricItem.manager.charge(stack, energyStored, tier, false, false);
 
 		energyStored -= amount;
 
@@ -310,27 +343,32 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	// backwards compatibility (ignore these) >>
 
 	@Deprecated
-	public void onUpdateEntity() {
+	public void onUpdateEntity()
+	{
 		updateEntity();
 	}
 
 	@Deprecated
-	public void onInvalidate() {
+	public void onInvalidate()
+	{
 		invalidate();
 	}
 
 	@Deprecated
-	public void onOnChunkUnload() {
+	public void onOnChunkUnload()
+	{
 		onChunkUnload();
 	}
 
 	@Deprecated
-	public void onReadFromNbt(NBTTagCompound tag) {
+	public void onReadFromNbt(NBTTagCompound tag)
+	{
 		readFromNBT(tag);
 	}
 
 	@Deprecated
-	public void onWriteToNbt(NBTTagCompound tag) {
+	public void onWriteToNbt(NBTTagCompound tag)
+	{
 		writeToNBT(tag);
 	}
 
@@ -343,33 +381,36 @@ public class BasicSource extends TileEntity implements IEnergySource {
 	// energy net interface >>
 
 	@Override
-	public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) {
+	public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction)
+	{
 		return true;
 	}
 
 	@Override
-	public double getOfferedEnergy() {
+	public double getOfferedEnergy()
+	{
 		return Math.min(energyStored, power);
 	}
 
 	@Override
-	public void drawEnergy(double amount) {
+	public void drawEnergy(double amount)
+	{
 		energyStored -= amount;
 	}
 
 	@Override
-	public int getSourceTier() {
+	public int getSourceTier()
+	{
 		return tier;
 	}
 
 	// << energy net interface
 
+	public final TileEntity	parent;
 
-	public final TileEntity parent;
-
-	protected double capacity;
-	protected int tier;
-	protected double power;
-	protected double energyStored;
-	protected boolean addedToEnet;
+	protected double		capacity;
+	protected int			tier;
+	protected double		power;
+	protected double		energyStored;
+	protected boolean		addedToEnet;
 }
diff --git a/src/api/java/ic2/api/energy/prefab/package-info.java b/src/api/java/ic2/api/energy/prefab/package-info.java
index c38f7e0..a1ba4ee 100644
--- a/src/api/java/ic2/api/energy/prefab/package-info.java
+++ b/src/api/java/ic2/api/energy/prefab/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.energy.prefab;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java
index 1735ff5..55f3e97 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java
@@ -1,7 +1,6 @@
 package ic2.api.energy.tile;
 
 import net.minecraft.tileentity.TileEntity;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
@@ -12,7 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergyAcceptor extends IEnergyTile {
+public interface IEnergyAcceptor extends IEnergyTile
+{
 	/**
 	 * Determine if this acceptor can accept current from an adjacent emitter in a direction.
 	 * 
@@ -24,4 +24,3 @@ public interface IEnergyAcceptor extends IEnergyTile {
 	 */
 	boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction);
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IEnergyConductor.java b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java
index 08dab88..e10430d 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergyConductor.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java
@@ -6,7 +6,8 @@ package ic2.api.energy.tile;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergyConductor extends IEnergyAcceptor, IEnergyEmitter {
+public interface IEnergyConductor extends IEnergyAcceptor, IEnergyEmitter
+{
 	/**
 	 * Energy loss for the conductor in EU per block.
 	 * 
@@ -50,4 +51,3 @@ public interface IEnergyConductor extends IEnergyAcceptor, IEnergyEmitter {
 	 */
 	void removeConductor();
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java
index 013865e..d09e849 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java
@@ -1,7 +1,6 @@
 package ic2.api.energy.tile;
 
 import net.minecraft.tileentity.TileEntity;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
@@ -12,7 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergyEmitter extends IEnergyTile {
+public interface IEnergyEmitter extends IEnergyTile
+{
 	/**
 	 * Determine if this emitter can emit energy to an adjacent receiver.
 	 * 
@@ -25,4 +25,3 @@ public interface IEnergyEmitter extends IEnergyTile {
 	 */
 	boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction);
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IEnergySink.java b/src/api/java/ic2/api/energy/tile/IEnergySink.java
index 4ae8e79..1c834b7 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergySink.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergySink.java
@@ -7,7 +7,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergySink extends IEnergyAcceptor {
+public interface IEnergySink extends IEnergyAcceptor
+{
 	/**
 	 * Determine how much energy the sink accepts.
 	 *
@@ -42,4 +43,3 @@ public interface IEnergySink extends IEnergyAcceptor {
 	 */
 	double injectEnergy(ForgeDirection directionFrom, double amount, double voltage);
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IEnergySource.java b/src/api/java/ic2/api/energy/tile/IEnergySource.java
index 44b952a..1d70eaa 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergySource.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergySource.java
@@ -5,7 +5,8 @@ package ic2.api.energy.tile;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergySource extends IEnergyEmitter {
+public interface IEnergySource extends IEnergyEmitter
+{
 	/**
 	 * Energy output provided by the source this tick.
 	 * This is typically Math.min(stored energy, max output/tick).
@@ -35,4 +36,3 @@ public interface IEnergySource extends IEnergyEmitter {
 	 */
 	int getSourceTier();
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IEnergyTile.java b/src/api/java/ic2/api/energy/tile/IEnergyTile.java
index 3938190..e619e29 100644
--- a/src/api/java/ic2/api/energy/tile/IEnergyTile.java
+++ b/src/api/java/ic2/api/energy/tile/IEnergyTile.java
@@ -9,7 +9,7 @@ package ic2.api.energy.tile;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IEnergyTile {
+public interface IEnergyTile
+{
 	//
 }
-
diff --git a/src/api/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java
index 2e5db41..ceebc41 100644
--- a/src/api/java/ic2/api/energy/tile/IHeatSource.java
+++ b/src/api/java/ic2/api/energy/tile/IHeatSource.java
@@ -2,13 +2,14 @@ package ic2.api.energy.tile;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-public interface IHeatSource {
-	
+public interface IHeatSource
+{
+
 	/*
 	 *  Return max heat transmission peer Tick (only theoretical bandwidth not available amount)
 	 */
-	int  maxrequestHeatTick(ForgeDirection directionFrom);
-	
+	int maxrequestHeatTick(ForgeDirection directionFrom);
+
 	/*
 	 * @param requested amount of heat to transfer
 	 * 
@@ -18,6 +19,6 @@ public interface IHeatSource {
 	 * 
 	 * requestHeat(100) : return 50 : so 50 units of heat remove from HeatSource
 	 */
-	
+
 	int requestHeat(ForgeDirection directionFrom, int requestheat);
 }
diff --git a/src/api/java/ic2/api/energy/tile/IKineticSource.java b/src/api/java/ic2/api/energy/tile/IKineticSource.java
index a651408..4271a67 100644
--- a/src/api/java/ic2/api/energy/tile/IKineticSource.java
+++ b/src/api/java/ic2/api/energy/tile/IKineticSource.java
@@ -2,11 +2,12 @@ package ic2.api.energy.tile;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-public interface IKineticSource {
+public interface IKineticSource
+{
 	/*
 	 *  Return max kinetic energy transmission peer Tick (only theoretical bandwidth not available amount)
 	 */
-	int  maxrequestkineticenergyTick(ForgeDirection directionFrom);
+	int maxrequestkineticenergyTick(ForgeDirection directionFrom);
 
 	/*
 	 * @param requested amount of kinetic energy to transfer
diff --git a/src/api/java/ic2/api/energy/tile/IMetaDelegate.java b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java
index f7319d0..c8ecc4c 100644
--- a/src/api/java/ic2/api/energy/tile/IMetaDelegate.java
+++ b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java
@@ -22,7 +22,8 @@ import net.minecraft.tileentity.TileEntity;
  * 
  * See ic2/api/energy/usage.txt for an overall description of the energy net api.
  */
-public interface IMetaDelegate extends IEnergyTile {
+public interface IMetaDelegate extends IEnergyTile
+{
 	/**
 	 * Get the sub-TileEntities belonging to this Meta TileEntity.
 	 * 
diff --git a/src/api/java/ic2/api/energy/tile/package-info.java b/src/api/java/ic2/api/energy/tile/package-info.java
index 3c60323..944249a 100644
--- a/src/api/java/ic2/api/energy/tile/package-info.java
+++ b/src/api/java/ic2/api/energy/tile/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.energy.tile;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java
index c2df419..f46cb71 100644
--- a/src/api/java/ic2/api/event/ExplosionEvent.java
+++ b/src/api/java/ic2/api/event/ExplosionEvent.java
@@ -3,18 +3,14 @@ package ic2.api.event;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
 import net.minecraftforge.event.world.WorldEvent;
+import cpw.mods.fml.common.eventhandler.Cancelable;
 
 @Cancelable
-public class ExplosionEvent extends WorldEvent {
-	public ExplosionEvent(World world, Entity entity,
-			double x, double y, double z,
-			double power,
-			EntityLivingBase igniter,
-			int radiationRange, double rangeLimit) {
+public class ExplosionEvent extends WorldEvent
+{
+	public ExplosionEvent(World world, Entity entity, double x, double y, double z, double power, EntityLivingBase igniter, int radiationRange, double rangeLimit)
+	{
 		super(world);
 
 		this.entity = entity;
@@ -30,15 +26,15 @@ public class ExplosionEvent extends WorldEvent {
 	/**
 	 * Entity representing the explosive, may be null.
 	 */
-	public final Entity entity;
-	public double x;
-	public double y;
-	public double z;
-	public double power;
+	public final Entity				entity;
+	public double					x;
+	public double					y;
+	public double					z;
+	public double					power;
 	/**
 	 * Entity causing the explosion, may be null.
 	 */
-	public final EntityLivingBase igniter;
-	public final int radiationRange;
-	public final double rangeLimit;
+	public final EntityLivingBase	igniter;
+	public final int				radiationRange;
+	public final double				rangeLimit;
 }
diff --git a/src/api/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java
index 6d5ea28..226a818 100644
--- a/src/api/java/ic2/api/event/LaserEvent.java
+++ b/src/api/java/ic2/api/event/LaserEvent.java
@@ -4,38 +4,38 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
 import net.minecraftforge.event.world.WorldEvent;
+import cpw.mods.fml.common.eventhandler.Cancelable;
 
 /**
  * A bunch of Events to handle the power of the Mining Laser.
  */
 @Cancelable
-public class LaserEvent extends WorldEvent {
+public class LaserEvent extends WorldEvent
+{
 	// the Laser Entity
-	public final Entity lasershot;
+	public final Entity		lasershot;
 
 	// the following variables can be changed and the Laser will adjust to them
 
 	// the Player firing the Laser. If the Laser gets "reflected" the Player could change.
-	public EntityLivingBase owner;
+	public EntityLivingBase	owner;
 	// Range of the Laser Shot. Determine the amount of broken blocks, as well, as each broken block will subtract ~1F from range.
-	public float range, power;
-	public int blockBreaks;
+	public float			range, power;
+	public int				blockBreaks;
 	// Determines whether the laser will explode upon hitting something
-	public boolean explosive, smelt;
+	public boolean			explosive, smelt;
 
-	public LaserEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1) {
+	public LaserEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1)
+	{
 		super(world1);
-		this.lasershot = lasershot1;
-		this.owner = owner1;
-		this.range = range1;
-		this.power = power1;
-		this.blockBreaks = blockBreaks1;
-		this.explosive = explosive1;
-		this.smelt = smelt1;
+		lasershot = lasershot1;
+		owner = owner1;
+		range = range1;
+		power = power1;
+		blockBreaks = blockBreaks1;
+		explosive = explosive1;
+		smelt = smelt1;
 	}
 
 	/**
@@ -43,12 +43,14 @@ public class LaserEvent extends WorldEvent {
 	 * 
 	 * The Item is the Laser Gun which the "Player" has shot
 	 */
-	public static class LaserShootEvent extends LaserEvent {
-		ItemStack laseritem;
+	public static class LaserShootEvent extends LaserEvent
+	{
+		ItemStack	laseritem;
 
-		public LaserShootEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, ItemStack laseritem1) {
+		public LaserShootEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, ItemStack laseritem1)
+		{
 			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.laseritem = laseritem1;
+			laseritem = laseritem1;
 		}
 	}
 
@@ -57,15 +59,18 @@ public class LaserEvent extends WorldEvent {
 	 * 
 	 * The Laser will no longer exist after this Event is posted as it either Explodes or despawns after the Event is fired.
 	 */
-	public static class LaserExplodesEvent extends LaserEvent {
+	public static class LaserExplodesEvent extends LaserEvent
+	{
 		// explosion strength, even that can be changed!
-		public float explosionpower, explosiondroprate, explosionentitydamage;
+		public float	explosionpower, explosiondroprate,
+		explosionentitydamage;
 
-		public LaserExplodesEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, float explosionpower1, float explosiondroprate1, float explosionentitydamage1) {
+		public LaserExplodesEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, float explosionpower1, float explosiondroprate1, float explosionentitydamage1)
+		{
 			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.explosionpower = explosionpower1;
-			this.explosiondroprate = explosiondroprate1;
-			this.explosionentitydamage = explosionentitydamage1;
+			explosionpower = explosionpower1;
+			explosiondroprate = explosiondroprate1;
+			explosionentitydamage = explosionentitydamage1;
 		}
 	}
 
@@ -76,23 +81,25 @@ public class LaserEvent extends WorldEvent {
 	 * Canceling this Event stops the Laser from attempting to break the Block, what is very useful for Glass.
 	 * Use lasershot.setDead() to remove the Shot entirely.
 	 */
-	public static class LaserHitsBlockEvent extends LaserEvent {
+	public static class LaserHitsBlockEvent extends LaserEvent
+	{
 		// targeted block, even that can be changed!
-		public int x, y, z;
-		public int side;
+		public int	x, y, z;
+		public int	side;
 		// removeBlock determines if the Block will be removed. dropBlock determines if the Block should drop something.
-		public boolean removeBlock, dropBlock;
-		public float dropChance;
+		public boolean	removeBlock, dropBlock;
+		public float	dropChance;
 
-		public LaserHitsBlockEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, int x1, int y1, int z1, int side1, float dropChance1, boolean removeBlock1, boolean dropBlock1) {
+		public LaserHitsBlockEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, int x1, int y1, int z1, int side1, float dropChance1, boolean removeBlock1, boolean dropBlock1)
+		{
 			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.x = x1;
-			this.y = y1;
-			this.z = z1;
-			this.side = side1;
-			this.removeBlock = removeBlock1;
-			this.dropBlock = dropBlock1;
-			this.dropChance = dropChance1;
+			x = x1;
+			y = y1;
+			z = z1;
+			side = side1;
+			removeBlock = removeBlock1;
+			dropBlock = dropBlock1;
+			dropChance = dropChance1;
 		}
 	}
 
@@ -102,13 +109,15 @@ public class LaserEvent extends WorldEvent {
 	 * Canceling this Event ignores the Entity
 	 * Use lasershot.setDead() to remove the Shot entirely.
 	 */
-	public static class LaserHitsEntityEvent extends LaserEvent {
+	public static class LaserHitsEntityEvent extends LaserEvent
+	{
 		// the Entity which the Laser has shot at, even the target can be changed!
-		public Entity hitentity;
+		public Entity	hitentity;
 
-		public LaserHitsEntityEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, Entity hitentity1) {
+		public LaserHitsEntityEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, Entity hitentity1)
+		{
 			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.hitentity = hitentity1;
+			hitentity = hitentity1;
 		}
 	}
 }
diff --git a/src/api/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java
index c6565c2..4f7e743 100644
--- a/src/api/java/ic2/api/event/PaintEvent.java
+++ b/src/api/java/ic2/api/event/PaintEvent.java
@@ -1,32 +1,32 @@
 package ic2.api.event;
 
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
 import net.minecraftforge.event.world.WorldEvent;
+import cpw.mods.fml.common.eventhandler.Cancelable;
 
 @Cancelable
-public class PaintEvent extends WorldEvent {
+public class PaintEvent extends WorldEvent
+{
 	// target block
-	public final int x;
-	public final int y;
-	public final int z;
-	public final int side;
+	public final int	x;
+	public final int	y;
+	public final int	z;
+	public final int	side;
 
 	// color to paint the block
-	public final int color;
+	public final int	color;
 
 	// set to true to confirm the operation
-	public boolean painted = false;
+	public boolean		painted	= false;
 
-	public PaintEvent(World world1, int x1, int y1, int z1, int side1, int color1) {
+	public PaintEvent(World world1, int x1, int y1, int z1, int side1, int color1)
+	{
 		super(world1);
 
-		this.x = x1;
-		this.y = y1;
-		this.z = z1;
-		this.side = side1;
-		this.color = color1;
+		x = x1;
+		y = y1;
+		z = z1;
+		side = side1;
+		color = color1;
 	}
 }
diff --git a/src/api/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java
index d530578..0dda540 100644
--- a/src/api/java/ic2/api/event/RetextureEvent.java
+++ b/src/api/java/ic2/api/event/RetextureEvent.java
@@ -2,36 +2,36 @@ package ic2.api.event;
 
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
 import net.minecraftforge.event.world.WorldEvent;
+import cpw.mods.fml.common.eventhandler.Cancelable;
 
 @Cancelable
-public class RetextureEvent extends WorldEvent {
+public class RetextureEvent extends WorldEvent
+{
 	// target block
-	public final int x;
-	public final int y;
-	public final int z;
-	public final int side;
+	public final int	x;
+	public final int	y;
+	public final int	z;
+	public final int	side;
 
 	// referenced block (to grab the texture from)
-	public final Block referencedBlock;
-	public final int referencedMeta;
-	public final int referencedSide;
+	public final Block	referencedBlock;
+	public final int	referencedMeta;
+	public final int	referencedSide;
 
 	// set to true to confirm the operation
-	public boolean applied = false;
+	public boolean		applied	= false;
 
-	public RetextureEvent(World world1, int x1, int y1, int z1, int side1, Block referencedBlock, int referencedMeta1, int referencedSide1) {
+	public RetextureEvent(World world1, int x1, int y1, int z1, int side1, Block referencedBlock, int referencedMeta1, int referencedSide1)
+	{
 		super(world1);
 
-		this.x = x1;
-		this.y = y1;
-		this.z = z1;
-		this.side = side1;
+		x = x1;
+		y = y1;
+		z = z1;
+		side = side1;
 		this.referencedBlock = referencedBlock;
-		this.referencedMeta = referencedMeta1;
-		this.referencedSide = referencedSide1;
+		referencedMeta = referencedMeta1;
+		referencedSide = referencedSide1;
 	}
 }
diff --git a/src/api/java/ic2/api/event/package-info.java b/src/api/java/ic2/api/event/package-info.java
index d331b92..45c1338 100644
--- a/src/api/java/ic2/api/event/package-info.java
+++ b/src/api/java/ic2/api/event/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.event;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/info/IEnergyValueProvider.java b/src/api/java/ic2/api/info/IEnergyValueProvider.java
index 1e7b2cc..a66b35c 100644
--- a/src/api/java/ic2/api/info/IEnergyValueProvider.java
+++ b/src/api/java/ic2/api/info/IEnergyValueProvider.java
@@ -2,7 +2,8 @@ package ic2.api.info;
 
 import net.minecraft.item.ItemStack;
 
-public interface IEnergyValueProvider {
+public interface IEnergyValueProvider
+{
 	/**
 	 * Determine the energy value for a single item in the supplied stack.
 	 * The value is used by most machines in the discharge slot.
diff --git a/src/api/java/ic2/api/info/IFuelValueProvider.java b/src/api/java/ic2/api/info/IFuelValueProvider.java
index 7c7fe0f..690a477 100644
--- a/src/api/java/ic2/api/info/IFuelValueProvider.java
+++ b/src/api/java/ic2/api/info/IFuelValueProvider.java
@@ -2,7 +2,8 @@ package ic2.api.info;
 
 import net.minecraft.item.ItemStack;
 
-public interface IFuelValueProvider {
+public interface IFuelValueProvider
+{
 	/**
 	 * Determine the fuel value for a single item in the supplied stack.
 	 * The information currently applies to Generators and the Iron Furnace.
diff --git a/src/api/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java
index f8e30ad..42f8235 100644
--- a/src/api/java/ic2/api/info/Info.java
+++ b/src/api/java/ic2/api/info/Info.java
@@ -2,38 +2,44 @@ package ic2.api.info;
 
 import net.minecraft.potion.Potion;
 import net.minecraft.util.DamageSource;
-
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState;
 
-public class Info {
-	public static IEnergyValueProvider itemEnergy;
-	public static IFuelValueProvider itemFuel;
-	public static Object ic2ModInstance;
+public class Info
+{
+	public static IEnergyValueProvider	itemEnergy;
+	public static IFuelValueProvider	itemFuel;
+	public static Object				ic2ModInstance;
 
 	/**
 	 * Damage Sources used by IC2.
 	 * Getting assigned in preload.
 	 */
-	public static DamageSource DMG_ELECTRIC, DMG_NUKE_EXPLOSION, DMG_RADIATION;
+	public static DamageSource			DMG_ELECTRIC, DMG_NUKE_EXPLOSION,
+	DMG_RADIATION;
 
 	/**
 	 * Potions used by IC2.
 	 * Getting assigned in preload.
 	 */
-	public static Potion POTION_RADIATION;
+	public static Potion				POTION_RADIATION;
 
-	public static boolean isIc2Available() {
-		if (ic2Available != null) return ic2Available;
+	public static boolean isIc2Available()
+	{
+		if(ic2Available != null)
+		{
+			return ic2Available;
+		}
 
-		boolean loaded = Loader.isModLoaded("IC2");
+		final boolean loaded = Loader.isModLoaded("IC2");
 
-		if (Loader.instance().hasReachedState(LoaderState.CONSTRUCTING)) {
+		if(Loader.instance().hasReachedState(LoaderState.CONSTRUCTING))
+		{
 			ic2Available = loaded;
 		}
 
 		return loaded;
 	}
 
-	private static Boolean ic2Available = null;
-}
\ No newline at end of file
+	private static Boolean	ic2Available	= null;
+}
diff --git a/src/api/java/ic2/api/info/package-info.java b/src/api/java/ic2/api/info/package-info.java
index 59936e5..126f59e 100644
--- a/src/api/java/ic2/api/info/package-info.java
+++ b/src/api/java/ic2/api/info/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.info;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/item/ElectricItem.java b/src/api/java/ic2/api/item/ElectricItem.java
index 19e5fc1..f4037a9 100644
--- a/src/api/java/ic2/api/item/ElectricItem.java
+++ b/src/api/java/ic2/api/item/ElectricItem.java
@@ -8,20 +8,21 @@ import net.minecraft.item.ItemStack;
 /**
  * Allows for charging, discharging and using electric items (IElectricItem).
  */
-public final class ElectricItem {
+public final class ElectricItem
+{
 	/**
 	 * IElectricItemManager to use for interacting with IElectricItem ItemStacks.
 	 * 
 	 * This manager will act as a gateway and delegate the tasks to the final implementation
 	 * (rawManager or a custom one) as necessary.
 	 */
-	public static IElectricItemManager manager;
+	public static IElectricItemManager	manager;
 
 	/**
 	 * Standard IElectricItemManager implementation, only call it directly from another
 	 * IElectricItemManager. Use manager instead.
 	 */
-	public static IElectricItemManager rawManager;
+	public static IElectricItemManager	rawManager;
 
 	/**
 	 * Register an electric item manager for items not implementing IElectricItem.
@@ -33,7 +34,8 @@ public final class ElectricItem {
 	 * 
 	 * @param manager Manager to register.
 	 */
-	public static void registerBackupManager(IBackupElectricItemManager manager) {
+	public static void registerBackupManager(IBackupElectricItemManager manager)
+	{
 		backupManagers.add(manager);
 	}
 
@@ -45,15 +47,18 @@ public final class ElectricItem {
 	 * @param stack ItemStack to be handled.
 	 * @return First suitable electric item manager.
 	 */
-	public static IBackupElectricItemManager getBackupManager(ItemStack stack) {
-		for (IBackupElectricItemManager manager : backupManagers) {
-			if (manager.handles(stack)) return manager;
+	public static IBackupElectricItemManager getBackupManager(ItemStack stack)
+	{
+		for(final IBackupElectricItemManager manager : backupManagers)
+		{
+			if(manager.handles(stack))
+			{
+				return manager;
+			}
 		}
 
 		return null;
 	}
 
-
-	private static final List<IBackupElectricItemManager> backupManagers = new ArrayList<IBackupElectricItemManager>();
+	private static final List<IBackupElectricItemManager>	backupManagers	= new ArrayList<IBackupElectricItemManager>();
 }
-
diff --git a/src/api/java/ic2/api/item/IBackupElectricItemManager.java b/src/api/java/ic2/api/item/IBackupElectricItemManager.java
index 2ae254a..d53b885 100644
--- a/src/api/java/ic2/api/item/IBackupElectricItemManager.java
+++ b/src/api/java/ic2/api/item/IBackupElectricItemManager.java
@@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
  *
  * The manager implementing this has to be registered with ElectricItem.registerBackupManager().
  */
-public interface IBackupElectricItemManager extends IElectricItemManager {
+public interface IBackupElectricItemManager extends IElectricItemManager
+{
 	boolean handles(ItemStack stack);
 }
diff --git a/src/api/java/ic2/api/item/IBlockCuttingBlade.java b/src/api/java/ic2/api/item/IBlockCuttingBlade.java
index 24a8f00..e153117 100644
--- a/src/api/java/ic2/api/item/IBlockCuttingBlade.java
+++ b/src/api/java/ic2/api/item/IBlockCuttingBlade.java
@@ -1,6 +1,6 @@
 package ic2.api.item;
 
-
-public interface IBlockCuttingBlade {
+public interface IBlockCuttingBlade
+{
 	int gethardness();
 }
diff --git a/src/api/java/ic2/api/item/IBoxable.java b/src/api/java/ic2/api/item/IBoxable.java
index bca2cc0..1d86e2c 100644
--- a/src/api/java/ic2/api/item/IBoxable.java
+++ b/src/api/java/ic2/api/item/IBoxable.java
@@ -2,8 +2,8 @@ package ic2.api.item;
 
 import net.minecraft.item.ItemStack;
 
-
-public interface IBoxable {
+public interface IBoxable
+{
 	/**
 	 * Determine whether an item can be stored in a toolbox or not.
 	 * 
diff --git a/src/api/java/ic2/api/item/IC2Items.java b/src/api/java/ic2/api/item/IC2Items.java
index 9b8c7df..78c680d 100644
--- a/src/api/java/ic2/api/item/IC2Items.java
+++ b/src/api/java/ic2/api/item/IC2Items.java
@@ -13,7 +13,8 @@ import net.minecraft.item.ItemStack;
  *   Blocks: Block.blocksList[x.itemID]
  *   Items: x.getItem()
  */
-public final class IC2Items {
+public final class IC2Items
+{
 	/**
 	 * Get an ItemStack for a specific item name, example: Items.getItem("resin")
 	 * See the list below for item names.
@@ -22,18 +23,26 @@ public final class IC2Items {
 	 * @param name item name
 	 * @return The item or null if the item does not exist or an error occurred
 	 */
-	public static ItemStack getItem(String name) {
-		try {
-			if (Ic2Items == null) Ic2Items = Class.forName(getPackage() + ".core.Ic2Items");
+	public static ItemStack getItem(String name)
+	{
+		try
+		{
+			if(Ic2Items == null)
+			{
+				Ic2Items = Class.forName(getPackage() + ".core.Ic2Items");
+			}
 
-			Object ret = Ic2Items.getField(name).get(null);
+			final Object ret = Ic2Items.getField(name).get(null);
 
-			if (ret instanceof ItemStack) {
+			if(ret instanceof ItemStack)
+			{
 				return (ItemStack) ret;
 			}
 			return null;
-		} catch (Exception e) {
-			System.out.println("IC2 API: Call getItem failed for "+name);
+		}
+		catch(final Exception e)
+		{
+			System.out.println("IC2 API: Call getItem failed for " + name);
 
 			return null;
 		}
@@ -581,11 +590,13 @@ public final class IC2Items {
 	 * 
 	 * @return IC2 package name, if unable to be determined defaults to ic2
 	 */
-	private static String getPackage() {
-		Package pkg = IC2Items.class.getPackage();
+	private static String getPackage()
+	{
+		final Package pkg = IC2Items.class.getPackage();
 
-		if (pkg != null) {
-			String packageName = pkg.getName();
+		if(pkg != null)
+		{
+			final String packageName = pkg.getName();
 
 			return packageName.substring(0, packageName.length() - ".api.item".length());
 		}
@@ -593,6 +604,5 @@ public final class IC2Items {
 		return "ic2";
 	}
 
-	private static Class<?> Ic2Items;
+	private static Class<?>	Ic2Items;
 }
-
diff --git a/src/api/java/ic2/api/item/ICustomDamageItem.java b/src/api/java/ic2/api/item/ICustomDamageItem.java
index 4470fa0..56590d1 100644
--- a/src/api/java/ic2/api/item/ICustomDamageItem.java
+++ b/src/api/java/ic2/api/item/ICustomDamageItem.java
@@ -17,7 +17,8 @@ import net.minecraft.item.ItemStack;
  *
  * @author Player
  */
-public interface ICustomDamageItem {
+public interface ICustomDamageItem
+{
 	/**
 	 * Retrieve the custom damage value for the supplied item stack.
 	 *
diff --git a/src/api/java/ic2/api/item/IDebuggable.java b/src/api/java/ic2/api/item/IDebuggable.java
index 404c7eb..cd5159e 100644
--- a/src/api/java/ic2/api/item/IDebuggable.java
+++ b/src/api/java/ic2/api/item/IDebuggable.java
@@ -1,22 +1,22 @@
 package ic2.api.item;
 
-
 /**
  * Allows a tile entity to output a debug message when the debugItem is used on it.
  * Suggestions by Myrathi
  */
-public abstract interface IDebuggable {
-    /**
-     * Checks if the tile entity is in a state that can be debugged.
-     *
-     * @return True if the tile entity can be debugged
-     */
-    public abstract boolean isDebuggable();
+public abstract interface IDebuggable
+{
+	/**
+	 * Checks if the tile entity is in a state that can be debugged.
+	 *
+	 * @return True if the tile entity can be debugged
+	 */
+	public abstract boolean isDebuggable();
 
-    /**
-     * Gets the debug text for the tile entity.
-     *
-     * @return The text that the debugItem should show
-     */
-    public abstract String getDebugText();
+	/**
+	 * Gets the debug text for the tile entity.
+	 *
+	 * @return The text that the debugItem should show
+	 */
+	public abstract String getDebugText();
 }
diff --git a/src/api/java/ic2/api/item/IElectricItem.java b/src/api/java/ic2/api/item/IElectricItem.java
index 4f546d5..14935a5 100644
--- a/src/api/java/ic2/api/item/IElectricItem.java
+++ b/src/api/java/ic2/api/item/IElectricItem.java
@@ -8,7 +8,8 @@ import net.minecraft.item.ItemStack;
  *
  * The item should have a maximum damage of 13.
  */
-public interface IElectricItem {
+public interface IElectricItem
+{
 	/**
 	 * Determine if the item can be used in a machine or as an armor part to supply energy.
 	 *
@@ -54,4 +55,3 @@ public interface IElectricItem {
 	 */
 	double getTransferLimit(ItemStack itemStack);
 }
-
diff --git a/src/api/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java
index 5de43d7..315ce90 100644
--- a/src/api/java/ic2/api/item/IElectricItemManager.java
+++ b/src/api/java/ic2/api/item/IElectricItemManager.java
@@ -17,7 +17,8 @@ import net.minecraft.item.ItemStack;
  * to minimize its dependency on its own constraints/structure and delegates most work back to the
  * more atomic features in the gateway manager.
  */
-public interface IElectricItemManager {
+public interface IElectricItemManager
+{
 	/**
 	 * Charge an item with a specified amount of energy.
 	 *
diff --git a/src/api/java/ic2/api/item/IItemHudInfo.java b/src/api/java/ic2/api/item/IItemHudInfo.java
index da97318..77f0454 100644
--- a/src/api/java/ic2/api/item/IItemHudInfo.java
+++ b/src/api/java/ic2/api/item/IItemHudInfo.java
@@ -4,18 +4,19 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-public interface IItemHudInfo {
+public interface IItemHudInfo
+{
 	/*
-    Add Info to Nano- and Quantum-Suit Helm Hud
-    for itemStack
+	Add Info to Nano- and Quantum-Suit Helm Hud
+	for itemStack
 
-        @Override
-        public List<String> getHudInfo(ItemStack itemStack) {
-        List<String> info = new LinkedList<String>();
-        info.add("i am a Cool Item");
-        info.add("and have Cool info");
-        return info;
-    }
+	    @Override
+	    public List<String> getHudInfo(ItemStack itemStack) {
+	    List<String> info = new LinkedList<String>();
+	    info.add("i am a Cool Item");
+	    info.add("and have Cool info");
+	    return info;
+	}
 
 
 	 */
diff --git a/src/api/java/ic2/api/item/IKineticRotor.java b/src/api/java/ic2/api/item/IKineticRotor.java
index a61d162..a2547bc 100644
--- a/src/api/java/ic2/api/item/IKineticRotor.java
+++ b/src/api/java/ic2/api/item/IKineticRotor.java
@@ -3,7 +3,8 @@ package ic2.api.item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
-public interface IKineticRotor {
+public interface IKineticRotor
+{
 	int getDiameter(ItemStack stack);
 
 	ResourceLocation getRotorRenderTexture(ItemStack stack);
@@ -16,8 +17,8 @@ public interface IKineticRotor {
 
 	boolean isAcceptedType(ItemStack stack, GearboxType type);
 
-	public static enum GearboxType  {
-		WATER,
-		WIND,
+	public static enum GearboxType
+	{
+		WATER, WIND,
 	}
 }
diff --git a/src/api/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java
index 45988c4..b98760e 100644
--- a/src/api/java/ic2/api/item/ILatheItem.java
+++ b/src/api/java/ic2/api/item/ILatheItem.java
@@ -2,14 +2,14 @@ package ic2.api.item;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * Interface used for Items that can be processed in the Turning Table
  */
-public interface ILatheItem {
+public interface ILatheItem
+{
 
 	/**
 	 * Returns the radius of this Lathe Item
@@ -57,7 +57,8 @@ public interface ILatheItem {
 	/**
 	 * Interface used for Tools that can be used to modify {@link ILatheItem}
 	 */
-	public static interface ILatheTool extends ICustomDamageItem {
+	public static interface ILatheTool extends ICustomDamageItem
+	{
 
 		/**
 		 * This is similar to the Tool HarvestLevel. Requires a different tool for a different hardness
diff --git a/src/api/java/ic2/api/item/IMetalArmor.java b/src/api/java/ic2/api/item/IMetalArmor.java
index 16ffd24..c067814 100644
--- a/src/api/java/ic2/api/item/IMetalArmor.java
+++ b/src/api/java/ic2/api/item/IMetalArmor.java
@@ -8,7 +8,8 @@ import net.minecraft.item.ItemStack;
  * 
  * Currently used for determining which boots can be used to slide up a magnetic pole.
  */
-public interface IMetalArmor {
+public interface IMetalArmor
+{
 	/**
 	 * Determine if the given armor piece is metal armor.
 	 * 
diff --git a/src/api/java/ic2/api/item/ISpecialElectricItem.java b/src/api/java/ic2/api/item/ISpecialElectricItem.java
index a7302f5..b73cf1d 100644
--- a/src/api/java/ic2/api/item/ISpecialElectricItem.java
+++ b/src/api/java/ic2/api/item/ISpecialElectricItem.java
@@ -2,7 +2,8 @@ package ic2.api.item;
 
 import net.minecraft.item.ItemStack;
 
-public interface ISpecialElectricItem extends IElectricItem {
+public interface ISpecialElectricItem extends IElectricItem
+{
 	/**
 	 * Supply a custom IElectricItemManager.
 	 * 
diff --git a/src/api/java/ic2/api/item/ITerraformingBP.java b/src/api/java/ic2/api/item/ITerraformingBP.java
index 59b46ba..cbb1eba 100644
--- a/src/api/java/ic2/api/item/ITerraformingBP.java
+++ b/src/api/java/ic2/api/item/ITerraformingBP.java
@@ -5,14 +5,15 @@ import net.minecraft.world.World;
 /**
  * Allows an item to act as a terraformer blueprint.
  */
-public interface ITerraformingBP {
+public interface ITerraformingBP
+{
 	/**
 	 * Get the energy consumption per operation of the blueprint.
 	 * 
 	 * @return Energy consumption in EU
 	 */
 	public abstract int getConsume();
-	
+
 	/**
 	 * Get the maximum range of the blueprint.
 	 * Should be a divisor of 5.
@@ -20,7 +21,7 @@ public interface ITerraformingBP {
 	 * @return Maximum range in blocks
 	 */
 	public abstract int getRange();
-	
+
 	/**
 	 * Perform the terraforming operation.
 	 * 
diff --git a/src/api/java/ic2/api/item/ItemWrapper.java b/src/api/java/ic2/api/item/ItemWrapper.java
index 58f8073..9a4e4d8 100644
--- a/src/api/java/ic2/api/item/ItemWrapper.java
+++ b/src/api/java/ic2/api/item/ItemWrapper.java
@@ -12,39 +12,58 @@ import com.google.common.collect.Multimap;
  * 
  * @author Richard
  */
-public class ItemWrapper {
-	private static final Multimap<Item, IBoxable> boxableItems = ArrayListMultimap.create();
-	private static final Multimap<Item, IMetalArmor> metalArmorItems = ArrayListMultimap.create();
-	
-	public static void registerBoxable(Item item, IBoxable boxable) {
+public class ItemWrapper
+{
+	private static final Multimap<Item, IBoxable>		boxableItems	= ArrayListMultimap.create();
+	private static final Multimap<Item, IMetalArmor>	metalArmorItems	= ArrayListMultimap.create();
+
+	public static void registerBoxable(Item item, IBoxable boxable)
+	{
 		boxableItems.put(item, boxable);
 	}
-	
-	public static boolean canBeStoredInToolbox(ItemStack stack) {
-		Item item = stack.getItem();
+
+	public static boolean canBeStoredInToolbox(ItemStack stack)
+	{
+		final Item item = stack.getItem();
 		// use customs first to allow for overriding behavior
-		for (IBoxable boxable : boxableItems.get(item)) {
-			if (boxable.canBeStoredInToolbox(stack)) return true;
+		for(final IBoxable boxable : boxableItems.get(item))
+		{
+			if(boxable.canBeStoredInToolbox(stack))
+			{
+				return true;
+			}
 		}
-		
-		if (item instanceof IBoxable && ((IBoxable) item).canBeStoredInToolbox(stack)) return true;
-		
+
+		if(item instanceof IBoxable && ((IBoxable) item).canBeStoredInToolbox(stack))
+		{
+			return true;
+		}
+
 		return false;
 	}
-	
-	public static void registerMetalArmor(Item item, IMetalArmor armor) {
+
+	public static void registerMetalArmor(Item item, IMetalArmor armor)
+	{
 		metalArmorItems.put(item, armor);
 	}
-	
-	public static boolean isMetalArmor(ItemStack stack, EntityPlayer player) {
-		Item item = stack.getItem();
+
+	public static boolean isMetalArmor(ItemStack stack, EntityPlayer player)
+	{
+		final Item item = stack.getItem();
 		// use customs first to allow for overriding behavior
-		for (IMetalArmor metalArmor : metalArmorItems.get(item)) {
-			if (metalArmor.isMetalArmor(stack, player)) return true;
+		for(final IMetalArmor metalArmor : metalArmorItems.get(item))
+		{
+			if(metalArmor.isMetalArmor(stack, player))
+			{
+				return true;
+			}
 		}
-		
-		if (item instanceof IMetalArmor && ((IMetalArmor) item).isMetalArmor(stack, player)) return true;
-		
+
+		if(item instanceof IMetalArmor && ((IMetalArmor) item).isMetalArmor(stack, player))
+		{
+			return true;
+		}
+
 		return false;
 	}
 }
diff --git a/src/api/java/ic2/api/item/package-info.java b/src/api/java/ic2/api/item/package-info.java
index 44ecdce..f9d4d80 100644
--- a/src/api/java/ic2/api/item/package-info.java
+++ b/src/api/java/ic2/api/item/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.item;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java
index ed3ea38..000ce16 100644
--- a/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java
+++ b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java
@@ -5,7 +5,8 @@ import net.minecraft.entity.player.EntityPlayer;
 /**
  * Allows a tile entity to receive network events received from clients.
  */
-public interface INetworkClientTileEntityEventListener {
+public interface INetworkClientTileEntityEventListener
+{
 	/**
 	 * Called when a network event is received.
 	 * 
@@ -14,4 +15,3 @@ public interface INetworkClientTileEntityEventListener {
 	 */
 	void onNetworkEvent(EntityPlayer player, int event);
 }
-
diff --git a/src/api/java/ic2/api/network/INetworkDataProvider.java b/src/api/java/ic2/api/network/INetworkDataProvider.java
index c3f283e..86e58c7 100644
--- a/src/api/java/ic2/api/network/INetworkDataProvider.java
+++ b/src/api/java/ic2/api/network/INetworkDataProvider.java
@@ -7,7 +7,8 @@ import java.util.List;
  * 
  * The fields don't update themselves, a field update must be sent every time a synchronized field changes.
  */
-public interface INetworkDataProvider {
+public interface INetworkDataProvider
+{
 	/**
 	 * Get the list of synchronized fields.
 	 * 
@@ -15,4 +16,3 @@ public interface INetworkDataProvider {
 	 */
 	List<String> getNetworkedFields();
 }
-
diff --git a/src/api/java/ic2/api/network/INetworkItemEventListener.java b/src/api/java/ic2/api/network/INetworkItemEventListener.java
index 5f3228c..6ddbb4b 100644
--- a/src/api/java/ic2/api/network/INetworkItemEventListener.java
+++ b/src/api/java/ic2/api/network/INetworkItemEventListener.java
@@ -6,7 +6,8 @@ import net.minecraft.item.ItemStack;
 /**
  * Allows an item to receive network events received from the server.
  */
-public interface INetworkItemEventListener {
+public interface INetworkItemEventListener
+{
 	/**
 	 * Called when a network event is received.
 	 * 
@@ -16,4 +17,3 @@ public interface INetworkItemEventListener {
 	 */
 	void onNetworkEvent(ItemStack stack, EntityPlayer player, int event);
 }
-
diff --git a/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java
index fbb4753..e3cd5c3 100644
--- a/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java
+++ b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java
@@ -3,7 +3,8 @@ package ic2.api.network;
 /**
  * Allows a tile entity to receive network events received from the server.
  */
-public interface INetworkTileEntityEventListener {
+public interface INetworkTileEntityEventListener
+{
 	/**
 	 * Called when a network event is received.
 	 * 
@@ -11,4 +12,3 @@ public interface INetworkTileEntityEventListener {
 	 */
 	void onNetworkEvent(int event);
 }
-
diff --git a/src/api/java/ic2/api/network/INetworkUpdateListener.java b/src/api/java/ic2/api/network/INetworkUpdateListener.java
index 09414ae..a37fcaa 100644
--- a/src/api/java/ic2/api/network/INetworkUpdateListener.java
+++ b/src/api/java/ic2/api/network/INetworkUpdateListener.java
@@ -3,7 +3,8 @@ package ic2.api.network;
 /**
  * Allows a tile entity to receive field sync updates received from the server. 
  */
-public interface INetworkUpdateListener {
+public interface INetworkUpdateListener
+{
 	/**
 	 * Called when a field is synchronized.
 	 * 
@@ -11,4 +12,3 @@ public interface INetworkUpdateListener {
 	 */
 	void onNetworkUpdate(String field);
 }
-
diff --git a/src/api/java/ic2/api/network/NetworkHelper.java b/src/api/java/ic2/api/network/NetworkHelper.java
index a91d03a..0615e35 100644
--- a/src/api/java/ic2/api/network/NetworkHelper.java
+++ b/src/api/java/ic2/api/network/NetworkHelper.java
@@ -18,10 +18,10 @@ import net.minecraft.tileentity.TileEntity;
  * producing effects. Anything which is only visible inside the GUI should be synchronized through
  * the Container class associated to the GUI in Container.updateProgressBar().
  */
-public final class NetworkHelper {
+public final class NetworkHelper
+{
 	// server -> client
 
-
 	/**
 	 * Schedule a TileEntity's field to be updated to the clients in range.
 	 *
@@ -53,13 +53,23 @@ public final class NetworkHelper {
 	 * @param te TileEntity to update
 	 * @param field Name of the field to update
 	 */
-	public static void updateTileEntityField(TileEntity te, String field) {
-		try {
-			if (NetworkManager_updateTileEntityField == null) NetworkManager_updateTileEntityField = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("updateTileEntityField", TileEntity.class, String.class);
-			if (instance == null) instance = getInstance();
+	public static void updateTileEntityField(TileEntity te, String field)
+	{
+		try
+		{
+			if(NetworkManager_updateTileEntityField == null)
+			{
+				NetworkManager_updateTileEntityField = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("updateTileEntityField", TileEntity.class, String.class);
+			}
+			if(instance == null)
+			{
+				instance = getInstance();
+			}
 
 			NetworkManager_updateTileEntityField.invoke(instance, te, field);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
@@ -75,13 +85,23 @@ public final class NetworkHelper {
 	 * @param limitRange Limit the notification range to (currently) 20 blocks instead of the
 	 *        tracking distance if true
 	 */
-	public static void initiateTileEntityEvent(TileEntity te, int event, boolean limitRange) {
-		try {
-			if (NetworkManager_initiateTileEntityEvent == null) NetworkManager_initiateTileEntityEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateTileEntityEvent", TileEntity.class, Integer.TYPE, Boolean.TYPE);
-			if (instance == null) instance = getInstance();
+	public static void initiateTileEntityEvent(TileEntity te, int event, boolean limitRange)
+	{
+		try
+		{
+			if(NetworkManager_initiateTileEntityEvent == null)
+			{
+				NetworkManager_initiateTileEntityEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateTileEntityEvent", TileEntity.class, Integer.TYPE, Boolean.TYPE);
+			}
+			if(instance == null)
+			{
+				instance = getInstance();
+			}
 
 			NetworkManager_initiateTileEntityEvent.invoke(instance, te, event, limitRange);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
@@ -100,18 +120,27 @@ public final class NetworkHelper {
 	 * @param limitRange Limit the notification range to (currently) 20 blocks instead of the
 	 *        tracking distance if true
 	 */
-	public static void initiateItemEvent(EntityPlayer player, ItemStack itemStack, int event, boolean limitRange) {
-		try {
-			if (NetworkManager_initiateItemEvent == null) NetworkManager_initiateItemEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateItemEvent", EntityPlayer.class, ItemStack.class, Integer.TYPE, Boolean.TYPE);
-			if (instance == null) instance = getInstance();
+	public static void initiateItemEvent(EntityPlayer player, ItemStack itemStack, int event, boolean limitRange)
+	{
+		try
+		{
+			if(NetworkManager_initiateItemEvent == null)
+			{
+				NetworkManager_initiateItemEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateItemEvent", EntityPlayer.class, ItemStack.class, Integer.TYPE, Boolean.TYPE);
+			}
+			if(instance == null)
+			{
+				instance = getInstance();
+			}
 
 			NetworkManager_initiateItemEvent.invoke(instance, player, itemStack, event, limitRange);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
 
-
 	// client -> server
 
 	/**
@@ -122,13 +151,23 @@ public final class NetworkHelper {
 	 * @param te TileEntity to notify, should implement INetworkClientTileEntityEventListener
 	 * @param event Arbitrary integer to represent the event, choosing the values is up to you
 	 */
-	public static void initiateClientTileEntityEvent(TileEntity te, int event) {
-		try {
-			if (NetworkManager_initiateClientTileEntityEvent == null) NetworkManager_initiateClientTileEntityEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateClientTileEntityEvent", TileEntity.class, Integer.TYPE);
-			if (instance == null) instance = getInstance();
+	public static void initiateClientTileEntityEvent(TileEntity te, int event)
+	{
+		try
+		{
+			if(NetworkManager_initiateClientTileEntityEvent == null)
+			{
+				NetworkManager_initiateClientTileEntityEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateClientTileEntityEvent", TileEntity.class, Integer.TYPE);
+			}
+			if(instance == null)
+			{
+				instance = getInstance();
+			}
 
 			NetworkManager_initiateClientTileEntityEvent.invoke(instance, te, event);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
@@ -143,13 +182,23 @@ public final class NetworkHelper {
 	 * @param itemStack ItemStack containing the item
 	 * @param event Arbitrary integer to represent the event, choosing the values is up to you
 	 */
-	public static void initiateClientItemEvent(ItemStack itemStack, int event) {
-		try {
-			if (NetworkManager_initiateClientItemEvent == null) NetworkManager_initiateClientItemEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateClientItemEvent", ItemStack.class, Integer.TYPE);
-			if (instance == null) instance = getInstance();
+	public static void initiateClientItemEvent(ItemStack itemStack, int event)
+	{
+		try
+		{
+			if(NetworkManager_initiateClientItemEvent == null)
+			{
+				NetworkManager_initiateClientItemEvent = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("initiateClientItemEvent", ItemStack.class, Integer.TYPE);
+			}
+			if(instance == null)
+			{
+				instance = getInstance();
+			}
 
 			NetworkManager_initiateClientItemEvent.invoke(instance, itemStack, event);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
@@ -159,11 +208,13 @@ public final class NetworkHelper {
 	 *
 	 * @return IC2 package name, if unable to be determined defaults to ic2
 	 */
-	private static String getPackage() {
-		Package pkg = NetworkHelper.class.getPackage();
+	private static String getPackage()
+	{
+		final Package pkg = NetworkHelper.class.getPackage();
 
-		if (pkg != null) {
-			String packageName = pkg.getName();
+		if(pkg != null)
+		{
+			final String packageName = pkg.getName();
 
 			return packageName.substring(0, packageName.length() - ".api.network".length());
 		}
@@ -176,19 +227,22 @@ public final class NetworkHelper {
 	 *
 	 * @return NetworkManager instance
 	 */
-	private static Object getInstance() {
-		try {
+	private static Object getInstance()
+	{
+		try
+		{
 			return Class.forName(getPackage() + ".core.util.SideGateway").getMethod("get").invoke(Class.forName(getPackage() + ".core.IC2").getDeclaredField("network").get(null));
-		} catch (Throwable e) {
+		}
+		catch(final Throwable e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
 
-	private static Object instance;
-	private static Method NetworkManager_updateTileEntityField;
-	private static Method NetworkManager_initiateTileEntityEvent;
-	private static Method NetworkManager_initiateItemEvent;
-	private static Method NetworkManager_initiateClientTileEntityEvent;
-	private static Method NetworkManager_initiateClientItemEvent;
+	private static Object	instance;
+	private static Method	NetworkManager_updateTileEntityField;
+	private static Method	NetworkManager_initiateTileEntityEvent;
+	private static Method	NetworkManager_initiateItemEvent;
+	private static Method	NetworkManager_initiateClientTileEntityEvent;
+	private static Method	NetworkManager_initiateClientItemEvent;
 }
-
diff --git a/src/api/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java
index 25ea29e..1b69df8 100644
--- a/src/api/java/ic2/api/network/package-info.java
+++ b/src/api/java/ic2/api/network/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.network;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/package-info.java b/src/api/java/ic2/api/package-info.java
index e6f1522..00ff182 100644
--- a/src/api/java/ic2/api/package-info.java
+++ b/src/api/java/ic2/api/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/reactor/IReactor.java b/src/api/java/ic2/api/reactor/IReactor.java
index 55191cc..5009b32 100644
--- a/src/api/java/ic2/api/reactor/IReactor.java
+++ b/src/api/java/ic2/api/reactor/IReactor.java
@@ -7,7 +7,8 @@ import net.minecraft.world.World;
 /**
  * Interface implemented by the tile entity of nuclear reactors.
  */
-public interface IReactor {
+public interface IReactor
+{
 	/**
 	 * Get the reactor's position in the world.
 	 * 
@@ -67,7 +68,6 @@ public interface IReactor {
 	 * no more magic heat disappear
 	 */
 
-
 	public void addEmitHeat(int heat);
 
 	/**
diff --git a/src/api/java/ic2/api/reactor/IReactorChamber.java b/src/api/java/ic2/api/reactor/IReactorChamber.java
index 4611a6a..66463b3 100644
--- a/src/api/java/ic2/api/reactor/IReactorChamber.java
+++ b/src/api/java/ic2/api/reactor/IReactorChamber.java
@@ -3,7 +3,8 @@ package ic2.api.reactor;
 /**
  * Interface implemented by the reactor chamber tile entity.
  */
-public interface IReactorChamber {
+public interface IReactorChamber
+{
 	/**
 	 * Get the chamber's reactor.
 	 * 
@@ -15,6 +16,6 @@ public interface IReactorChamber {
 	 * Set Redstone Signal without direct contact
 	 * 
 	 */
-	
+
 	public void setRedstoneSignal(boolean redstone);
 }
diff --git a/src/api/java/ic2/api/reactor/IReactorComponent.java b/src/api/java/ic2/api/reactor/IReactorComponent.java
index 84e011c..4b4d8ad 100644
--- a/src/api/java/ic2/api/reactor/IReactorComponent.java
+++ b/src/api/java/ic2/api/reactor/IReactorComponent.java
@@ -10,7 +10,8 @@ import net.minecraft.item.ItemStack;
  * All IC2 ReactorComponents implement and use this Interface
  *
  */
-public interface IReactorComponent {
+public interface IReactorComponent
+{
 	/**
 	 * Called by reactor upon iterating through it's inventory (every cycle).
 	 * Perform all necessary calculation/interaction here
diff --git a/src/api/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java
index 5194aee..7b70911 100644
--- a/src/api/java/ic2/api/reactor/package-info.java
+++ b/src/api/java/ic2/api/reactor/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.reactor;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java
index 415b3c3..6f64585 100644
--- a/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java
+++ b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java
@@ -4,7 +4,8 @@ import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
-public interface ICannerBottleRecipeManager {
+public interface ICannerBottleRecipeManager
+{
 	/**
 	 * Adds a recipe to the machine.
 	 * 
@@ -34,18 +35,20 @@ public interface ICannerBottleRecipeManager {
 	 */
 	public Map<Input, RecipeOutput> getRecipes();
 
-
-	public static class Input {
-		public Input(IRecipeInput container1, IRecipeInput fill1) {
-			this.container = container1;
-			this.fill = fill1;
+	public static class Input
+	{
+		public Input(IRecipeInput container1, IRecipeInput fill1)
+		{
+			container = container1;
+			fill = fill1;
 		}
 
-		public boolean matches(ItemStack container1, ItemStack fill1) {
-			return this.container.matches(container1) && this.fill.matches(fill1);
+		public boolean matches(ItemStack container1, ItemStack fill1)
+		{
+			return container.matches(container1) && fill.matches(fill1);
 		}
 
-		public final IRecipeInput container;
-		public final IRecipeInput fill;
+		public final IRecipeInput	container;
+		public final IRecipeInput	fill;
 	}
 }
diff --git a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
index 5eba1b6..c4141ab 100644
--- a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
+++ b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
@@ -3,10 +3,10 @@ package ic2.api.recipe;
 import java.util.Map;
 
 import net.minecraft.item.ItemStack;
-
 import net.minecraftforge.fluids.FluidStack;
 
-public interface ICannerEnrichRecipeManager {
+public interface ICannerEnrichRecipeManager
+{
 	/**
 	 * Adds a recipe to the machine.
 	 * 
@@ -36,19 +36,20 @@ public interface ICannerEnrichRecipeManager {
 	 */
 	public Map<Input, FluidStack> getRecipes();
 
-
-	public static class Input {
-		public Input(FluidStack fluid1, IRecipeInput additive1) {
-			this.fluid = fluid1;
-			this.additive = additive1;
+	public static class Input
+	{
+		public Input(FluidStack fluid1, IRecipeInput additive1)
+		{
+			fluid = fluid1;
+			additive = additive1;
 		}
 
-		public boolean matches(FluidStack fluid1, ItemStack additive1) {
-			return (this.fluid == null || this.fluid.isFluidEqual(fluid1)) &&
-					this.additive.matches(additive1);
+		public boolean matches(FluidStack fluid1, ItemStack additive1)
+		{
+			return (fluid == null || fluid.isFluidEqual(fluid1)) && additive.matches(additive1);
 		}
 
-		public final FluidStack fluid;
-		public final IRecipeInput additive;
+		public final FluidStack		fluid;
+		public final IRecipeInput	additive;
 	}
 }
diff --git a/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java
index 756eaf6..12583a9 100644
--- a/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java
+++ b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java
@@ -7,7 +7,8 @@ import net.minecraft.item.ItemStack;
  * 
  * @author Richard
  */
-public interface ICraftingRecipeManager {
+public interface ICraftingRecipeManager
+{
 	/**
 	 * Adds a shaped crafting recipe.
 	 * 
@@ -15,7 +16,7 @@ public interface ICraftingRecipeManager {
 	 * @param input Recipe input format
 	 */
 	public void addRecipe(ItemStack output, Object... input);
-	
+
 	/**
 	 * Adds a shapeless crafting recipe.
 	 * 
diff --git a/src/api/java/ic2/api/recipe/IFluidHeatManager.java b/src/api/java/ic2/api/recipe/IFluidHeatManager.java
index 7ddecdc..ee8be18 100644
--- a/src/api/java/ic2/api/recipe/IFluidHeatManager.java
+++ b/src/api/java/ic2/api/recipe/IFluidHeatManager.java
@@ -4,8 +4,8 @@ import java.util.Map;
 
 import net.minecraftforge.fluids.Fluid;
 
-
-public interface IFluidHeatManager extends ILiquidAcceptManager {
+public interface IFluidHeatManager extends ILiquidAcceptManager
+{
 	/**
 	 * Add a new fluid to the Fluid Heat Generator.
 	 * 
@@ -19,14 +19,15 @@ public interface IFluidHeatManager extends ILiquidAcceptManager {
 
 	Map<String, BurnProperty> getBurnProperties();
 
-
-	public static class BurnProperty {
-		public BurnProperty(int amount1, int heat1) {
-			this.amount = amount1;
-			this.heat = heat1;
+	public static class BurnProperty
+	{
+		public BurnProperty(int amount1, int heat1)
+		{
+			amount = amount1;
+			heat = heat1;
 		}
 
-		public final int amount;
-		public final int heat;
+		public final int	amount;
+		public final int	heat;
 	}
 }
diff --git a/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java
index 4f377b9..6483c34 100644
--- a/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java
+++ b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java
@@ -4,7 +4,9 @@ import java.util.Set;
 
 import net.minecraftforge.fluids.Fluid;
 
-public interface ILiquidAcceptManager {
+public interface ILiquidAcceptManager
+{
 	boolean acceptsFluid(Fluid fluid);
+
 	Set<Fluid> getAcceptedFluids();
 }
diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
index 68decbb..1fc079c 100644
--- a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
+++ b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
@@ -4,7 +4,8 @@ import java.util.Map;
 
 import net.minecraftforge.fluids.Fluid;
 
-public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager {
+public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager
+{
 
 	/**
 	 * Add a new fluid heatup/cooldown recipe.
@@ -26,14 +27,16 @@ public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager {
 	 */
 	ILiquidAcceptManager getSingleDirectionLiquidManager();
 
-	public static class HeatExchangeProperty {
-		public HeatExchangeProperty(Fluid outputFluid, int huPerMB) {
+	public static class HeatExchangeProperty
+	{
+		public HeatExchangeProperty(Fluid outputFluid, int huPerMB)
+		{
 			this.outputFluid = outputFluid;
 			this.huPerMB = huPerMB;
 		}
 
-		public final Fluid outputFluid;
-		public final int huPerMB;
+		public final Fluid	outputFluid;
+		public final int	huPerMB;
 	}
 
 }
diff --git a/src/api/java/ic2/api/recipe/IListRecipeManager.java b/src/api/java/ic2/api/recipe/IListRecipeManager.java
index adc2291..d488335 100644
--- a/src/api/java/ic2/api/recipe/IListRecipeManager.java
+++ b/src/api/java/ic2/api/recipe/IListRecipeManager.java
@@ -9,7 +9,8 @@ import net.minecraft.item.ItemStack;
  * 
  * @author Richard
  */
-public interface IListRecipeManager extends Iterable<IRecipeInput> {
+public interface IListRecipeManager extends Iterable<IRecipeInput>
+{
 	/**
 	 * Adds a stack to the list.
 	 * 
diff --git a/src/api/java/ic2/api/recipe/IMachineRecipeManager.java b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java
index d2d4382..ff391f8 100644
--- a/src/api/java/ic2/api/recipe/IMachineRecipeManager.java
+++ b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java
@@ -10,7 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
  *
  * @author RichardG, Player
  */
-public interface IMachineRecipeManager { // TODO: merge with IMachineRecipeManagerExt
+public interface IMachineRecipeManager
+{ // TODO: merge with IMachineRecipeManagerExt
 	/**
 	 * Adds a recipe to the machine.
 	 *
diff --git a/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java
index 9c68706..6dc4715 100644
--- a/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java
+++ b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java
@@ -3,7 +3,8 @@ package ic2.api.recipe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public interface IMachineRecipeManagerExt extends IMachineRecipeManager {
+public interface IMachineRecipeManagerExt extends IMachineRecipeManager
+{
 	/**
 	 * Adds a recipe to the machine.
 	 *
diff --git a/src/api/java/ic2/api/recipe/IPatternStorage.java b/src/api/java/ic2/api/recipe/IPatternStorage.java
index c9dbd8d..2b646f3 100644
--- a/src/api/java/ic2/api/recipe/IPatternStorage.java
+++ b/src/api/java/ic2/api/recipe/IPatternStorage.java
@@ -4,7 +4,8 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-public interface IPatternStorage {
+public interface IPatternStorage
+{
 	boolean addPattern(ItemStack itemstack);
 
 	List<ItemStack> getPatterns();
diff --git a/src/api/java/ic2/api/recipe/IRecipeInput.java b/src/api/java/ic2/api/recipe/IRecipeInput.java
index 0c842d6..99249bb 100644
--- a/src/api/java/ic2/api/recipe/IRecipeInput.java
+++ b/src/api/java/ic2/api/recipe/IRecipeInput.java
@@ -4,7 +4,8 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-public interface IRecipeInput {
+public interface IRecipeInput
+{
 	/**
 	 * Check if subject matches this recipe input, ignoring the amount.
 	 * 
diff --git a/src/api/java/ic2/api/recipe/IScrapboxManager.java b/src/api/java/ic2/api/recipe/IScrapboxManager.java
index 41b694d..4828591 100644
--- a/src/api/java/ic2/api/recipe/IScrapboxManager.java
+++ b/src/api/java/ic2/api/recipe/IScrapboxManager.java
@@ -4,7 +4,8 @@ import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
-public interface IScrapboxManager {
+public interface IScrapboxManager
+{
 	void addDrop(ItemStack drop, float rawChance);
 
 	ItemStack getDrop(ItemStack input, boolean adjustInput);
diff --git a/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java
index 87c3427..1503a18 100644
--- a/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java
+++ b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java
@@ -4,8 +4,8 @@ import java.util.Map;
 
 import net.minecraftforge.fluids.Fluid;
 
-
-public interface ISemiFluidFuelManager extends ILiquidAcceptManager {
+public interface ISemiFluidFuelManager extends ILiquidAcceptManager
+{
 	/**
 	 * Add a new fluid to the semi fluid generator.
 	 * 
@@ -19,14 +19,15 @@ public interface ISemiFluidFuelManager extends ILiquidAcceptManager {
 
 	Map<String, BurnProperty> getBurnProperties();
 
-
-	public static class BurnProperty {
-		public BurnProperty(int amount1, double power1) {
-			this.amount = amount1;
-			this.power = power1;
+	public static class BurnProperty
+	{
+		public BurnProperty(int amount1, double power1)
+		{
+			amount = amount1;
+			power = power1;
 		}
 
-		public final int amount;
-		public final double power;
+		public final int	amount;
+		public final double	power;
 	}
 }
diff --git a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java
index 103d293..7f9ba8c 100644
--- a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java
+++ b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java
@@ -4,51 +4,64 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
 import net.minecraftforge.fluids.FluidStack;
 
-public class RecipeInputFluidContainer implements IRecipeInput {
-	public RecipeInputFluidContainer(Fluid fluid) {
+public class RecipeInputFluidContainer implements IRecipeInput
+{
+	public RecipeInputFluidContainer(Fluid fluid)
+	{
 		this(fluid, FluidContainerRegistry.BUCKET_VOLUME);
 	}
 
-	public RecipeInputFluidContainer(Fluid fluid, int amount) {
+	public RecipeInputFluidContainer(Fluid fluid, int amount)
+	{
 		this.fluid = fluid;
 		this.amount = amount;
 	}
 
 	@Override
-	public boolean matches(ItemStack subject) {
-		FluidStack fs = FluidContainerRegistry.getFluidForFilledItem(subject);
-		if (fs == null) return false;
+	public boolean matches(ItemStack subject)
+	{
+		final FluidStack fs = FluidContainerRegistry.getFluidForFilledItem(subject);
+		if(fs == null)
+		{
+			return false;
+		}
 
 		return fs.getFluid() == fluid;
 	}
 
 	@Override
-	public int getAmount() {
+	public int getAmount()
+	{
 		return amount;
 	}
 
 	@Override
-	public List<ItemStack> getInputs() {
-		List<ItemStack> ret = new ArrayList<ItemStack>();
+	public List<ItemStack> getInputs()
+	{
+		final List<ItemStack> ret = new ArrayList<ItemStack>();
 
-		for (FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) {
-			if (data.fluid.getFluid() == fluid) ret.add(data.filledContainer);
+		for(final FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData())
+		{
+			if(data.fluid.getFluid() == fluid)
+			{
+				ret.add(data.filledContainer);
+			}
 		}
 
 		return ret;
 	}
 
 	@Override
-	public String toString() {
-		return "RInputFluidContainer<"+amount+"x"+fluid.getName()+">";
+	public String toString()
+	{
+		return "RInputFluidContainer<" + amount + "x" + fluid.getName() + ">";
 	}
 
-	public final Fluid fluid;
-	public final int amount;
+	public final Fluid	fluid;
+	public final int	amount;
 }
diff --git a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java
index 84f86ea..41a6012 100644
--- a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java
+++ b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java
@@ -4,44 +4,52 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-
 import net.minecraftforge.oredict.OreDictionary;
 
-public class RecipeInputItemStack implements IRecipeInput {
-	public RecipeInputItemStack(ItemStack aInput) {
+public class RecipeInputItemStack implements IRecipeInput
+{
+	public RecipeInputItemStack(ItemStack aInput)
+	{
 		this(aInput, aInput.stackSize);
 	}
 
-	public RecipeInputItemStack(ItemStack aInput, int aAmount) {
-		if (aInput.getItem() == null) throw new IllegalArgumentException("Invalid item stack specfied");
+	public RecipeInputItemStack(ItemStack aInput, int aAmount)
+	{
+		if(aInput.getItem() == null)
+		{
+			throw new IllegalArgumentException("Invalid item stack specfied");
+		}
 
 		input = aInput.copy(); // Never forget to copy.
 		amount = aAmount;
 	}
 
 	@Override
-	public boolean matches(ItemStack subject) {
-		return subject.getItem() == input.getItem() &&
-				(subject.getItemDamage() == input.getItemDamage() || input.getItemDamage() == OreDictionary.WILDCARD_VALUE);
+	public boolean matches(ItemStack subject)
+	{
+		return subject.getItem() == input.getItem() && (subject.getItemDamage() == input.getItemDamage() || input.getItemDamage() == OreDictionary.WILDCARD_VALUE);
 	}
 
 	@Override
-	public int getAmount() {
+	public int getAmount()
+	{
 		return amount;
 	}
 
 	@Override
-	public List<ItemStack> getInputs() {
+	public List<ItemStack> getInputs()
+	{
 		return Arrays.asList(input);
 	}
 
 	@Override
-	public String toString() {
-		ItemStack stack = input.copy();
+	public String toString()
+	{
+		final ItemStack stack = input.copy();
 		input.stackSize = amount;
-		return "RInputItemStack<"+stack+">";
+		return "RInputItemStack<" + stack + ">";
 	}
 
-	public final ItemStack input;
-	public final int amount;
+	public final ItemStack	input;
+	public final int		amount;
 }
diff --git a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java
index e6e4695..173e6b3 100644
--- a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java
+++ b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java
@@ -6,39 +6,47 @@ import java.util.List;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-
 import net.minecraftforge.oredict.OreDictionary;
 
-public class RecipeInputOreDict implements IRecipeInput {
-	public RecipeInputOreDict(String input1) {
+public class RecipeInputOreDict implements IRecipeInput
+{
+	public RecipeInputOreDict(String input1)
+	{
 		this(input1, 1);
 	}
 
-	public RecipeInputOreDict(String input1, int amount1) {
+	public RecipeInputOreDict(String input1, int amount1)
+	{
 		this(input1, amount1, null);
 	}
 
-	public RecipeInputOreDict(String input1, int amount1, Integer meta) {
-		this.input = input1;
-		this.amount = amount1;
+	public RecipeInputOreDict(String input1, int amount1, Integer meta)
+	{
+		input = input1;
+		amount = amount1;
 		this.meta = meta;
 	}
 
 	@Override
-	public boolean matches(ItemStack subject) {
-		List<ItemStack> inputs = getOres();
-		boolean useOreStackMeta = (meta == null);
-		Item subjectItem = subject.getItem();
-		int subjectMeta = subject.getItemDamage();
-
-		for (ItemStack oreStack : inputs) {
-			Item oreItem = oreStack.getItem();
-			if (oreItem == null) continue; // ignore invalid
+	public boolean matches(ItemStack subject)
+	{
+		final List<ItemStack> inputs = getOres();
+		final boolean useOreStackMeta = (meta == null);
+		final Item subjectItem = subject.getItem();
+		final int subjectMeta = subject.getItemDamage();
+
+		for(final ItemStack oreStack : inputs)
+		{
+			final Item oreItem = oreStack.getItem();
+			if(oreItem == null)
+			{
+				continue; // ignore invalid
+			}
 
-			int metaRequired = useOreStackMeta ? oreStack.getItemDamage() : meta;
+			final int metaRequired = useOreStackMeta ? oreStack.getItemDamage() : meta;
 
-			if (subjectItem == oreItem &&
-					(subjectMeta == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE)) {
+			if(subjectItem == oreItem && (subjectMeta == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE))
+			{
 				return true;
 			}
 		}
@@ -47,58 +55,80 @@ public class RecipeInputOreDict implements IRecipeInput {
 	}
 
 	@Override
-	public int getAmount() {
+	public int getAmount()
+	{
 		return amount;
 	}
 
 	@Override
-	public List<ItemStack> getInputs() {
-		List<ItemStack> ores = getOres();
+	public List<ItemStack> getInputs()
+	{
+		final List<ItemStack> ores = getOres();
 
 		// check if we have to filter the list first
 		boolean hasInvalidEntries = false;
 
-		for (ItemStack stack : ores) {
-			if (stack.getItem() == null) {
+		for(final ItemStack stack : ores)
+		{
+			if(stack.getItem() == null)
+			{
 				hasInvalidEntries = true;
 				break;
 			}
 		}
 
-		if (!hasInvalidEntries) return ores;
+		if(!hasInvalidEntries)
+		{
+			return ores;
+		}
 
-		List<ItemStack> ret = new ArrayList<ItemStack>(ores.size());
+		final List<ItemStack> ret = new ArrayList<ItemStack>(ores.size());
 
-		for (ItemStack stack : ores) {
-			if (stack.getItem() != null) ret.add(stack); // ignore invalid
+		for(final ItemStack stack : ores)
+		{
+			if(stack.getItem() != null)
+			{
+				ret.add(stack); // ignore invalid
+			}
 		}
 
 		return Collections.unmodifiableList(ret);
 	}
 
 	@Override
-	public String toString() {
-		if (meta == null) {
-			return "RInputOreDict<"+amount+"x"+input+">";
-		} else {
-			return "RInputOreDict<"+amount+"x"+input+"@"+meta+">";
+	public String toString()
+	{
+		if(meta == null)
+		{
+			return "RInputOreDict<" + amount + "x" + input + ">";
+		}
+		else
+		{
+			return "RInputOreDict<" + amount + "x" + input + "@" + meta + ">";
 		}
 	}
 
-	private List<ItemStack> getOres() {
-		if (ores != null) return ores;
+	private List<ItemStack> getOres()
+	{
+		if(ores != null)
+		{
+			return ores;
+		}
 
 		// cache the ore list by making use of the fact that forge always uses the same list,
 		// unless it's EMPTY_LIST, which should never happen.
-		List<ItemStack> ret = OreDictionary.getOres(input);
+		final List<ItemStack> ret = OreDictionary.getOres(input);
 
-		if (ret != OreDictionary.EMPTY_LIST) ores = ret;
+		if(ret != OreDictionary.EMPTY_LIST)
+		{
+			ores = ret;
+		}
 
 		return ret;
 	}
 
-	public final String input;
-	public final int amount;
-	public final Integer meta;
-	private List<ItemStack> ores;
+	public final String		input;
+	public final int		amount;
+	public final Integer	meta;
+	private List<ItemStack>	ores;
 }
diff --git a/src/api/java/ic2/api/recipe/RecipeOutput.java b/src/api/java/ic2/api/recipe/RecipeOutput.java
index 80ad5fb..aa7839d 100644
--- a/src/api/java/ic2/api/recipe/RecipeOutput.java
+++ b/src/api/java/ic2/api/recipe/RecipeOutput.java
@@ -7,33 +7,42 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public final class RecipeOutput {
-	public RecipeOutput(NBTTagCompound metadata1, List<ItemStack> items1) {
+public final class RecipeOutput
+{
+	public RecipeOutput(NBTTagCompound metadata1, List<ItemStack> items1)
+	{
 		assert !items1.contains(null);
 
-		this.metadata = metadata1;
-		this.items = items1;
+		metadata = metadata1;
+		items = items1;
 	}
 
-	public RecipeOutput(NBTTagCompound metadata1, ItemStack... items1) {
+	public RecipeOutput(NBTTagCompound metadata1, ItemStack... items1)
+	{
 		this(metadata1, Arrays.asList(items1));
 	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof RecipeOutput) {
-			RecipeOutput ro = (RecipeOutput) obj;
-
-			if (items.size() == ro.items.size() &&
-					(metadata == null && ro.metadata == null || metadata != null && ro.metadata != null && metadata.equals(ro.metadata))) {
-				Iterator<ItemStack> itA = items.iterator();
-				Iterator<ItemStack> itB = ro.items.iterator();
-
-				while (itA.hasNext() && itB.hasNext()) {
-					ItemStack stackA = itA.next();
-					ItemStack stackB = itB.next();
-
-					if (ItemStack.areItemStacksEqual(stackA, stackB)) return false;
+	public boolean equals(Object obj)
+	{
+		if(obj instanceof RecipeOutput)
+		{
+			final RecipeOutput ro = (RecipeOutput) obj;
+
+			if(items.size() == ro.items.size() && (metadata == null && ro.metadata == null || metadata != null && ro.metadata != null && metadata.equals(ro.metadata)))
+			{
+				final Iterator<ItemStack> itA = items.iterator();
+				final Iterator<ItemStack> itB = ro.items.iterator();
+
+				while(itA.hasNext() && itB.hasNext())
+				{
+					final ItemStack stackA = itA.next();
+					final ItemStack stackB = itB.next();
+
+					if(ItemStack.areItemStacksEqual(stackA, stackB))
+					{
+						return false;
+					}
 				}
 
 				return true;
@@ -44,10 +53,11 @@ public final class RecipeOutput {
 	}
 
 	@Override
-	public String toString() {
-		return "ROutput<"+items+","+metadata+">";
+	public String toString()
+	{
+		return "ROutput<" + items + "," + metadata + ">";
 	}
 
-	public final List<ItemStack> items;
-	public final NBTTagCompound metadata;
+	public final List<ItemStack>	items;
+	public final NBTTagCompound		metadata;
 }
diff --git a/src/api/java/ic2/api/recipe/Recipes.java b/src/api/java/ic2/api/recipe/Recipes.java
index 0aa0b75..0bcc71b 100644
--- a/src/api/java/ic2/api/recipe/Recipes.java
+++ b/src/api/java/ic2/api/recipe/Recipes.java
@@ -1,25 +1,25 @@
 package ic2.api.recipe;
 
-
 /**
  * General recipe registry.
  *
  * @author Richard
  */
-public class Recipes {
-	public static IMachineRecipeManager macerator;
-	public static IMachineRecipeManager extractor;
-	public static IMachineRecipeManager compressor;
-	public static IMachineRecipeManager centrifuge;
-	public static IMachineRecipeManager blockcutter;
-	public static IMachineRecipeManager blastfurance;
-	public static IMachineRecipeManager recycler;
-	public static IMachineRecipeManager metalformerExtruding;
-	public static IMachineRecipeManager metalformerCutting;
-	public static IMachineRecipeManager metalformerRolling;
-	public static IMachineRecipeManager oreWashing;
-	public static ICannerBottleRecipeManager cannerBottle;
-	public static ICannerEnrichRecipeManager cannerEnrich;
+public class Recipes
+{
+	public static IMachineRecipeManager			macerator;
+	public static IMachineRecipeManager			extractor;
+	public static IMachineRecipeManager			compressor;
+	public static IMachineRecipeManager			centrifuge;
+	public static IMachineRecipeManager			blockcutter;
+	public static IMachineRecipeManager			blastfurance;
+	public static IMachineRecipeManager			recycler;
+	public static IMachineRecipeManager			metalformerExtruding;
+	public static IMachineRecipeManager			metalformerCutting;
+	public static IMachineRecipeManager			metalformerRolling;
+	public static IMachineRecipeManager			oreWashing;
+	public static ICannerBottleRecipeManager	cannerBottle;
+	public static ICannerEnrichRecipeManager	cannerEnrich;
 
 	/**
 	 * Reference amplifier values:
@@ -33,7 +33,7 @@ public class Recipes {
 	 * nbt.setInteger("amplification", aValue);
 	 * matterAmplifier.addRecipe(yourStack, nbt);
 	 */
-	public static IMachineRecipeManager matterAmplifier;
+	public static IMachineRecipeManager			matterAmplifier;
 	/**
 	 * Reference scrap box chance values:
 	 *
@@ -46,23 +46,23 @@ public class Recipes {
 	 * 4.0: Stick
 	 * 5.0: Dirt, Wooden Hoe
 	 */
-	public static IScrapboxManager scrapboxDrops;
-	public static IListRecipeManager recyclerBlacklist;
+	public static IScrapboxManager				scrapboxDrops;
+	public static IListRecipeManager			recyclerBlacklist;
 	/**
 	 * Do not add anything to this Whitelist. This is for Configuration only.
 	 * You may need this if you have an own Recycler in your Mod, just to check if something can be recycled. but don't add anything to this List
 	 */
-	public static IListRecipeManager recyclerWhitelist;
-	public static ICraftingRecipeManager advRecipes;
+	public static IListRecipeManager			recyclerWhitelist;
+	public static ICraftingRecipeManager		advRecipes;
 
-	public static ISemiFluidFuelManager semiFluidGenerator;
-	public static IFluidHeatManager FluidHeatGenerator;
+	public static ISemiFluidFuelManager			semiFluidGenerator;
+	public static IFluidHeatManager				FluidHeatGenerator;
 	/**
 	 * Used by the Liquid Heat Exchanger to cool down liquids and determine the amount of hu generated for every mb.
 	 */
-	public static ILiquidHeatExchangerManager liquidCooldownManager;
+	public static ILiquidHeatExchangerManager	liquidCooldownManager;
 	/**
 	 * Opposite of {@link #liquidCooldownManager}. This is for Liquids that can be heated up again.
 	 */
-	public static ILiquidHeatExchangerManager liquidHeatupManager;
+	public static ILiquidHeatExchangerManager	liquidHeatupManager;
 }
diff --git a/src/api/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java
index 44e70e7..4974eb1 100644
--- a/src/api/java/ic2/api/recipe/package-info.java
+++ b/src/api/java/ic2/api/recipe/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.recipe;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/tile/ExplosionWhitelist.java b/src/api/java/ic2/api/tile/ExplosionWhitelist.java
index fa4a474..ea3217b 100644
--- a/src/api/java/ic2/api/tile/ExplosionWhitelist.java
+++ b/src/api/java/ic2/api/tile/ExplosionWhitelist.java
@@ -13,35 +13,38 @@ import net.minecraft.block.Block;
  * invulnerable reactor chambers. Said blocks will not shield the explosion and won't get
  * destroyed.
  */
-public final class ExplosionWhitelist {
+public final class ExplosionWhitelist
+{
 	/**
 	 * Add a block to the whitelist.
 	 * 
 	 * @param block block to add
 	 */
-	public static void addWhitelistedBlock(Block block) {
+	public static void addWhitelistedBlock(Block block)
+	{
 		whitelist.add(block);
 	}
-	
+
 	/**
 	 * Remove a block from the whitelist.
 	 * 
 	 * @param block block to remove
 	 */
-	public static void removeWhitelistedBlock(Block block) {
+	public static void removeWhitelistedBlock(Block block)
+	{
 		whitelist.remove(block);
 	}
-	
+
 	/**
 	 * Check if a block is on the whitelist.
 	 * 
 	 * @param block block to check if whitelisted
 	 * @return Whether the block is whitelisted
 	 */
-	public static boolean isBlockWhitelisted(Block block) {
+	public static boolean isBlockWhitelisted(Block block)
+	{
 		return whitelist.contains(block);
 	}
 
-	private static Set<Block> whitelist = new HashSet<Block>();
+	private static Set<Block>	whitelist	= new HashSet<Block>();
 }
-
diff --git a/src/api/java/ic2/api/tile/IEnergyStorage.java b/src/api/java/ic2/api/tile/IEnergyStorage.java
index 68f4270..c2ee2e4 100644
--- a/src/api/java/ic2/api/tile/IEnergyStorage.java
+++ b/src/api/java/ic2/api/tile/IEnergyStorage.java
@@ -5,7 +5,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 /**
  * Interface implemented by the tile entity of energy storage blocks.
  */
-public interface IEnergyStorage {
+public interface IEnergyStorage
+{
 	/**
 	 * Get the amount of energy currently stored in the block.
 	 * 
diff --git a/src/api/java/ic2/api/tile/IWrenchable.java b/src/api/java/ic2/api/tile/IWrenchable.java
index 8fcbea5..bd2f3f5 100644
--- a/src/api/java/ic2/api/tile/IWrenchable.java
+++ b/src/api/java/ic2/api/tile/IWrenchable.java
@@ -6,7 +6,8 @@ import net.minecraft.item.ItemStack;
 /**
  * Allows a tile entity to make use of the wrench's removal and rotation functions.
  */
-public interface IWrenchable {
+public interface IWrenchable
+{
 	/**
 	 * Determine if the wrench can be used to set the block's facing.
 	 * Called before wrenchCanRemove().
@@ -58,4 +59,3 @@ public interface IWrenchable {
 	 */
 	ItemStack getWrenchDrop(EntityPlayer entityPlayer);
 }
-
diff --git a/src/api/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java
index 5ebc76e..26c013a 100644
--- a/src/api/java/ic2/api/tile/package-info.java
+++ b/src/api/java/ic2/api/tile/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.tile;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/ic2/api/util/IKeyboard.java b/src/api/java/ic2/api/util/IKeyboard.java
index ff6eaea..b71a5e4 100644
--- a/src/api/java/ic2/api/util/IKeyboard.java
+++ b/src/api/java/ic2/api/util/IKeyboard.java
@@ -2,13 +2,21 @@ package ic2.api.util;
 
 import net.minecraft.entity.player.EntityPlayer;
 
-public interface IKeyboard {
+public interface IKeyboard
+{
 	boolean isAltKeyDown(EntityPlayer player);
+
 	boolean isBoostKeyDown(EntityPlayer player);
+
 	boolean isForwardKeyDown(EntityPlayer player);
+
 	boolean isJumpKeyDown(EntityPlayer player);
+
 	boolean isModeSwitchKeyDown(EntityPlayer player);
+
 	boolean isSideinventoryKeyDown(EntityPlayer player);
+
 	boolean isHudModeKeyDown(EntityPlayer player);
+
 	boolean isSneakKeyDown(EntityPlayer player);
 }
diff --git a/src/api/java/ic2/api/util/Keys.java b/src/api/java/ic2/api/util/Keys.java
index 84d1756..7493868 100644
--- a/src/api/java/ic2/api/util/Keys.java
+++ b/src/api/java/ic2/api/util/Keys.java
@@ -1,6 +1,6 @@
 package ic2.api.util;
 
-
-public class Keys {
-	public static IKeyboard instance;
-}
\ No newline at end of file
+public class Keys
+{
+	public static IKeyboard	instance;
+}
diff --git a/src/api/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java
index 4dd2d93..3207c5b 100644
--- a/src/api/java/ic2/api/util/package-info.java
+++ b/src/api/java/ic2/api/util/package-info.java
@@ -1,4 +1,5 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
+@API(apiVersion = "1.0", owner = "IC2", provides = "IC2API")
 package ic2.api.util;
+
 import cpw.mods.fml.common.API;
 
diff --git a/src/api/java/invtweaks/api/container/ChestContainer.java b/src/api/java/invtweaks/api/container/ChestContainer.java
index dc27377..7a921fd 100644
--- a/src/api/java/invtweaks/api/container/ChestContainer.java
+++ b/src/api/java/invtweaks/api/container/ChestContainer.java
@@ -11,28 +11,31 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface ChestContainer {
-    // Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
-    boolean showButtons() default true;
+public @interface ChestContainer
+{
+	// Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
+	boolean showButtons() default true;
 
-    // Size of a chest row
-    int rowSize() default 9;
+	// Size of a chest row
+	int rowSize() default 9;
 
-    // Uses 'large chest' mode for sorting buttons
-    // (Renders buttons vertically down the right side of the GUI)
-    boolean isLargeChest() default false;
+	// Uses 'large chest' mode for sorting buttons
+	// (Renders buttons vertically down the right side of the GUI)
+	boolean isLargeChest() default false;
 
-    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
-    // Signature int func()
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface RowSizeCallback {
-    }
+	// Annotation for method to get size of a chest row if it is not a fixed size for this container class
+	// Signature int func()
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	public @interface RowSizeCallback
+	{
+	}
 
-    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
-    // Signature int func()
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface IsLargeCallback {
-    }
-}
\ No newline at end of file
+	// Annotation for method to get size of a chest row if it is not a fixed size for this container class
+	// Signature int func()
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	public @interface IsLargeCallback
+	{
+	}
+}
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaBlock.java b/src/api/java/mcp/mobius/waila/api/IWailaBlock.java
index 8b4dd13..181f938 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaBlock.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaBlock.java
@@ -5,18 +5,19 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 
 @Deprecated
-public interface IWailaBlock {
+public interface IWailaBlock
+{
 	/*
 	 *  Use this method to return an item stack in case the default lookup system fails.
 	 *  Return null if you want to use the default lookup system.
 	 *  You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities
 	 */
-	ItemStack    getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
+	ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	/* Waila HUD is divided into 3 zones. The head corresponds to the item name, 
 	 * body to where you mostly want to put informations, and I reserve the tail for modname display 
-	 */ 
-	
+	 */
+
 	/* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD.
 	 * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack().
 	 * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info.
@@ -27,8 +28,10 @@ public interface IWailaBlock {
 	 * 
 	 * Always return the currenttip is you don't want to modify the current zone.
 	 */
-	
+
 	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java
index 935d475..093d044 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java
@@ -2,8 +2,9 @@ package mcp.mobius.waila.api;
 
 import net.minecraft.item.ItemStack;
 
-public interface IWailaBlockDecorator {
+public interface IWailaBlockDecorator
+{
+
+	void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config);
 
-	void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config);	
-	
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java
index faede63..94e08d6 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java
@@ -3,13 +3,14 @@ package mcp.mobius.waila.api;
 import java.util.HashMap;
 import java.util.Set;
 
-public interface IWailaConfigHandler {
+public interface IWailaConfigHandler
+{
 	/* Returns a set of all the currently loaded modules in the config handler */
 	public Set<String> getModuleNames();
-	
+
 	/* Returns all the currently available options for a given module */
 	public HashMap<String, String> getConfigKeys(String modName);
-	
+
 	/* Add a new option to a given module 
 	 * 
 	 * modName is the name of the module to add the option to (ie : Buildcraft, IndustrialCraft2, etc)
@@ -17,12 +18,12 @@ public interface IWailaConfigHandler {
 	 * name is the human readable name of the option (ie : "Tank content", "Max EU Input")
 	 * */
 	//public void addConfig(String modName, String key, String name);
-	
+
 	/* Returns the current value of an option (true/false) with a default value defvalue if not set*/
 	public boolean getConfig(String key, boolean defvalue);
-	
-	/* Returns the current value of an option (true/false) with a default value true if not set*/	
-	public boolean getConfig(String key);	
-	
+
+	/* Returns the current value of an option (true/false) with a default value true if not set*/
+	public boolean getConfig(String key);
+
 	//public void setConfig(String key, boolean value);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java
index 0288624..9d0a6fb 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java
@@ -15,19 +15,32 @@ import net.minecraftforge.common.util.ForgeDirection;
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).
  */
 
-public interface IWailaDataAccessor {
-		
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	Block        		 getBlock();
-	int          		 getBlockID();
-	int          		 getMetadata();
-	TileEntity           getTileEntity();
+public interface IWailaDataAccessor
+{
+
+	World getWorld();
+
+	EntityPlayer getPlayer();
+
+	Block getBlock();
+
+	int getBlockID();
+
+	int getMetadata();
+
+	TileEntity getTileEntity();
+
 	MovingObjectPosition getPosition();
-	Vec3                 getRenderingPosition();
-	NBTTagCompound       getNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
-	ForgeDirection       getSide();
-	ItemStack            getStack();
+
+	Vec3 getRenderingPosition();
+
+	NBTTagCompound getNBTData();
+
+	int getNBTInteger(NBTTagCompound tag, String keyname);
+
+	double getPartialFrame();
+
+	ForgeDirection getSide();
+
+	ItemStack getStack();
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java
index 4859d9c..f0c886b 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java
@@ -4,18 +4,19 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-public interface IWailaDataProvider{
+public interface IWailaDataProvider
+{
 	/*
 	 *  Use this method to return an item stack in case the default lookup system fails.
 	 *  Return null if you want to use the default lookup system.
 	 *  You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities
 	 */
-	ItemStack    getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
+	ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	/* Waila HUD is divided into 3 zones. The head corresponds to the item name, 
 	 * body to where you mostly want to put informations, and I reserve the tail for modname display 
-	 */ 
-	
+	 */
+
 	/* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD.
 	 * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack().
 	 * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info.
@@ -26,8 +27,10 @@ public interface IWailaDataProvider{
 	 * 
 	 * Always return the currenttip is you don't want to modify the current zone.
 	 */
-	
+
 	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java
index 788067a..62e3352 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java
@@ -12,13 +12,21 @@ import net.minecraft.world.World;
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).
  */
 
-public interface IWailaEntityAccessor {
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	Entity               getEntity();
+public interface IWailaEntityAccessor
+{
+	World getWorld();
+
+	EntityPlayer getPlayer();
+
+	Entity getEntity();
+
 	MovingObjectPosition getPosition();
-	Vec3                 getRenderingPosition();
-	NBTTagCompound       getNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
+
+	Vec3 getRenderingPosition();
+
+	NBTTagCompound getNBTData();
+
+	int getNBTInteger(NBTTagCompound tag, String keyname);
+
+	double getPartialFrame();
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java
index 9548289..a7fe7a2 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java
@@ -4,13 +4,16 @@ import java.util.List;
 
 import net.minecraft.entity.Entity;
 
-public interface IWailaEntityProvider {
-	
+public interface IWailaEntityProvider
+{
+
 	/* A way to get an override on the entity returned by the raytracing */
 	Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config);
-	
+
 	/* The classical HEAD/BODY/TAIL text getters */
 	List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java
index 19e01fa..a885ea7 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java
@@ -1,7 +1,6 @@
 package mcp.mobius.waila.api;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
@@ -13,15 +12,25 @@ import net.minecraft.world.World;
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).
  */
 
-public interface IWailaFMPAccessor {
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	TileEntity           getTileEntity();
+public interface IWailaFMPAccessor
+{
+	World getWorld();
+
+	EntityPlayer getPlayer();
+
+	TileEntity getTileEntity();
+
 	MovingObjectPosition getPosition();
-	NBTTagCompound       getNBTData();
-	NBTTagCompound       getFullNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
-	Vec3                 getRenderingPosition();
-	String               getID();
+
+	NBTTagCompound getNBTData();
+
+	NBTTagCompound getFullNBTData();
+
+	int getNBTInteger(NBTTagCompound tag, String keyname);
+
+	double getPartialFrame();
+
+	Vec3 getRenderingPosition();
+
+	String getID();
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java
index 839af31..64d6e30 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java
@@ -2,6 +2,7 @@ package mcp.mobius.waila.api;
 
 import net.minecraft.item.ItemStack;
 
-public interface IWailaFMPDecorator {
-	void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config);	
+public interface IWailaFMPDecorator
+{
+	void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java
index 232c83e..08f0ca3 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java
@@ -4,9 +4,12 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-public interface IWailaFMPProvider {
+public interface IWailaFMPProvider
+{
 	/* The classical HEAD/BODY/TAIL text getters */
 	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
+
 	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java
index 162aeb6..8414a81 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java
@@ -1,35 +1,47 @@
 package mcp.mobius.waila.api;
 
-public interface IWailaRegistrar {
+public interface IWailaRegistrar
+{
 	/* Add a config option in the section modname with displayed text configtext and access key keyname */
 	public void addConfig(String modname, String keyname, String configtext);
-	public void addConfigRemote(String modname, String keyname, String configtext);	
+
+	public void addConfigRemote(String modname, String keyname, String configtext);
+
 	public void addConfig(String modname, String keyname);
-	public void addConfigRemote(String modname, String keyname);	
-	
+
+	public void addConfigRemote(String modname, String keyname);
+
 	/* Register a stack overrider for the given blockID */
-	public void registerStackProvider(IWailaDataProvider dataProvider, Class block);	
-	
+	public void registerStackProvider(IWailaDataProvider dataProvider, Class block);
+
 	/* Same thing, but works on a class hierarchy instead */
-	public void registerHeadProvider (IWailaDataProvider dataProvider, Class block);
-	public void registerBodyProvider (IWailaDataProvider dataProvider, Class block);
-	public void registerTailProvider (IWailaDataProvider dataProvider, Class block);	
+	public void registerHeadProvider(IWailaDataProvider dataProvider, Class block);
+
+	public void registerBodyProvider(IWailaDataProvider dataProvider, Class block);
+
+	public void registerTailProvider(IWailaDataProvider dataProvider, Class block);
 
 	/* Entity text registration methods */
-	public void registerHeadProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerBodyProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerTailProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity);
-	
+	public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity);
+
+	public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity);
+
+	public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity);
+
+	public void registerOverrideEntityProvider(IWailaEntityProvider dataProvider, Class entity);
+
 	/* FMP Providers */
 	public void registerHeadProvider(IWailaFMPProvider dataProvider, String name);
+
 	public void registerBodyProvider(IWailaFMPProvider dataProvider, String name);
+
 	public void registerTailProvider(IWailaFMPProvider dataProvider, String name);
-	
+
 	/* The block decorators */
-	public void registerDecorator (IWailaBlockDecorator decorator, Class block);
-	public void registerDecorator (IWailaFMPDecorator decorator,   String name);	
-	
+	public void registerDecorator(IWailaBlockDecorator decorator, Class block);
+
+	public void registerDecorator(IWailaFMPDecorator decorator, String name);
+
 	/* Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent).  
 	 * Accept * as a ending wildcard 
 	 * registerNBTKey("bob.*", MyBlock.class)
@@ -39,6 +51,7 @@ public interface IWailaRegistrar {
 	public void registerSyncedNBTKey(String key, Class target);
 
 	/* UNUSED FOR NOW (Will be used for the ingame wiki */
-	public void registerDocTextFile  (String filename);
-	public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item);
+	public void registerDocTextFile(String filename);
+
+	public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java
index f790649..3d7a349 100644
--- a/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java
+++ b/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java
@@ -4,9 +4,10 @@ import java.util.LinkedHashMap;
 
 import net.minecraft.item.ItemStack;
 
-public interface IWailaSummaryProvider {
+public interface IWailaSummaryProvider
+{
 	/* This interface is used to control the display data in the description screen */
-	
+
 	/* BASIC TOOLS & ITEMS DATA */
 	//EnumToolMaterial getMaterial(ItemStack stack);
 	//String getMaterialName(ItemStack stack);
@@ -16,6 +17,6 @@ public interface IWailaSummaryProvider {
 	//int getEnchantability(ItemStack stack);
 	//int getDamageVsEntity(ItemStack stack);
 	//int getDurability(ItemStack stack);
-	
+
 	LinkedHashMap<String, String> getSummary(ItemStack stack, LinkedHashMap<String, String> currentSummary, IWailaConfigHandler config);
 }
diff --git a/src/api/java/mcp/mobius/waila/api/SpecialChars.java b/src/api/java/mcp/mobius/waila/api/SpecialChars.java
index 5bd92a8..a987a15 100644
--- a/src/api/java/mcp/mobius/waila/api/SpecialChars.java
+++ b/src/api/java/mcp/mobius/waila/api/SpecialChars.java
@@ -1,40 +1,41 @@
 package mcp.mobius.waila.api;
 
-public class SpecialChars {
+public class SpecialChars
+{
 
-	public static String MCStyle  = "\u00A7";
-	
-	public static String BLACK    = MCStyle + "0";
-	public static String DBLUE    = MCStyle + "1";
-	public static String DGREEN   = MCStyle + "2";
-	public static String DAQUA    = MCStyle + "3";
-	public static String DRED     = MCStyle + "4";
-	public static String DPURPLE  = MCStyle + "5";
-	public static String GOLD     = MCStyle + "6";
-	public static String GRAY     = MCStyle + "7";
-	public static String DGRAY    = MCStyle + "8";
-	public static String BLUE     = MCStyle + "9";
-	public static String GREEN    = MCStyle + "a";
-	public static String AQUA     = MCStyle + "b";
-	public static String RED      = MCStyle + "c";
-	public static String LPURPLE  = MCStyle + "d";
-	public static String YELLOW   = MCStyle + "e";
-	public static String WHITE    = MCStyle + "f";	
-	
-	public static String OBF      = MCStyle + "k";
-	public static String BOLD     = MCStyle + "l";
-	public static String STRIKE   = MCStyle + "m";
-	public static String UNDER    = MCStyle + "n";
-	public static String ITALIC   = MCStyle + "o";
-	public static String RESET    = MCStyle + "r";		
+	public static String	MCStyle		= "\u00A7";
+
+	public static String	BLACK		= MCStyle + "0";
+	public static String	DBLUE		= MCStyle + "1";
+	public static String	DGREEN		= MCStyle + "2";
+	public static String	DAQUA		= MCStyle + "3";
+	public static String	DRED		= MCStyle + "4";
+	public static String	DPURPLE		= MCStyle + "5";
+	public static String	GOLD		= MCStyle + "6";
+	public static String	GRAY		= MCStyle + "7";
+	public static String	DGRAY		= MCStyle + "8";
+	public static String	BLUE		= MCStyle + "9";
+	public static String	GREEN		= MCStyle + "a";
+	public static String	AQUA		= MCStyle + "b";
+	public static String	RED			= MCStyle + "c";
+	public static String	LPURPLE		= MCStyle + "d";
+	public static String	YELLOW		= MCStyle + "e";
+	public static String	WHITE		= MCStyle + "f";
+
+	public static String	OBF			= MCStyle + "k";
+	public static String	BOLD		= MCStyle + "l";
+	public static String	STRIKE		= MCStyle + "m";
+	public static String	UNDER		= MCStyle + "n";
+	public static String	ITALIC		= MCStyle + "o";
+	public static String	RESET		= MCStyle + "r";
+
+	public static String	WailaStyle	= "\u00A4";
+	public static String	WailaIcon	= "\u00A5";
+	public static String	TAB			= WailaStyle + WailaStyle + "a";
+	public static String	ALIGNRIGHT	= WailaStyle + WailaStyle + "b";
+	public static String	ALIGNCENTER	= WailaStyle + WailaStyle + "c";
+	public static String	HEART		= WailaStyle + WailaIcon + "a";
+	public static String	HHEART		= WailaStyle + WailaIcon + "b";
+	public static String	EHEART		= WailaStyle + WailaIcon + "c";
 
-	public static String WailaStyle     = "\u00A4";
-	public static String WailaIcon      = "\u00A5";
-	public static String TAB         = WailaStyle + WailaStyle +"a";
-	public static String ALIGNRIGHT  = WailaStyle + WailaStyle +"b";
-	public static String ALIGNCENTER = WailaStyle + WailaStyle +"c";	
-	public static String HEART       = WailaStyle + WailaIcon  +"a";
-	public static String HHEART      = WailaStyle + WailaIcon  +"b";
-	public static String EHEART      = WailaStyle + WailaIcon  +"c";
-	
 }
diff --git a/src/api/java/mcp/mobius/waila/api/package-info.java b/src/api/java/mcp/mobius/waila/api/package-info.java
index 9b5e663..82cf044 100644
--- a/src/api/java/mcp/mobius/waila/api/package-info.java
+++ b/src/api/java/mcp/mobius/waila/api/package-info.java
@@ -1,3 +1,5 @@
-@API(apiVersion="1.0",owner="Waila",provides="WailaAPI")
+@API(apiVersion = "1.0", owner = "Waila", provides = "WailaAPI")
 package mcp.mobius.waila.api;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/Chunk3D.java b/src/api/java/mekanism/api/Chunk3D.java
index f469d5d..11c758f 100644
--- a/src/api/java/mekanism/api/Chunk3D.java
+++ b/src/api/java/mekanism/api/Chunk3D.java
@@ -13,11 +13,11 @@ import net.minecraft.world.chunk.Chunk;
  */
 public class Chunk3D
 {
-	public int dimensionId;
-	
-	public int xCoord;
-	public int zCoord;
-	
+	public int	dimensionId;
+
+	public int	xCoord;
+	public int	zCoord;
+
 	/**
 	 * Creates a Chunk3D object from the given x and z coordinates, as well as a dimension.
 	 * @param x - chunk x location
@@ -28,22 +28,22 @@ public class Chunk3D
 	{
 		xCoord = x;
 		zCoord = z;
-		
+
 		dimensionId = dimension;
 	}
-	
+
 	/**
 	 * Creates a Chunk3D from an entity based on it's location and dimension.
 	 * @param entity - the entity to get the Chunk3D object from
 	 */
 	public Chunk3D(Entity entity)
 	{
-		xCoord = ((int)entity.posX) >> 4;
-		zCoord = ((int)entity.posZ) >> 4;
-		
+		xCoord = ((int) entity.posX) >> 4;
+		zCoord = ((int) entity.posZ) >> 4;
+
 		dimensionId = entity.dimension;
 	}
-	
+
 	/**
 	 * Creates a Chunk3D from a Coord4D based on it's coordinates and dimension.
 	 * @param coord - the Coord4D object to get this Chunk3D from
@@ -52,10 +52,10 @@ public class Chunk3D
 	{
 		xCoord = coord.xCoord >> 4;
 		zCoord = coord.zCoord >> 4;
-		
+
 		dimensionId = coord.dimensionId;
 	}
-	
+
 	/**
 	 * Whether or not this chunk exists in the given world.
 	 * @param world - the world to check in
@@ -65,7 +65,7 @@ public class Chunk3D
 	{
 		return world.getChunkProvider().chunkExists(xCoord, zCoord);
 	}
-	
+
 	/**
 	 * Gets a Chunk object corresponding to this Chunk3D's coordinates.
 	 * @param world - the world to get the Chunk object from
@@ -75,7 +75,7 @@ public class Chunk3D
 	{
 		return world.getChunkFromChunkCoords(xCoord, zCoord);
 	}
-	
+
 	/**
 	 * Returns this Chunk3D in the Minecraft-based ChunkCoordIntPair format.
 	 * @return this Chunk3D as a ChunkCoordIntPair
@@ -84,7 +84,7 @@ public class Chunk3D
 	{
 		return new ChunkCoordIntPair(xCoord, zCoord);
 	}
-	
+
 	@Override
 	public Coord4D clone()
 	{
@@ -100,10 +100,7 @@ public class Chunk3D
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof Chunk3D &&
-				((Chunk3D)obj).xCoord == xCoord &&
-				((Chunk3D)obj).zCoord == zCoord &&
-				((Chunk3D)obj).dimensionId == dimensionId;
+		return obj instanceof Chunk3D && ((Chunk3D) obj).xCoord == xCoord && ((Chunk3D) obj).zCoord == zCoord && ((Chunk3D) obj).dimensionId == dimensionId;
 	}
 
 	@Override
diff --git a/src/api/java/mekanism/api/Coord4D.java b/src/api/java/mekanism/api/Coord4D.java
index 1a0f7e4..57f82ca 100644
--- a/src/api/java/mekanism/api/Coord4D.java
+++ b/src/api/java/mekanism/api/Coord4D.java
@@ -1,7 +1,9 @@
 package mekanism.api;
 
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import io.netty.buffer.ByteBuf;
+
+import java.util.ArrayList;
+
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
@@ -15,8 +17,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.ArrayList;
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 
 /**
  * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes
@@ -26,11 +27,11 @@ import java.util.ArrayList;
  */
 public class Coord4D
 {
-	public int xCoord;
-	public int yCoord;
-	public int zCoord;
+	public int	xCoord;
+	public int	yCoord;
+	public int	zCoord;
 
-	public int dimensionId;
+	public int	dimensionId;
 
 	/**
 	 * Creates a Coord4D WITHOUT a dimensionId. Don't use unless absolutely necessary.
@@ -46,17 +47,17 @@ public class Coord4D
 
 		dimensionId = 0;
 	}
-	
+
 	/**
 	 * Creates a Coord4D from an entity's position, rounded down.
 	 * @param entity - entity to create the Coord4D from
 	 */
 	public Coord4D(Entity entity)
 	{
-		xCoord = (int)entity.posX;
-		yCoord = (int)entity.posY;
-		zCoord = (int)entity.posZ;
-		
+		xCoord = (int) entity.posX;
+		yCoord = (int) entity.posY;
+		zCoord = (int) entity.posZ;
+
 		dimensionId = entity.worldObj.provider.dimensionId;
 	}
 
@@ -100,7 +101,7 @@ public class Coord4D
 	 */
 	public TileEntity getTileEntity(IBlockAccess world)
 	{
-		if(world instanceof World && !exists((World)world))
+		if(world instanceof World && !exists((World) world))
 		{
 			return null;
 		}
@@ -115,11 +116,11 @@ public class Coord4D
 	 */
 	public Block getBlock(IBlockAccess world)
 	{
-		if(world instanceof World && !exists((World)world))
+		if(world instanceof World && !exists((World) world))
 		{
 			return null;
 		}
-		
+
 		return world.getBlock(xCoord, yCoord, zCoord);
 	}
 
@@ -149,7 +150,7 @@ public class Coord4D
 		data.add(zCoord);
 		data.add(dimensionId);
 	}
-	
+
 	/**
 	 * Writes this Coord4D's data to a ByteBuf for packet transfer.
 	 * @param dataStream - the ByteBuf to add the data to
@@ -177,7 +178,7 @@ public class Coord4D
 
 		return this;
 	}
-	
+
 	/**
 	 * Translates this Coord4D by the defined Coord4D's coordinates, regardless of dimension.
 	 * @param coord - coordinates to translate by
@@ -186,7 +187,7 @@ public class Coord4D
 	public Coord4D translate(Coord4D coord)
 	{
 		translate(coord.xCoord, coord.yCoord, coord.zCoord);
-		
+
 		return this;
 	}
 
@@ -208,18 +209,20 @@ public class Coord4D
 	 */
 	public Coord4D getFromSide(ForgeDirection side, int amount)
 	{
-		return new Coord4D(xCoord+(side.offsetX*amount), yCoord+(side.offsetY*amount), zCoord+(side.offsetZ*amount), dimensionId);
+		return new Coord4D(xCoord + (side.offsetX * amount),
+				yCoord + (side.offsetY * amount),
+				zCoord + (side.offsetZ * amount), dimensionId);
 	}
-	
+
 	public ItemStack getStack(IBlockAccess world)
 	{
-		Block block = getBlock(world);
-		
+		final Block block = getBlock(world);
+
 		if(block == null || block == Blocks.air)
 		{
 			return null;
 		}
-		
+
 		return new ItemStack(block, 1, getMetadata(world));
 	}
 
@@ -230,7 +233,9 @@ public class Coord4D
 	 */
 	public static Coord4D get(TileEntity tileEntity)
 	{
-		return new Coord4D(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity.getWorldObj().provider.dimensionId);
+		return new Coord4D(tileEntity.xCoord, tileEntity.yCoord,
+				tileEntity.zCoord,
+				tileEntity.getWorldObj().provider.dimensionId);
 	}
 
 	/**
@@ -238,10 +243,11 @@ public class Coord4D
 	 * @param tag - tag compound to read from
 	 * @return the Coord4D from the tag compound
 	 */
-    public static Coord4D read(NBTTagCompound tag)
-    {
-        return new Coord4D(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"), tag.getInteger("id"));
-    }
+	public static Coord4D read(NBTTagCompound tag)
+	{
+		return new Coord4D(tag.getInteger("x"), tag.getInteger("y"),
+				tag.getInteger("z"), tag.getInteger("id"));
+	}
 
 	/**
 	 * Returns a new Coord4D from a ByteBuf.
@@ -250,7 +256,8 @@ public class Coord4D
 	 */
 	public static Coord4D read(ByteBuf dataStream)
 	{
-		return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
+		return new Coord4D(dataStream.readInt(), dataStream.readInt(),
+				dataStream.readInt(), dataStream.readInt());
 	}
 
 	/**
@@ -260,7 +267,8 @@ public class Coord4D
 	 */
 	public Coord4D difference(Coord4D other)
 	{
-		return new Coord4D(xCoord-other.xCoord, yCoord-other.yCoord, zCoord-other.zCoord, dimensionId);
+		return new Coord4D(xCoord - other.xCoord, yCoord - other.yCoord,
+				zCoord - other.zCoord, dimensionId);
 	}
 
 	/**
@@ -271,9 +279,9 @@ public class Coord4D
 	 */
 	public ForgeDirection sideDifference(Coord4D other)
 	{
-		Coord4D diff = difference(other);
+		final Coord4D diff = difference(other);
 
-		for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
+		for(final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 		{
 			if(side.offsetX == diff.xCoord && side.offsetY == diff.yCoord && side.offsetZ == diff.zCoord)
 			{
@@ -291,10 +299,10 @@ public class Coord4D
 	 */
 	public int distanceTo(Coord4D obj)
 	{
-		int subX = xCoord - obj.xCoord;
-		int subY = yCoord - obj.yCoord;
-		int subZ = zCoord - obj.zCoord;
-		return (int)MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
+		final int subX = xCoord - obj.xCoord;
+		final int subY = yCoord - obj.yCoord;
+		final int subZ = zCoord - obj.zCoord;
+		return (int) MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
 	}
 
 	/**
@@ -305,9 +313,9 @@ public class Coord4D
 	 */
 	public boolean sideVisible(ForgeDirection side, IBlockAccess world)
 	{
-		return world.isAirBlock(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ);
+		return world.isAirBlock(xCoord + side.offsetX, yCoord + side.offsetY, zCoord + side.offsetZ);
 	}
-	
+
 	/**
 	 * Gets a TargetPoint with the defined range from this Coord4D with the appropriate coordinates and dimension ID.
 	 * @param range - the range the packet can be sent in of this Coord4D
@@ -347,7 +355,7 @@ public class Coord4D
 	{
 		return world.getChunkFromBlockCoords(xCoord, zCoord);
 	}
-	
+
 	/**
 	 * Gets the Chunk3D object with chunk coordinates correlating to this Coord4D's location
 	 * @return Chunk3D with correlating chunk coordinates.
@@ -366,7 +374,7 @@ public class Coord4D
 	{
 		return world.isAirBlock(xCoord, yCoord, zCoord);
 	}
-	
+
 	/**
 	 * Whether or not this block this Coord4D represents is replaceable.
 	 * @param world - world this Coord4D is in
@@ -376,14 +384,14 @@ public class Coord4D
 	{
 		return getBlock(world).isReplaceable(world, xCoord, yCoord, zCoord);
 	}
-	
+
 	/**
 	 * Gets a bounding box that contains the area this Coord4D would take up in a world.
 	 * @return this Coord4D's bounding box
 	 */
 	public AxisAlignedBB getBoundingBox()
 	{
-		return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1);
+		return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
 	}
 
 	@Override
@@ -401,11 +409,7 @@ public class Coord4D
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof Coord4D &&
-				((Coord4D)obj).xCoord == xCoord &&
-				((Coord4D)obj).yCoord == yCoord &&
-				((Coord4D)obj).zCoord == zCoord &&
-				((Coord4D)obj).dimensionId == dimensionId;
+		return obj instanceof Coord4D && ((Coord4D) obj).xCoord == xCoord && ((Coord4D) obj).yCoord == yCoord && ((Coord4D) obj).zCoord == zCoord && ((Coord4D) obj).dimensionId == dimensionId;
 	}
 
 	@Override
@@ -418,4 +422,4 @@ public class Coord4D
 		code = 31 * code + dimensionId;
 		return code;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/api/java/mekanism/api/EnumColor.java b/src/api/java/mekanism/api/EnumColor.java
index df9ba74..73d8b61 100644
--- a/src/api/java/mekanism/api/EnumColor.java
+++ b/src/api/java/mekanism/api/EnumColor.java
@@ -9,39 +9,23 @@ import net.minecraft.util.StatCollector;
  */
 public enum EnumColor
 {
-	BLACK("\u00a70", "black", "Black", new int[] {0, 0, 0}, 0),
-	DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] {0, 0, 170}, 4),
-	DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] {0, 170, 0}, 2),
-	DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] {0, 255, 255}, 6),
-	DARK_RED("\u00a74", "darkRed", null, new int[] {170, 0, 0}, -1),
-	PURPLE("\u00a75", "purple", "Purple", new int[] {170, 0, 170}, 5),
-	ORANGE("\u00a76", "orange", "Orange", new int[] {255, 170, 0}, 14),
-	GREY("\u00a77", "grey", "LightGray", new int[] {170, 170, 170}, 7),
-	DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] {85, 85, 85}, 8),
-	INDIGO("\u00a79", "indigo", "LightBlue", new int[] {85, 85, 255}, 12),
-	BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] {85, 255, 85}, 10),
-	AQUA("\u00a7b", "aqua", null, new int[] {85, 255, 255}, -1),
-	RED("\u00a7c", "red", "Red", new int[] {255, 0, 0}, 1),
-	PINK("\u00a7d", "pink", "Magenta", new int[] {255, 85, 255}, 13),
-	YELLOW("\u00a7e", "yellow", "Yellow", new int[] {255, 255, 85}, 11),
-	WHITE("\u00a7f", "white", "White", new int[] {255, 255, 255}, 15),
+	BLACK("\u00a70", "black", "Black", new int[] {0, 0, 0}, 0), DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] {0, 0, 170}, 4), DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] {0, 170, 0}, 2), DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] {0, 255, 255}, 6), DARK_RED("\u00a74", "darkRed", null, new int[] {170, 0, 0}, -1), PURPLE("\u00a75", "purple", "Purple", new int[] {170, 0, 170}, 5), ORANGE("\u00a76", "orange", "Orange", new int[] {255, 170, 0}, 14), GREY("\u00a77", "grey", "LightGray", new int[] {170, 170, 170}, 7), DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] {85, 85, 85}, 8), INDIGO("\u00a79", "indigo", "LightBlue", new int[] {85, 85, 255}, 12), BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] {85, 255, 85}, 10), AQUA("\u00a7b", "aqua", null, new int[] {85, 255, 255}, -1), RED("\u00a7c", "red", "Red", new int[] {255, 0, 0}, 1), PINK("\u00a7d", "pink", "Magenta", new int[] {255, 85, 255}, 13), YELLOW("\u00a7e", "yellow", "Yellow", new int[] {255, 255, 85}, 11), WHITE("\u00a7f", "white", "White", new int[] {255, 255, 255}, 15),
 	//Extras for dye-completeness
-	BROWN("\u00a76", "brown", "Brown", new int[] {150, 75, 0}, 3),
-	BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] {255, 192, 203}, 9);
+	BROWN("\u00a76", "brown", "Brown", new int[] {150, 75, 0}, 3), BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] {255, 192, 203}, 9);
 
-	public static EnumColor[] DYES = new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE};
+	public static EnumColor[]	DYES	= new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE};
 
 	/** The color code that will be displayed */
-	public final String code;
+	public final String			code;
 
-	public final int[] rgbCode;
+	public final int[]			rgbCode;
 
-	public final int mcMeta;
+	public final int			mcMeta;
 
 	/** A friendly name of the color. */
-	public String unlocalizedName;
-	
-	public String dyeName;
+	public String				unlocalizedName;
+
+	public String				dyeName;
 
 	private EnumColor(String s, String n, String dye, int[] rgb, int meta)
 	{
@@ -65,7 +49,7 @@ public enum EnumColor
 	{
 		return StatCollector.translateToLocal("dye." + unlocalizedName);
 	}
-	
+
 	public String getOreDictName()
 	{
 		return dyeName;
@@ -92,7 +76,7 @@ public enum EnumColor
 	 */
 	public float getColor(int index)
 	{
-		return (float)rgbCode[index]/255F;
+		return rgbCode[index] / 255F;
 	}
 
 	/**
diff --git a/src/api/java/mekanism/api/IFilterAccess.java b/src/api/java/mekanism/api/IFilterAccess.java
index abdcf29..7bb2ee3 100644
--- a/src/api/java/mekanism/api/IFilterAccess.java
+++ b/src/api/java/mekanism/api/IFilterAccess.java
@@ -16,13 +16,13 @@ public interface IFilterAccess
 	 * @return the NBTTagCompound that now contains the TileEntity's filter card data
 	 */
 	public NBTTagCompound getFilterData(NBTTagCompound nbtTags);
-	
+
 	/**
 	 * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund.
 	 * @param nbtTags - the NBTTagCompound of the filter card ItemStack
 	 */
 	public void setFilterData(NBTTagCompound nbtTags);
-	
+
 	/**
 	 * A String name of this TileEntity that will be displayed as the type of data on the filter card.
 	 * @return the String name of this TileEntity
diff --git a/src/api/java/mekanism/api/IHeatTransfer.java b/src/api/java/mekanism/api/IHeatTransfer.java
index da682e1..17393f7 100644
--- a/src/api/java/mekanism/api/IHeatTransfer.java
+++ b/src/api/java/mekanism/api/IHeatTransfer.java
@@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 public interface IHeatTransfer
 {
 	/**The value of the zero point of our temperature scale in kelvin*/
-	public static final double AMBIENT_TEMP = 300;
+	public static final double	AMBIENT_TEMP			= 300;
 
 	/**The heat transfer coefficient for air*/
-	public static final double AIR_INVERSE_COEFFICIENT = 10000;
+	public static final double	AIR_INVERSE_COEFFICIENT	= 10000;
 
 	public double getTemp();
 
diff --git a/src/api/java/mekanism/api/ItemRetriever.java b/src/api/java/mekanism/api/ItemRetriever.java
index c2820f0..1b6f4bd 100644
--- a/src/api/java/mekanism/api/ItemRetriever.java
+++ b/src/api/java/mekanism/api/ItemRetriever.java
@@ -13,10 +13,10 @@ import net.minecraft.item.ItemStack;
 public final class ItemRetriever
 {
 	/** The 'MekanismItems' class that items are retrieved from. */
-	private static Class MekanismItems;
-	
+	private static Class	MekanismItems;
+
 	/** The 'MekanismBlocks' class that blocks are retrieved from. */
-	private static Class MekanismBlocks;
+	private static Class	MekanismBlocks;
 
 	/**
 	 * Attempts to retrieve an ItemStack of an item with the declared identifier.
@@ -43,27 +43,31 @@ public final class ItemRetriever
 	 */
 	public static ItemStack getItem(String identifier)
 	{
-		try {
+		try
+		{
 			if(MekanismItems == null)
 			{
 				MekanismItems = Class.forName("mekanism.common.MekanismItems");
 			}
 
-			Object ret = MekanismItems.getField(identifier).get(null);
+			final Object ret = MekanismItems.getField(identifier).get(null);
 
 			if(ret instanceof Item)
 			{
-				return new ItemStack((Item)ret, 1);
+				return new ItemStack((Item) ret, 1);
 			}
-			else {
+			else
+			{
 				return null;
 			}
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error retrieving item with identifier '" + identifier + "': " + e.getMessage());
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Attempts to retrieve an ItemStack of a block with the declared identifier.
 	 *
@@ -89,22 +93,26 @@ public final class ItemRetriever
 	 */
 	public static ItemStack getBlock(String identifier)
 	{
-		try {
+		try
+		{
 			if(MekanismBlocks == null)
 			{
 				MekanismBlocks = Class.forName("mekanism.common.MekanismBlocks");
 			}
 
-			Object ret = MekanismBlocks.getField(identifier).get(null);
+			final Object ret = MekanismBlocks.getField(identifier).get(null);
 
 			if(ret instanceof Block)
 			{
-				return new ItemStack((Block)ret, 1);
+				return new ItemStack((Block) ret, 1);
 			}
-			else {
+			else
+			{
 				return null;
 			}
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error retrieving block with identifier '" + identifier + "': " + e.getMessage());
 			return null;
 		}
diff --git a/src/api/java/mekanism/api/MekanismAPI.java b/src/api/java/mekanism/api/MekanismAPI.java
index abdd6da..cfbdb68 100644
--- a/src/api/java/mekanism/api/MekanismAPI.java
+++ b/src/api/java/mekanism/api/MekanismAPI.java
@@ -4,7 +4,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import mekanism.api.util.BlockInfo;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraftforge.oredict.OreDictionary;
@@ -13,14 +12,14 @@ import cpw.mods.fml.common.eventhandler.Event;
 public class MekanismAPI
 {
 	//Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes
-	private static Set<BlockInfo> cardboardBoxIgnore = new HashSet<BlockInfo>();
-	
+	private static Set<BlockInfo>	cardboardBoxIgnore	= new HashSet<BlockInfo>();
+
 	/** Mekanism debug mode */
-	public static boolean debug = false;
+	public static boolean			debug				= false;
 
 	public static boolean isBlockCompatible(Item item, int meta)
 	{
-		for(BlockInfo i : cardboardBoxIgnore)
+		for(final BlockInfo i : cardboardBoxIgnore)
 		{
 			if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
 			{
@@ -46,5 +45,7 @@ public class MekanismAPI
 		return cardboardBoxIgnore;
 	}
 
-	public static class BoxBlacklistEvent extends Event {}
+	public static class BoxBlacklistEvent extends Event
+	{
+	}
 }
diff --git a/src/api/java/mekanism/api/MekanismConfig.java b/src/api/java/mekanism/api/MekanismConfig.java
index 2f9ea68..81772b1 100644
--- a/src/api/java/mekanism/api/MekanismConfig.java
+++ b/src/api/java/mekanism/api/MekanismConfig.java
@@ -10,76 +10,76 @@ public class MekanismConfig
 {
 	public static class general
 	{
-		public static boolean updateNotifications = true;
-		public static boolean controlCircuitOreDict = true;
-		public static boolean logPackets = false;
-		public static boolean dynamicTankEasterEgg = false;
-		public static boolean voiceServerEnabled = true;
-		public static boolean cardboardSpawners = true;
-		public static boolean enableWorldRegeneration = true;
-		public static boolean creativeOverrideElectricChest = true;
-		public static boolean spawnBabySkeletons = true;
-		public static int obsidianTNTBlastRadius = 12;
-		public static int osmiumPerChunk = 12;
-		public static int copperPerChunk = 16;
-		public static int tinPerChunk = 14;
-		public static int saltPerChunk = 2;
-		public static int obsidianTNTDelay = 100;
-		public static int UPDATE_DELAY = 10;
-		public static int VOICE_PORT = 36123;
-		public static int maxUpgradeMultiplier = 10;
-		public static int userWorldGenVersion = 0;
-		public static double ENERGY_PER_REDSTONE = 10000;
-		public static int ETHENE_BURN_TIME = 40;
-		public static double DISASSEMBLER_USAGE = 10;
-		public static EnergyType activeType = EnergyType.J;
-		public static TempType tempUnit =	TempType.K;
-		public static double TO_IC2;
-		public static double TO_TE;
-		public static double FROM_H2;
-		public static double FROM_IC2;
-		public static double FROM_TE;
-		public static int laserRange;
-		public static double laserEnergyNeededPerHardness;
-		public static double minerSilkMultiplier = 6;
-		public static boolean blacklistIC2;
-		public static boolean blacklistRF;
-		public static boolean destroyDisabledBlocks;
-		public static boolean enableAmbientLighting;
-		public static int ambientLightingLevel;
-		public static boolean prefilledPortableTanks;
-		public static double armoredJetpackDamageRatio;
-		public static int armoredJetpackDamageMax;
-		public static boolean aestheticWorldDamage;
-		public static boolean opsBypassRestrictions;
-		public static double solarEvaporationSpeed;
-		public static int maxJetpackGas;
-		public static int maxScubaGas;
-		public static int maxFlamethrowerGas;
+		public static boolean		updateNotifications				= true;
+		public static boolean		controlCircuitOreDict			= true;
+		public static boolean		logPackets						= false;
+		public static boolean		dynamicTankEasterEgg			= false;
+		public static boolean		voiceServerEnabled				= true;
+		public static boolean		cardboardSpawners				= true;
+		public static boolean		enableWorldRegeneration			= true;
+		public static boolean		creativeOverrideElectricChest	= true;
+		public static boolean		spawnBabySkeletons				= true;
+		public static int			obsidianTNTBlastRadius			= 12;
+		public static int			osmiumPerChunk					= 12;
+		public static int			copperPerChunk					= 16;
+		public static int			tinPerChunk						= 14;
+		public static int			saltPerChunk					= 2;
+		public static int			obsidianTNTDelay				= 100;
+		public static int			UPDATE_DELAY					= 10;
+		public static int			VOICE_PORT						= 36123;
+		public static int			maxUpgradeMultiplier			= 10;
+		public static int			userWorldGenVersion				= 0;
+		public static double		ENERGY_PER_REDSTONE				= 10000;
+		public static int			ETHENE_BURN_TIME				= 40;
+		public static double		DISASSEMBLER_USAGE				= 10;
+		public static EnergyType	activeType						= EnergyType.J;
+		public static TempType		tempUnit						= TempType.K;
+		public static double		TO_IC2;
+		public static double		TO_TE;
+		public static double		FROM_H2;
+		public static double		FROM_IC2;
+		public static double		FROM_TE;
+		public static int			laserRange;
+		public static double		laserEnergyNeededPerHardness;
+		public static double		minerSilkMultiplier				= 6;
+		public static boolean		blacklistIC2;
+		public static boolean		blacklistRF;
+		public static boolean		destroyDisabledBlocks;
+		public static boolean		enableAmbientLighting;
+		public static int			ambientLightingLevel;
+		public static boolean		prefilledPortableTanks;
+		public static double		armoredJetpackDamageRatio;
+		public static int			armoredJetpackDamageMax;
+		public static boolean		aestheticWorldDamage;
+		public static boolean		opsBypassRestrictions;
+		public static double		solarEvaporationSpeed;
+		public static int			maxJetpackGas;
+		public static int			maxScubaGas;
+		public static int			maxFlamethrowerGas;
 	}
 
 	public static class client
 	{
-		public static boolean enablePlayerSounds = true;
-		public static boolean enableMachineSounds = true;
-		public static boolean fancyUniversalCableRender = true;
-		public static boolean holidays = true;
-		public static float baseSoundVolume = 1F;
-		public static boolean machineEffects = true;
-		public static boolean oldTransmitterRender = false;
-		public static boolean replaceSoundsWhenResuming = true;
-		public static boolean renderCTM = true;
+		public static boolean	enablePlayerSounds			= true;
+		public static boolean	enableMachineSounds			= true;
+		public static boolean	fancyUniversalCableRender	= true;
+		public static boolean	holidays					= true;
+		public static float		baseSoundVolume				= 1F;
+		public static boolean	machineEffects				= true;
+		public static boolean	oldTransmitterRender		= false;
+		public static boolean	replaceSoundsWhenResuming	= true;
+		public static boolean	renderCTM					= true;
 	}
-	
+
 	public static class machines
 	{
-		private static Map<String, Boolean> config = new HashMap<String, Boolean>();
-		
+		private static Map<String, Boolean>	config	= new HashMap<String, Boolean>();
+
 		public static boolean isEnabled(String type)
 		{
 			return config.get(type) != null && config.get(type);
 		}
-		
+
 		public static void setEntry(String type, boolean enabled)
 		{
 			config.put(type, enabled);
@@ -88,50 +88,50 @@ public class MekanismConfig
 
 	public static class usage
 	{
-		public static double enrichmentChamberUsage;
-		public static double osmiumCompressorUsage;
-		public static double combinerUsage;
-		public static double crusherUsage;
-		public static double factoryUsage;
-		public static double metallurgicInfuserUsage;
-		public static double purificationChamberUsage;
-		public static double energizedSmelterUsage;
-		public static double digitalMinerUsage;
-		public static double electricPumpUsage;
-		public static double rotaryCondensentratorUsage;
-		public static double oxidationChamberUsage;
-		public static double chemicalInfuserUsage;
-		public static double chemicalInjectionChamberUsage;
-		public static double precisionSawmillUsage;
-		public static double chemicalDissolutionChamberUsage;
-		public static double chemicalWasherUsage;
-		public static double chemicalCrystallizerUsage;
-		public static double seismicVibratorUsage;
-		public static double pressurizedReactionBaseUsage;
-		public static double fluidicPlenisherUsage;
-		public static double laserUsage;
-		public static double gasCentrifugeUsage;
-		public static double heavyWaterElectrolysisUsage;
+		public static double	enrichmentChamberUsage;
+		public static double	osmiumCompressorUsage;
+		public static double	combinerUsage;
+		public static double	crusherUsage;
+		public static double	factoryUsage;
+		public static double	metallurgicInfuserUsage;
+		public static double	purificationChamberUsage;
+		public static double	energizedSmelterUsage;
+		public static double	digitalMinerUsage;
+		public static double	electricPumpUsage;
+		public static double	rotaryCondensentratorUsage;
+		public static double	oxidationChamberUsage;
+		public static double	chemicalInfuserUsage;
+		public static double	chemicalInjectionChamberUsage;
+		public static double	precisionSawmillUsage;
+		public static double	chemicalDissolutionChamberUsage;
+		public static double	chemicalWasherUsage;
+		public static double	chemicalCrystallizerUsage;
+		public static double	seismicVibratorUsage;
+		public static double	pressurizedReactionBaseUsage;
+		public static double	fluidicPlenisherUsage;
+		public static double	laserUsage;
+		public static double	gasCentrifugeUsage;
+		public static double	heavyWaterElectrolysisUsage;
 	}
 
 	public static class generators
 	{
-		public static double advancedSolarGeneration;
-		public static double bioGeneration;
-		public static double heatGeneration;
-		public static double heatGenerationLava;
-		public static double heatGenerationNether;
-		public static double solarGeneration;
+		public static double	advancedSolarGeneration;
+		public static double	bioGeneration;
+		public static double	heatGeneration;
+		public static double	heatGenerationLava;
+		public static double	heatGenerationNether;
+		public static double	solarGeneration;
 
-		public static double windGenerationMin;
-		public static double windGenerationMax;
+		public static double	windGenerationMin;
+		public static double	windGenerationMax;
 
-		public static int windGenerationMinY;
-		public static int windGenerationMaxY;
+		public static int		windGenerationMinY;
+		public static int		windGenerationMaxY;
 	}
 
 	public static class tools
 	{
-		public static double armorSpawnRate;
+		public static double	armorSpawnRate;
 	}
 }
diff --git a/src/api/java/mekanism/api/Pos3D.java b/src/api/java/mekanism/api/Pos3D.java
index 75f83a0..03c5892 100644
--- a/src/api/java/mekanism/api/Pos3D.java
+++ b/src/api/java/mekanism/api/Pos3D.java
@@ -16,22 +16,22 @@ import net.minecraftforge.common.util.ForgeDirection;
  */
 public class Pos3D
 {
-	public double xPos;
-	public double yPos;
-	public double zPos;
+	public double	xPos;
+	public double	yPos;
+	public double	zPos;
 
 	public Pos3D()
 	{
 		this(0, 0, 0);
 	}
-	
+
 	public Pos3D(Vec3 vec)
 	{
 		xPos = vec.xCoord;
 		yPos = vec.yCoord;
 		zPos = vec.zCoord;
 	}
-	
+
 	public Pos3D(MovingObjectPosition mop)
 	{
 		xPos = mop.blockX;
@@ -45,7 +45,7 @@ public class Pos3D
 		yPos = y;
 		zPos = z;
 	}
-	
+
 	public Pos3D(Coord4D coord)
 	{
 		xPos = coord.xCoord;
@@ -70,18 +70,19 @@ public class Pos3D
 	{
 		this(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
 	}
-	
+
 	/**
 	 * Returns a new Pos3D from a tag compound.
 	 * @param tag - tag compound to read from
 	 * @return the Pos3D from the tag compound
 	 */
-    public static Pos3D read(NBTTagCompound tag)
-    {
-        return new Pos3D(tag.getDouble("x"), tag.getDouble("y"), tag.getDouble("z"));
-    }
-    
-    /**
+	public static Pos3D read(NBTTagCompound tag)
+	{
+		return new Pos3D(tag.getDouble("x"), tag.getDouble("y"),
+				tag.getDouble("z"));
+	}
+
+	/**
 	 * Writes this Pos3D's data to an NBTTagCompound.
 	 * @param nbtTags - tag compound to write to
 	 * @return the tag compound with this Pos3D's data
@@ -102,7 +103,7 @@ public class Pos3D
 	 */
 	public Pos3D diff(Pos3D pos)
 	{
-		return new Pos3D(xPos-pos.xPos, yPos-pos.yPos, zPos-pos.zPos);
+		return new Pos3D(xPos - pos.xPos, yPos - pos.yPos, zPos - pos.zPos);
 	}
 
 	/**
@@ -115,15 +116,15 @@ public class Pos3D
 		return new Pos3D(entity.motionX, entity.motionY, entity.motionZ);
 	}
 
-    /**
-     * Creates a new Coord4D representing this Pos3D in the provided dimension.
-     * @param dimensionId - the dimension this Pos3D is in
-     * @return Coord4D representing this Pos3D
-     */
-    public Coord4D getCoord(int dimensionId)
-    {
-        return new Coord4D((int)xPos, (int)yPos, (int)zPos, dimensionId);
-    }
+	/**
+	 * Creates a new Coord4D representing this Pos3D in the provided dimension.
+	 * @param dimensionId - the dimension this Pos3D is in
+	 * @return Coord4D representing this Pos3D
+	 */
+	public Coord4D getCoord(int dimensionId)
+	{
+		return new Coord4D((int) xPos, (int) yPos, (int) zPos, dimensionId);
+	}
 
 	/**
 	 * Centres a block-derived Pos3D
@@ -172,9 +173,18 @@ public class Pos3D
 	 */
 	public Pos3D translateExcludingSide(ForgeDirection direction, double amount)
 	{
-		if(direction.offsetX == 0) xPos += amount;
-		if(direction.offsetY == 0) yPos += amount;
-		if(direction.offsetZ == 0) zPos += amount;
+		if(direction.offsetX == 0)
+		{
+			xPos += amount;
+		}
+		if(direction.offsetY == 0)
+		{
+			yPos += amount;
+		}
+		if(direction.offsetZ == 0)
+		{
+			zPos += amount;
+		}
 
 		return this;
 	}
@@ -186,9 +196,9 @@ public class Pos3D
 	 */
 	public double distance(Pos3D pos)
 	{
-		double subX = xPos - pos.xPos;
-		double subY = yPos - pos.yPos;
-		double subZ = zPos - pos.zPos;
+		final double subX = xPos - pos.xPos;
+		final double subY = yPos - pos.yPos;
+		final double subZ = zPos - pos.zPos;
 		return MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
 	}
 
@@ -199,10 +209,10 @@ public class Pos3D
 	 */
 	public Pos3D rotateYaw(double yaw)
 	{
-		double yawRadians = Math.toRadians(yaw);
+		final double yawRadians = Math.toRadians(yaw);
 
-		double x = xPos;
-		double z = zPos;
+		final double x = xPos;
+		final double z = zPos;
 
 		if(yaw != 0)
 		{
@@ -212,51 +222,51 @@ public class Pos3D
 
 		return this;
 	}
-	
+
 	public Pos3D rotatePitch(double pitch)
 	{
-		double pitchRadians = Math.toRadians(pitch);
-		
-		double y = yPos;
-		double z = zPos;
-		
+		final double pitchRadians = Math.toRadians(pitch);
+
+		final double y = yPos;
+		final double z = zPos;
+
 		if(pitch != 0)
 		{
 			yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians);
 			zPos = z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians);
 		}
-		
+
 		return this;
 	}
-	
+
 	public Pos3D rotate(double yaw, double pitch)
 	{
 		return rotate(yaw, pitch, 0);
 	}
 
-    public Pos3D rotate(double yaw, double pitch, double roll)
-    {
-        double yawRadians = Math.toRadians(yaw);
-        double pitchRadians = Math.toRadians(pitch);
-        double rollRadians = Math.toRadians(roll);
+	public Pos3D rotate(double yaw, double pitch, double roll)
+	{
+		final double yawRadians = Math.toRadians(yaw);
+		final double pitchRadians = Math.toRadians(pitch);
+		final double rollRadians = Math.toRadians(roll);
+
+		final double x = xPos;
+		final double y = yPos;
+		final double z = zPos;
+
+		xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians));
+		zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians));
+		yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians);
 
-        double x = xPos;
-        double y = yPos;
-        double z = zPos;
+		return this;
+	}
 
-        xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians));
-        zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians));
-        yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians);
-        
-        return this;
-    }
-	
 	public Pos3D multiply(Pos3D pos)
 	{
 		xPos *= pos.xPos;
 		yPos *= pos.yPos;
 		zPos *= pos.zPos;
-		
+
 		return this;
 	}
 
@@ -285,7 +295,7 @@ public class Pos3D
 	{
 		return scale(scale, scale, scale);
 	}
-	
+
 	public Pos3D rotate(float angle, Pos3D axis)
 	{
 		return translateMatrix(getRotationMatrix(angle, axis), this);
@@ -293,19 +303,19 @@ public class Pos3D
 
 	public double[] getRotationMatrix(float angle)
 	{
-		double[] matrix = new double[16];
-		Pos3D axis = clone().normalize();
-		
-		double x = axis.xPos;
-		double y = axis.yPos;
-		double z = axis.zPos;
-		
+		final double[] matrix = new double[16];
+		final Pos3D axis = clone().normalize();
+
+		final double x = axis.xPos;
+		final double y = axis.yPos;
+		final double z = axis.zPos;
+
 		angle *= 0.0174532925D;
-		
-		float cos = (float)Math.cos(angle);
-		float ocos = 1.0F - cos;
-		float sin = (float)Math.sin(angle);
-		
+
+		final float cos = (float) Math.cos(angle);
+		final float ocos = 1.0F - cos;
+		final float sin = (float) Math.sin(angle);
+
 		matrix[0] = (x * x * ocos + cos);
 		matrix[1] = (y * x * ocos + z * sin);
 		matrix[2] = (x * z * ocos - y * sin);
@@ -316,20 +326,20 @@ public class Pos3D
 		matrix[9] = (y * z * ocos - x * sin);
 		matrix[10] = (z * z * ocos + cos);
 		matrix[15] = 1.0F;
-		
+
 		return matrix;
 	}
 
 	public static Pos3D translateMatrix(double[] matrix, Pos3D translation)
 	{
-		double x = translation.xPos * matrix[0] + translation.yPos * matrix[1] + translation.zPos * matrix[2] + matrix[3];
-		double y = translation.xPos * matrix[4] + translation.yPos * matrix[5] + translation.zPos * matrix[6] + matrix[7];
-		double z = translation.xPos * matrix[8] + translation.yPos * matrix[9] + translation.zPos * matrix[10] + matrix[11];
-		
+		final double x = translation.xPos * matrix[0] + translation.yPos * matrix[1] + translation.zPos * matrix[2] + matrix[3];
+		final double y = translation.xPos * matrix[4] + translation.yPos * matrix[5] + translation.zPos * matrix[6] + matrix[7];
+		final double z = translation.xPos * matrix[8] + translation.yPos * matrix[9] + translation.zPos * matrix[10] + matrix[11];
+
 		translation.xPos = x;
 		translation.yPos = y;
 		translation.zPos = z;
-		
+
 		return translation;
 	}
 
@@ -337,7 +347,7 @@ public class Pos3D
 	{
 		return axis.getRotationMatrix(angle);
 	}
-	
+
 	public double anglePreNorm(Pos3D pos2)
 	{
 		return Math.acos(dotProduct(pos2));
@@ -347,27 +357,27 @@ public class Pos3D
 	{
 		return Math.acos(pos1.clone().dotProduct(pos2));
 	}
-	
+
 	public double dotProduct(Pos3D pos)
 	{
 		return xPos * pos.xPos + yPos * pos.yPos + zPos * pos.zPos;
 	}
-	
+
 	public Pos3D crossProduct(Pos3D compare)
 	{
 		return clone().toCrossProduct(compare);
 	}
-	
+
 	public Pos3D toCrossProduct(Pos3D compare)
 	{
-		double newX = yPos * compare.zPos - zPos * compare.yPos;
-		double newY = zPos * compare.xPos - xPos * compare.zPos;
-		double newZ = xPos * compare.yPos - yPos * compare.xPos;
-		
+		final double newX = yPos * compare.zPos - zPos * compare.yPos;
+		final double newY = zPos * compare.xPos - xPos * compare.zPos;
+		final double newZ = xPos * compare.yPos - yPos * compare.xPos;
+
 		xPos = newX;
 		yPos = newY;
 		zPos = newZ;
-		
+
 		return this;
 	}
 
@@ -380,7 +390,7 @@ public class Pos3D
 	{
 		return new Pos3D(-yPos, xPos, 0.0D);
 	}
-	
+
 	public Pos3D getPerpendicular()
 	{
 		if(zPos == 0)
@@ -390,39 +400,32 @@ public class Pos3D
 
 		return xCrossProduct();
 	}
-	
+
 	public Pos3D floor()
 	{
 		return new Pos3D(Math.floor(xPos), Math.floor(yPos), Math.floor(zPos));
 	}
 
-    public double getMagnitude()
-    {
-        return Math.sqrt(xPos * xPos + yPos * yPos + zPos * zPos);
-    }
+	public double getMagnitude()
+	{
+		return Math.sqrt(xPos * xPos + yPos * yPos + zPos * zPos);
+	}
 
-    public Pos3D normalize()
-    {
-        double d = getMagnitude();
+	public Pos3D normalize()
+	{
+		final double d = getMagnitude();
 
-        if (d != 0)
-        {
-            this.scale(1 / d);
-        }
+		if(d != 0)
+		{
+			this.scale(1 / d);
+		}
 
-        return this;
-    }
+		return this;
+	}
 
 	public static AxisAlignedBB getAABB(Pos3D pos1, Pos3D pos2)
 	{
-		return AxisAlignedBB.getBoundingBox(
-				Math.min(pos1.xPos, pos2.xPos),
-				Math.min(pos1.yPos, pos2.yPos),
-				Math.min(pos1.zPos, pos2.zPos),
-				Math.max(pos1.xPos, pos2.xPos),
-				Math.max(pos1.yPos, pos2.yPos),
-				Math.max(pos1.zPos, pos2.zPos)
-		);
+		return AxisAlignedBB.getBoundingBox(Math.min(pos1.xPos, pos2.xPos), Math.min(pos1.yPos, pos2.yPos), Math.min(pos1.zPos, pos2.zPos), Math.max(pos1.xPos, pos2.xPos), Math.max(pos1.yPos, pos2.yPos), Math.max(pos1.zPos, pos2.zPos));
 	}
 
 	@Override
@@ -440,10 +443,7 @@ public class Pos3D
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof Pos3D &&
-				((Pos3D)obj).xPos == xPos &&
-				((Pos3D)obj).yPos == yPos &&
-				((Pos3D)obj).zPos == zPos;
+		return obj instanceof Pos3D && ((Pos3D) obj).xPos == xPos && ((Pos3D) obj).yPos == yPos && ((Pos3D) obj).zPos == zPos;
 	}
 
 	@Override
diff --git a/src/api/java/mekanism/api/Range4D.java b/src/api/java/mekanism/api/Range4D.java
index 40905a6..7e4f6ae 100644
--- a/src/api/java/mekanism/api/Range4D.java
+++ b/src/api/java/mekanism/api/Range4D.java
@@ -3,17 +3,17 @@ package mekanism.api;
 import net.minecraft.entity.player.EntityPlayer;
 import cpw.mods.fml.common.FMLCommonHandler;
 
-public class Range4D 
+public class Range4D
 {
-	public int dimensionId;
-	
-	public int xMin;
-	public int yMin;
-	public int zMin;
-	public int xMax;
-	public int yMax;
-	public int zMax;
-	
+	public int	dimensionId;
+
+	public int	xMin;
+	public int	yMin;
+	public int	zMin;
+	public int	xMax;
+	public int	yMax;
+	public int	zMax;
+
 	public Range4D(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dimension)
 	{
 		xMin = minX;
@@ -22,57 +22,57 @@ public class Range4D
 		xMax = maxX;
 		yMax = maxY;
 		zMax = maxZ;
-		
+
 		dimensionId = dimension;
 	}
-	
+
 	public Range4D(Chunk3D chunk)
 	{
-		xMin = chunk.xCoord*16;
+		xMin = chunk.xCoord * 16;
 		yMin = 0;
-		zMin = chunk.zCoord*16;
-		xMax = xMin+16;
+		zMin = chunk.zCoord * 16;
+		xMax = xMin + 16;
 		yMax = 255;
-		zMax = zMin+16;
-		
+		zMax = zMin + 16;
+
 		dimensionId = chunk.dimensionId;
 	}
-	
+
 	public Range4D(Coord4D coord)
 	{
 		xMin = coord.xCoord;
 		yMin = coord.yCoord;
 		zMin = coord.zCoord;
-		
-		xMax = coord.xCoord+1;
-		yMax = coord.yCoord+1;
-		zMax = coord.zCoord+1;
-		
+
+		xMax = coord.xCoord + 1;
+		yMax = coord.yCoord + 1;
+		zMax = coord.zCoord + 1;
+
 		dimensionId = coord.dimensionId;
 	}
-	
+
 	public static Range4D getChunkRange(EntityPlayer player)
 	{
-		int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().getViewDistance();
-		
+		final int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().getViewDistance();
+
 		return new Range4D(new Chunk3D(player)).expandChunks(radius);
 	}
-	
+
 	public Range4D expandChunks(int chunks)
 	{
-		xMin -= chunks*16;
-		xMax += chunks*16;
-		zMin -= chunks*16;
-		zMax += chunks*16;
-		
+		xMin -= chunks * 16;
+		xMax += chunks * 16;
+		zMin -= chunks * 16;
+		zMax += chunks * 16;
+
 		return this;
 	}
-	
+
 	public boolean intersects(Range4D range)
 	{
-		return (xMax+1 - 1.E-05D > range.xMin) && (range.xMax+1 - 1.E-05D > xMin) && (yMax+1 - 1.E-05D > range.yMin) && (range.yMax+1 - 1.E-05D > yMin) && (zMax+1 - 1.E-05D > range.zMin) && (range.zMax+1 - 1.E-05D > zMin);
+		return (xMax + 1 - 1.E-05D > range.xMin) && (range.xMax + 1 - 1.E-05D > xMin) && (yMax + 1 - 1.E-05D > range.yMin) && (range.yMax + 1 - 1.E-05D > yMin) && (zMax + 1 - 1.E-05D > range.zMin) && (range.zMax + 1 - 1.E-05D > zMin);
 	}
-	
+
 	@Override
 	public Range4D clone()
 	{
@@ -88,14 +88,7 @@ public class Range4D
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof Range4D &&
-				((Range4D)obj).xMin == xMin &&
-				((Range4D)obj).yMin == yMin &&
-				((Range4D)obj).zMin == zMin &&
-				((Range4D)obj).xMax == xMax &&
-				((Range4D)obj).yMax == yMax &&
-				((Range4D)obj).zMax == zMax &&
-				((Range4D)obj).dimensionId == dimensionId;
+		return obj instanceof Range4D && ((Range4D) obj).xMin == xMin && ((Range4D) obj).yMin == yMin && ((Range4D) obj).zMin == zMin && ((Range4D) obj).xMax == xMax && ((Range4D) obj).yMax == yMax && ((Range4D) obj).zMax == zMax && ((Range4D) obj).dimensionId == dimensionId;
 	}
 
 	@Override
diff --git a/src/api/java/mekanism/api/TabProxy.java b/src/api/java/mekanism/api/TabProxy.java
index c562c02..a96813c 100644
--- a/src/api/java/mekanism/api/TabProxy.java
+++ b/src/api/java/mekanism/api/TabProxy.java
@@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs;
 public final class TabProxy
 {
 	/** The 'Mekanism' class where the tab instance is stored. */
-	public static Class Mekanism;
+	public static Class	Mekanism;
 
 	/**
 	 * Attempts to get the Mekanism creative tab instance from the 'Mekanism' class. Will return
@@ -20,21 +20,24 @@ public final class TabProxy
 	 */
 	public static CreativeTabs tabMekanism(CreativeTabs preferred)
 	{
-		try {
+		try
+		{
 			if(Mekanism == null)
 			{
 				Mekanism = Class.forName("mekanism.common.Mekanism");
 			}
 
-			Object ret = Mekanism.getField("tabMekanism").get(null);
+			final Object ret = Mekanism.getField("tabMekanism").get(null);
 
 			if(ret instanceof CreativeTabs)
 			{
-				return (CreativeTabs)ret;
+				return (CreativeTabs) ret;
 			}
 
 			return preferred;
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error retrieving Mekanism creative tab.");
 			return preferred;
 		}
diff --git a/src/api/java/mekanism/api/energy/EnergizedItemManager.java b/src/api/java/mekanism/api/energy/EnergizedItemManager.java
index 165bdf6..458c480 100644
--- a/src/api/java/mekanism/api/energy/EnergizedItemManager.java
+++ b/src/api/java/mekanism/api/energy/EnergizedItemManager.java
@@ -16,11 +16,11 @@ public class EnergizedItemManager
 		{
 			if(itemStack.getItem() instanceof IEnergizedItem)
 			{
-				IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem();
+				final IEnergizedItem energizedItem = (IEnergizedItem) itemStack.getItem();
 
 				if(energizedItem.canSend(itemStack))
 				{
-					double energyToUse = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getEnergy(itemStack), amount));
+					final double energyToUse = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getEnergy(itemStack), amount));
 					energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) - energyToUse);
 
 					return energyToUse;
@@ -43,11 +43,11 @@ public class EnergizedItemManager
 		{
 			if(itemStack.getItem() instanceof IEnergizedItem)
 			{
-				IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem();
+				final IEnergizedItem energizedItem = (IEnergizedItem) itemStack.getItem();
 
 				if(energizedItem.canReceive(itemStack))
 				{
-					double energyToSend = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getMaxEnergy(itemStack) - energizedItem.getEnergy(itemStack), amount));
+					final double energyToSend = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getMaxEnergy(itemStack) - energizedItem.getEnergy(itemStack), amount));
 					energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) + energyToSend);
 
 					return energyToSend;
diff --git a/src/api/java/mekanism/api/energy/EnergyStack.java b/src/api/java/mekanism/api/energy/EnergyStack.java
index 3f57621..807262d 100644
--- a/src/api/java/mekanism/api/energy/EnergyStack.java
+++ b/src/api/java/mekanism/api/energy/EnergyStack.java
@@ -5,7 +5,7 @@ package mekanism.api.energy;
  */
 public class EnergyStack
 {
-	public double amount;
+	public double	amount;
 
 	public EnergyStack(double newAmount)
 	{
diff --git a/src/api/java/mekanism/api/energy/package-info.java b/src/api/java/mekanism/api/energy/package-info.java
index 8f3d371..d16dddf 100644
--- a/src/api/java/mekanism/api/energy/package-info.java
+++ b/src/api/java/mekanism/api/energy/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|energy")
 package mekanism.api.energy;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/gas/Gas.java b/src/api/java/mekanism/api/gas/Gas.java
index f05be52..b65353e 100644
--- a/src/api/java/mekanism/api/gas/Gas.java
+++ b/src/api/java/mekanism/api/gas/Gas.java
@@ -13,17 +13,17 @@ import net.minecraftforge.fluids.FluidRegistry;
  */
 public class Gas
 {
-	private String name;
+	private String	name;
 
-	private String unlocalizedName;
+	private String	unlocalizedName;
 
-	private Fluid fluid;
+	private Fluid	fluid;
 
-	private IIcon icon;
+	private IIcon	icon;
 
-	private boolean visible = true;
+	private boolean	visible		= true;
 
-	private boolean from_fluid = false;
+	private boolean	from_fluid	= false;
 
 	/**
 	 * Creates a new Gas object with a defined name or key value.
@@ -113,9 +113,9 @@ public class Gas
 	{
 		if(from_fluid)
 		{
-			return this.getFluid().getIcon();
+			return getFluid().getIcon();
 		}
-		
+
 		return icon;
 	}
 
@@ -132,9 +132,9 @@ public class Gas
 		{
 			fluid.setIcons(getIcon());
 		}
-		
+
 		from_fluid = false;
-		
+
 		return this;
 	}
 
@@ -205,7 +205,8 @@ public class Gas
 				fluid = new Fluid(getName()).setGaseous(true);
 				FluidRegistry.registerFluid(fluid);
 			}
-			else {
+			else
+			{
 				fluid = FluidRegistry.getFluid(getName());
 			}
 		}
diff --git a/src/api/java/mekanism/api/gas/GasNetwork.java b/src/api/java/mekanism/api/gas/GasNetwork.java
index ea81d12..05e18be 100644
--- a/src/api/java/mekanism/api/gas/GasNetwork.java
+++ b/src/api/java/mekanism/api/gas/GasNetwork.java
@@ -1,8 +1,12 @@
 package mekanism.api.gas;
 
-import com.google.common.collect.Lists;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.Event;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import mekanism.api.Coord4D;
 import mekanism.api.transmitters.DynamicNetwork;
 import mekanism.api.transmitters.IGridTransmitter;
@@ -10,7 +14,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.*;
+import com.google.common.collect.Lists;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
 
 /**
  * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on
@@ -20,25 +27,27 @@ import java.util.*;
  */
 public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 {
-	public int transferDelay = 0;
+	public int		transferDelay		= 0;
 
-	public boolean didTransfer;
-	public boolean prevTransfer;
+	public boolean	didTransfer;
+	public boolean	prevTransfer;
 
-	public float gasScale;
+	public float	gasScale;
 
-	public Gas refGas;
+	public Gas		refGas;
 
-	public GasStack buffer;
-	public int prevStored;
+	public GasStack	buffer;
+	public int		prevStored;
 
-	public int prevTransferAmount = 0;
+	public int		prevTransferAmount	= 0;
 
-	public GasNetwork() {}
+	public GasNetwork()
+	{
+	}
 
 	public GasNetwork(Collection<GasNetwork> networks)
 	{
-		for(GasNetwork net : networks)
+		for(final GasNetwork net : networks)
 		{
 			if(net != null)
 			{
@@ -54,14 +63,16 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 						net.refGas = null;
 						net.buffer = null;
 					}
-				} else
+				}
+				else
 				{
 					if(net.buffer != null)
 					{
 						if(buffer == null)
 						{
 							buffer = net.buffer.copy();
-						} else
+						}
+						else
 						{
 							if(buffer.isGasEqual(net.buffer))
 							{
@@ -91,19 +102,19 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 	@Override
 	public void absorbBuffer(IGridTransmitter<IGasHandler, GasNetwork> transmitter)
 	{
-		Object b = transmitter.getBuffer();
-		
-		if(!(b instanceof GasStack) || ((GasStack)b).getGas() == null || ((GasStack)b).amount == 0)
+		final Object b = transmitter.getBuffer();
+
+		if(!(b instanceof GasStack) || ((GasStack) b).getGas() == null || ((GasStack) b).amount == 0)
 		{
 			return;
 		}
 
-		GasStack gas = (GasStack)b;
+		final GasStack gas = (GasStack) b;
 
 		if(buffer == null || buffer.getGas() == null || buffer.amount == 0)
 		{
 			buffer = gas.copy();
-            gas.amount = 0;
+			gas.amount = 0;
 			return;
 		}
 
@@ -112,7 +123,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 		{
 			buffer.amount += gas.amount;
 		}
-		
+
 		gas.amount = 0;
 	}
 
@@ -127,30 +138,30 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 
 	public int getGasNeeded()
 	{
-		return getCapacity()-(buffer != null ? buffer.amount : 0);
+		return getCapacity() - (buffer != null ? buffer.amount : 0);
 	}
 
 	public int tickEmit(GasStack stack)
 	{
-		List<IGasHandler> availableAcceptors = Lists.newArrayList();
+		final List<IGasHandler> availableAcceptors = Lists.newArrayList();
 
 		availableAcceptors.addAll(getAcceptors(stack.getGas()));
 
 		Collections.shuffle(availableAcceptors);
 
 		int toSend = stack.amount;
-		int prevSending = toSend;
+		final int prevSending = toSend;
 
 		if(!availableAcceptors.isEmpty())
 		{
-			int divider = availableAcceptors.size();
+			final int divider = availableAcceptors.size();
 			int remaining = toSend % divider;
-			int sending = (toSend-remaining)/divider;
+			final int sending = (toSend - remaining) / divider;
 
-			for(IGasHandler acceptor : availableAcceptors)
+			for(final IGasHandler acceptor : availableAcceptors)
 			{
 				int currentSending = sending;
-				EnumSet<ForgeDirection> sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor));
+				final EnumSet<ForgeDirection> sides = acceptorDirections.get(Coord4D.get((TileEntity) acceptor));
 
 				if(remaining > 0)
 				{
@@ -158,11 +169,12 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 					remaining--;
 				}
 
-				for(ForgeDirection side : sides)
+				for(final ForgeDirection side : sides)
 				{
-					int prev = toSend;
+					final int prev = toSend;
 
-					toSend -= acceptor.receiveGas(side, new GasStack(stack.getGas(), currentSending), true);
+					toSend -= acceptor.receiveGas(side, new GasStack(
+							stack.getGas(), currentSending), true);
 
 					if(toSend < prev)
 					{
@@ -172,7 +184,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 			}
 		}
 
-		int sent = prevSending-toSend;
+		final int sent = prevSending - toSend;
 
 		if(sent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer())
 		{
@@ -190,7 +202,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 			return 0;
 		}
 
-		int toUse = Math.min(getGasNeeded(), stack.amount);
+		final int toUse = Math.min(getGasNeeded(), stack.amount);
 
 		if(doTransfer)
 		{
@@ -199,7 +211,8 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 				buffer = stack.copy();
 				buffer.amount = toUse;
 			}
-			else {
+			else
+			{
 				buffer.amount += toUse;
 			}
 		}
@@ -220,11 +233,12 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 			{
 				didTransfer = false;
 			}
-			else {
+			else
+			{
 				transferDelay--;
 			}
 
-			int stored = buffer != null ? buffer.amount : 0;
+			final int stored = buffer != null ? buffer.amount : 0;
 
 			if(stored != prevStored)
 			{
@@ -235,7 +249,8 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 
 			if(didTransfer != prevTransfer || needsUpdate)
 			{
-				MinecraftForge.EVENT_BUS.post(new GasTransferEvent(this, buffer, didTransfer));
+				MinecraftForge.EVENT_BUS.post(new GasTransferEvent(this,
+						buffer, didTransfer));
 				needsUpdate = false;
 			}
 
@@ -263,11 +278,11 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 
 		if(didTransfer && gasScale < 1)
 		{
-			gasScale = Math.max(getScale(), Math.min(1, gasScale+0.02F));
+			gasScale = Math.max(getScale(), Math.min(1, gasScale + 0.02F));
 		}
 		else if(!didTransfer && gasScale > 0)
 		{
-			gasScale = Math.max(getScale(), Math.max(0, gasScale-0.02F));
+			gasScale = Math.max(getScale(), Math.max(0, gasScale - 0.02F));
 
 			if(gasScale == 0)
 			{
@@ -279,27 +294,27 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 	@Override
 	public Set<IGasHandler> getAcceptors(Object data)
 	{
-		Gas type = (Gas)data;
-		Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
-		
+		final Gas type = (Gas) data;
+		final Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
+
 		if(FMLCommonHandler.instance().getEffectiveSide().isClient())
 		{
 			return toReturn;
 		}
 
-		for(Coord4D coord : possibleAcceptors.keySet())
+		for(final Coord4D coord : possibleAcceptors.keySet())
 		{
-			EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
-			TileEntity tile = coord.getTileEntity(getWorld());
-			
+			final EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
+			final TileEntity tile = coord.getTileEntity(getWorld());
+
 			if(!(tile instanceof IGasHandler) || sides == null || sides.isEmpty())
 			{
 				continue;
 			}
-			
-			IGasHandler acceptor = (IGasHandler)tile;
 
-			for(ForgeDirection side : sides)
+			final IGasHandler acceptor = (IGasHandler) tile;
+
+			for(final ForgeDirection side : sides)
 			{
 				if(acceptor != null && acceptor.canReceiveGas(side, type))
 				{
@@ -314,10 +329,10 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 
 	public static class GasTransferEvent extends Event
 	{
-		public final GasNetwork gasNetwork;
+		public final GasNetwork	gasNetwork;
 
-		public final GasStack transferType;
-		public final boolean didTransfer;
+		public final GasStack	transferType;
+		public final boolean	didTransfer;
 
 		public GasTransferEvent(GasNetwork network, GasStack type, boolean did)
 		{
@@ -329,7 +344,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 
 	public float getScale()
 	{
-		return Math.min(1, (buffer == null || getCapacity() == 0 ? 0 : (float)buffer.amount/getCapacity()));
+		return Math.min(1, (buffer == null || getCapacity() == 0 ? 0 : (float) buffer.amount / getCapacity()));
 	}
 
 	@Override
diff --git a/src/api/java/mekanism/api/gas/GasRegistry.java b/src/api/java/mekanism/api/gas/GasRegistry.java
index 25db966..37a6363 100644
--- a/src/api/java/mekanism/api/gas/GasRegistry.java
+++ b/src/api/java/mekanism/api/gas/GasRegistry.java
@@ -7,7 +7,7 @@ import net.minecraftforge.fluids.Fluid;
 
 public class GasRegistry
 {
-	private static ArrayList<Gas> registeredGasses = new ArrayList<Gas>();
+	private static ArrayList<Gas>	registeredGasses	= new ArrayList<Gas>();
 
 	/**
 	 * Register a new gas into GasRegistry.
@@ -48,7 +48,7 @@ public class GasRegistry
 	 */
 	public static Gas getGas(Fluid f)
 	{
-		for(Gas gas : getRegisteredGasses())
+		for(final Gas gas : getRegisteredGasses())
 		{
 			if(gas.hasFluid() && gas.getFluid() == f)
 			{
@@ -75,7 +75,7 @@ public class GasRegistry
 	 */
 	public static List<Gas> getRegisteredGasses()
 	{
-		return (List<Gas>)registeredGasses.clone();
+		return (List<Gas>) registeredGasses.clone();
 	}
 
 	/**
@@ -85,7 +85,7 @@ public class GasRegistry
 	 */
 	public static Gas getGas(String name)
 	{
-		for(Gas gas : registeredGasses)
+		for(final Gas gas : registeredGasses)
 		{
 			if(gas.getName().toLowerCase().equals(name.toLowerCase()))
 			{
diff --git a/src/api/java/mekanism/api/gas/GasStack.java b/src/api/java/mekanism/api/gas/GasStack.java
index 05e5ae6..6d04a53 100644
--- a/src/api/java/mekanism/api/gas/GasStack.java
+++ b/src/api/java/mekanism/api/gas/GasStack.java
@@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound;
  */
 public class GasStack
 {
-	private Gas type;
+	private Gas	type;
 
-	public int amount;
+	public int	amount;
 
 	/**
 	 * Creates a new GasStack with a defined gas ID and quantity.
@@ -35,7 +35,9 @@ public class GasStack
 		amount = quantity;
 	}
 
-	private GasStack() {}
+	private GasStack()
+	{
+	}
 
 	/**
 	 * Gets the Gas type of this GasStack.
@@ -45,11 +47,11 @@ public class GasStack
 	{
 		return type;
 	}
-	
+
 	public GasStack withAmount(int newAmount)
 	{
 		amount = newAmount;
-		
+
 		return this;
 	}
 
@@ -88,7 +90,7 @@ public class GasStack
 			return null;
 		}
 
-		GasStack stack = new GasStack();
+		final GasStack stack = new GasStack();
 		stack.read(nbtTags);
 
 		if(stack.getGas() == null || stack.amount <= 0)
diff --git a/src/api/java/mekanism/api/gas/GasTank.java b/src/api/java/mekanism/api/gas/GasTank.java
index a5d4c20..69b7a3c 100644
--- a/src/api/java/mekanism/api/gas/GasTank.java
+++ b/src/api/java/mekanism/api/gas/GasTank.java
@@ -9,11 +9,13 @@ import net.minecraft.nbt.NBTTagCompound;
  */
 public class GasTank
 {
-	public GasStack stored;
+	public GasStack	stored;
 
-	private int maxGas;
+	private int		maxGas;
 
-	private GasTank() {}
+	private GasTank()
+	{
+	}
 
 	/**
 	 * Creates a tank with a defined capacity.
@@ -51,7 +53,8 @@ public class GasTank
 			return null;
 		}
 
-		GasStack ret = new GasStack(getGas().getGas(), Math.min(getStored(), amount));
+		final GasStack ret = new GasStack(getGas().getGas(),
+				Math.min(getStored(), amount));
 
 		if(ret.amount > 0)
 		{
@@ -84,16 +87,17 @@ public class GasTank
 			return 0;
 		}
 
-		int toFill = Math.min(getMaxGas()-getStored(), amount.amount);
+		final int toFill = Math.min(getMaxGas() - getStored(), amount.amount);
 
 		if(doReceive)
 		{
 			if(stored == null)
 			{
-				stored = amount.copy().withAmount(getStored()+toFill);
+				stored = amount.copy().withAmount(getStored() + toFill);
 			}
-			else {
-				stored.amount = Math.min(getMaxGas(), getStored()+amount.amount);
+			else
+			{
+				stored.amount = Math.min(getMaxGas(), getStored() + amount.amount);
 			}
 		}
 
@@ -151,7 +155,7 @@ public class GasTank
 	 */
 	public int getNeeded()
 	{
-		return getMaxGas()-getStored();
+		return getMaxGas() - getStored();
 	}
 
 	/**
@@ -179,7 +183,7 @@ public class GasTank
 	{
 		return stored;
 	}
-	
+
 	/**
 	 * Gets the type of gas currently stored in this GasTank.
 	 * @return gas type contained
@@ -244,7 +248,7 @@ public class GasTank
 			return null;
 		}
 
-		GasTank tank = new GasTank();
+		final GasTank tank = new GasTank();
 		tank.read(nbtTags);
 
 		return tank;
diff --git a/src/api/java/mekanism/api/gas/GasTransmission.java b/src/api/java/mekanism/api/gas/GasTransmission.java
index c043eb8..a714af0 100644
--- a/src/api/java/mekanism/api/gas/GasTransmission.java
+++ b/src/api/java/mekanism/api/gas/GasTransmission.java
@@ -8,7 +8,6 @@ import java.util.List;
 import mekanism.api.Coord4D;
 import mekanism.api.transmitters.ITransmitterTile;
 import mekanism.api.transmitters.TransmissionType;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -27,15 +26,15 @@ public final class GasTransmission
 	 */
 	public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity)
 	{
-		IGasHandler[] acceptors = new IGasHandler[] {null, null, null, null, null, null};
+		final IGasHandler[] acceptors = new IGasHandler[] {null, null, null, null, null, null};
 
-		for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
+		for(final ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
 		{
-			TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
+			final TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
 
 			if(acceptor instanceof IGasHandler)
 			{
-				acceptors[orientation.ordinal()] = (IGasHandler)acceptor;
+				acceptors[orientation.ordinal()] = (IGasHandler) acceptor;
 			}
 		}
 
@@ -49,15 +48,15 @@ public final class GasTransmission
 	 */
 	public static ITubeConnection[] getConnections(TileEntity tileEntity)
 	{
-		ITubeConnection[] connections = new ITubeConnection[] {null, null, null, null, null, null};
+		final ITubeConnection[] connections = new ITubeConnection[] {null, null, null, null, null, null};
 
-		for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
+		for(final ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
 		{
-			TileEntity connection = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
+			final TileEntity connection = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
 
 			if(canConnect(connection, orientation))
 			{
-				connections[orientation.ordinal()] = (ITubeConnection)connection;
+				connections[orientation.ordinal()] = (ITubeConnection) connection;
 			}
 		}
 
@@ -72,9 +71,9 @@ public final class GasTransmission
 	 */
 	public static boolean canConnect(TileEntity tileEntity, ForgeDirection side)
 	{
-		if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.GAS)))
+		if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile) tileEntity).getTransmitter(), TransmissionType.GAS)))
 		{
-			if(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite()))
+			if(((ITubeConnection) tileEntity).canTubeConnect(side.getOpposite()))
 			{
 				return true;
 			}
@@ -94,7 +93,7 @@ public final class GasTransmission
 	{
 		if(itemStack != null && itemStack.getItem() instanceof IGasItem)
 		{
-			IGasItem item = (IGasItem)itemStack.getItem();
+			final IGasItem item = (IGasItem) itemStack.getItem();
 
 			if(type != null && item.getGas(itemStack) != null && item.getGas(itemStack).getGas() != type || !item.canProvideGas(itemStack, type))
 			{
@@ -115,14 +114,14 @@ public final class GasTransmission
 	 */
 	public static int addGas(ItemStack itemStack, GasStack stack)
 	{
-		if(itemStack != null && itemStack.getItem() instanceof IGasItem && ((IGasItem)itemStack.getItem()).canReceiveGas(itemStack, stack.getGas()))
+		if(itemStack != null && itemStack.getItem() instanceof IGasItem && ((IGasItem) itemStack.getItem()).canReceiveGas(itemStack, stack.getGas()))
 		{
-			return ((IGasItem)itemStack.getItem()).addGas(itemStack, stack.copy());
+			return ((IGasItem) itemStack.getItem()).addGas(itemStack, stack.copy());
 		}
 
 		return 0;
 	}
-	
+
 	/**
 	 * Emits gas from a central block by splitting the received stack among the sides given.
 	 * @param sides - the list of sides to output from
@@ -136,14 +135,14 @@ public final class GasTransmission
 		{
 			return 0;
 		}
-		
-		List<IGasHandler> availableAcceptors = new ArrayList<IGasHandler>();
-		IGasHandler[] possibleAcceptors = getConnectedAcceptors(from);
-		
+
+		final List<IGasHandler> availableAcceptors = new ArrayList<IGasHandler>();
+		final IGasHandler[] possibleAcceptors = getConnectedAcceptors(from);
+
 		for(int i = 0; i < possibleAcceptors.length; i++)
 		{
-			IGasHandler handler = possibleAcceptors[i];
-			
+			final IGasHandler handler = possibleAcceptors[i];
+
 			if(handler != null && handler.canReceiveGas(ForgeDirection.getOrientation(i).getOpposite(), stack.getGas()))
 			{
 				availableAcceptors.add(handler);
@@ -153,15 +152,15 @@ public final class GasTransmission
 		Collections.shuffle(availableAcceptors);
 
 		int toSend = stack.amount;
-		int prevSending = toSend;
+		final int prevSending = toSend;
 
 		if(!availableAcceptors.isEmpty())
 		{
-			int divider = availableAcceptors.size();
+			final int divider = availableAcceptors.size();
 			int remaining = toSend % divider;
-			int sending = (toSend-remaining)/divider;
+			final int sending = (toSend - remaining) / divider;
 
-			for(IGasHandler acceptor : availableAcceptors)
+			for(final IGasHandler acceptor : availableAcceptors)
 			{
 				int currentSending = sending;
 
@@ -170,12 +169,13 @@ public final class GasTransmission
 					currentSending++;
 					remaining--;
 				}
-				
-				ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
-				toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(), currentSending), true);
+
+				final ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
+				toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(),
+						currentSending), true);
 			}
 		}
 
-		return prevSending-toSend;
+		return prevSending - toSend;
 	}
 }
diff --git a/src/api/java/mekanism/api/gas/IGasItem.java b/src/api/java/mekanism/api/gas/IGasItem.java
index 9c7d332..f95baa3 100644
--- a/src/api/java/mekanism/api/gas/IGasItem.java
+++ b/src/api/java/mekanism/api/gas/IGasItem.java
@@ -72,7 +72,7 @@ public interface IGasItem
 	 * @return maximum gas
 	 */
 	public int getMaxGas(ItemStack itemstack);
-	
+
 	/**
 	 * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display.
 	 * @return if the item contains metadata-specific subtypes
diff --git a/src/api/java/mekanism/api/gas/IGasTransmitter.java b/src/api/java/mekanism/api/gas/IGasTransmitter.java
index 57ec4c1..2785ac1 100644
--- a/src/api/java/mekanism/api/gas/IGasTransmitter.java
+++ b/src/api/java/mekanism/api/gas/IGasTransmitter.java
@@ -1,7 +1,6 @@
 package mekanism.api.gas;
 
 import mekanism.api.transmitters.IGridTransmitter;
-
 import net.minecraft.tileentity.TileEntity;
 
 public interface IGasTransmitter extends IGridTransmitter<IGasHandler, GasNetwork>
diff --git a/src/api/java/mekanism/api/gas/OreGas.java b/src/api/java/mekanism/api/gas/OreGas.java
index 316169c..c9d7ad8 100644
--- a/src/api/java/mekanism/api/gas/OreGas.java
+++ b/src/api/java/mekanism/api/gas/OreGas.java
@@ -4,8 +4,8 @@ import net.minecraft.util.StatCollector;
 
 public class OreGas extends Gas
 {
-	private String oreName;
-	private OreGas cleanGas;
+	private final String	oreName;
+	private OreGas	cleanGas;
 
 	public OreGas(String s, String name)
 	{
diff --git a/src/api/java/mekanism/api/gas/package-info.java b/src/api/java/mekanism/api/gas/package-info.java
index 4418451..2a6464c 100644
--- a/src/api/java/mekanism/api/gas/package-info.java
+++ b/src/api/java/mekanism/api/gas/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|gas")
 package mekanism.api.gas;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/infuse/InfuseObject.java b/src/api/java/mekanism/api/infuse/InfuseObject.java
index a86c02f..de9005e 100644
--- a/src/api/java/mekanism/api/infuse/InfuseObject.java
+++ b/src/api/java/mekanism/api/infuse/InfuseObject.java
@@ -8,10 +8,10 @@ package mekanism.api.infuse;
 public class InfuseObject
 {
 	/** The type of infuse this item stores */
-	public InfuseType type;
+	public InfuseType	type;
 
 	/** How much infuse this item stores */
-	public int stored;
+	public int			stored;
 
 	public InfuseObject(InfuseType infusion, int i)
 	{
diff --git a/src/api/java/mekanism/api/infuse/InfuseRegistry.java b/src/api/java/mekanism/api/infuse/InfuseRegistry.java
index 308b9c5..6916878 100644
--- a/src/api/java/mekanism/api/infuse/InfuseRegistry.java
+++ b/src/api/java/mekanism/api/infuse/InfuseRegistry.java
@@ -13,10 +13,10 @@ import net.minecraft.item.ItemStack;
 public class InfuseRegistry
 {
 	/** The (private) map of ItemStacks and their related InfuseObjects. */
-	private static Map<ItemStack, InfuseObject> infuseObjects = new HashMap<ItemStack, InfuseObject>();
+	private static Map<ItemStack, InfuseObject>	infuseObjects	= new HashMap<ItemStack, InfuseObject>();
 
 	/** The (private) map of infuse names and their corresponding InfuseTypes. */
-	private static Map<String, InfuseType> infuseTypes = new HashMap<String, InfuseType>();
+	private static Map<String, InfuseType>		infuseTypes		= new HashMap<String, InfuseType>();
 
 	/**
 	 * Registers an InfuseType into the registry. Call this in PreInit!
@@ -82,7 +82,7 @@ public class InfuseRegistry
 	 */
 	public static InfuseObject getObject(ItemStack itemStack)
 	{
-		for(Map.Entry<ItemStack, InfuseObject> obj : infuseObjects.entrySet())
+		for(final Map.Entry<ItemStack, InfuseObject> obj : infuseObjects.entrySet())
 		{
 			if(itemStack.isItemEqual(obj.getKey()))
 			{
diff --git a/src/api/java/mekanism/api/infuse/InfuseType.java b/src/api/java/mekanism/api/infuse/InfuseType.java
index 1f5215c..76820a8 100644
--- a/src/api/java/mekanism/api/infuse/InfuseType.java
+++ b/src/api/java/mekanism/api/infuse/InfuseType.java
@@ -11,19 +11,19 @@ import net.minecraft.util.StatCollector;
 public final class InfuseType
 {
 	/** The name of this infusion */
-	public String name;
+	public String			name;
 
 	/** The location of this infuse's GUI texture */
-	public ResourceLocation texture;
+	public ResourceLocation	texture;
 
 	/** The infuse's GUI texture X offset. */
-	public int texX;
+	public int				texX;
 
 	/** The infuse's GUI texture Y offset. */
-	public int texY;
+	public int				texY;
 
 	/** The unlocalized name of this type. */
-	public String unlocalizedName;
+	public String			unlocalizedName;
 
 	public InfuseType(String s, ResourceLocation location, int x, int y)
 	{
diff --git a/src/api/java/mekanism/api/infuse/package-info.java b/src/api/java/mekanism/api/infuse/package-info.java
index 8718996..a826ca2 100644
--- a/src/api/java/mekanism/api/infuse/package-info.java
+++ b/src/api/java/mekanism/api/infuse/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse")
 package mekanism.api.infuse;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/lasers/package-info.java b/src/api/java/mekanism/api/lasers/package-info.java
index b456937..957b64f 100644
--- a/src/api/java/mekanism/api/lasers/package-info.java
+++ b/src/api/java/mekanism/api/lasers/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|laser")
 package mekanism.api.lasers;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/package-info.java b/src/api/java/mekanism/api/package-info.java
index 2b9fcab..f515694 100644
--- a/src/api/java/mekanism/api/package-info.java
+++ b/src/api/java/mekanism/api/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|core")
 package mekanism.api;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/reactor/IFusionReactor.java b/src/api/java/mekanism/api/reactor/IFusionReactor.java
index 9d9d96d..33d474c 100644
--- a/src/api/java/mekanism/api/reactor/IFusionReactor.java
+++ b/src/api/java/mekanism/api/reactor/IFusionReactor.java
@@ -2,7 +2,6 @@ package mekanism.api.reactor;
 
 import mekanism.api.IHeatTransfer;
 import mekanism.api.gas.GasTank;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidTank;
 
@@ -61,6 +60,6 @@ public interface IFusionReactor extends IHeatTransfer
 	public int getSteamPerTick(boolean current);
 
 	public void updateTemperatures();
-	
+
 	public ItemStack[] getInventory();
 }
diff --git a/src/api/java/mekanism/api/reactor/IReactorBlock.java b/src/api/java/mekanism/api/reactor/IReactorBlock.java
index b3b8518..96d161b 100644
--- a/src/api/java/mekanism/api/reactor/IReactorBlock.java
+++ b/src/api/java/mekanism/api/reactor/IReactorBlock.java
@@ -1,6 +1,5 @@
 package mekanism.api.reactor;
 
-
 public interface IReactorBlock
 {
 	public boolean isFrame();
diff --git a/src/api/java/mekanism/api/reactor/package-info.java b/src/api/java/mekanism/api/reactor/package-info.java
index 6a00fc6..6f11811 100644
--- a/src/api/java/mekanism/api/reactor/package-info.java
+++ b/src/api/java/mekanism/api/reactor/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor")
 package mekanism.api.reactor;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/recipe/RecipeHelper.java b/src/api/java/mekanism/api/recipe/RecipeHelper.java
index 1040aa2..8884d44 100644
--- a/src/api/java/mekanism/api/recipe/RecipeHelper.java
+++ b/src/api/java/mekanism/api/recipe/RecipeHelper.java
@@ -4,7 +4,6 @@ import java.lang.reflect.Method;
 
 import mekanism.api.gas.GasStack;
 import mekanism.api.infuse.InfuseType;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -24,11 +23,14 @@ public final class RecipeHelper
 	 */
 	public static void addEnrichmentChamberRecipe(ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -40,11 +42,14 @@ public final class RecipeHelper
 	 */
 	public static void addOsmiumCompressorRecipe(ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -56,11 +61,14 @@ public final class RecipeHelper
 	 */
 	public static void addCombinerRecipe(ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -72,11 +80,14 @@ public final class RecipeHelper
 	 */
 	public static void addCrusherRecipe(ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -88,11 +99,14 @@ public final class RecipeHelper
 	 */
 	public static void addPurificationChamberRecipe(ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -104,11 +118,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalOxidizerRecipe(ItemStack input, GasStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -121,11 +138,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class);
 			m.invoke(null, leftInput, rightInput, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -139,11 +159,14 @@ public final class RecipeHelper
 	 */
 	public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class, ItemStack.class, Double.TYPE);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class, ItemStack.class, Double.TYPE);
 			m.invoke(null, input, primaryOutput, secondaryOutput, chance);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -155,11 +178,14 @@ public final class RecipeHelper
 	 */
 	public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class);
 			m.invoke(null, input, primaryOutput);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -171,11 +197,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", ItemStack.class, String.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", ItemStack.class, String.class, ItemStack.class);
 			m.invoke(null, input, gasName, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -189,11 +218,14 @@ public final class RecipeHelper
 	 */
 	public static void addElectrolyticSeparatorRecipe(FluidStack input, double energy, GasStack leftOutput, GasStack rightOutput)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, Double.TYPE, GasStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, Double.TYPE, GasStack.class, GasStack.class);
 			m.invoke(null, input, energy, leftOutput, rightOutput);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -205,11 +237,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -221,11 +256,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalWasherRecipe(GasStack input, GasStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -237,11 +275,14 @@ public final class RecipeHelper
 	 */
 	public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -255,11 +296,14 @@ public final class RecipeHelper
 	 */
 	public static void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfuseType.class, Integer.TYPE, ItemStack.class, ItemStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfuseType.class, Integer.TYPE, ItemStack.class, ItemStack.class);
 			m.invoke(null, infuse, amount, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
@@ -276,15 +320,18 @@ public final class RecipeHelper
 	 */
 	public static void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addPRCRecipe", ItemStack.class, FluidStack.class, GasStack.class, ItemStack.class, GasStack.class, Double.TYPE, Integer.TYPE);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addPRCRecipe", ItemStack.class, FluidStack.class, GasStack.class, ItemStack.class, GasStack.class, Double.TYPE, Integer.TYPE);
 			m.invoke(null, inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * Add a Solar Evaporation Plant recipe.
 	 * @param input - input GasStack
@@ -292,15 +339,18 @@ public final class RecipeHelper
 	 */
 	public static void addSolarEvaporationRecipe(FluidStack input, FluidStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addSolarEvaporationRecipe", FluidStack.class, FluidStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addSolarEvaporationRecipe", FluidStack.class, FluidStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * Add a Solar Neutron Activator recipe.
 	 * @param input - input GasStack
@@ -308,11 +358,14 @@ public final class RecipeHelper
 	 */
 	public static void addSolarNeutronRecipe(GasStack input, GasStack output)
 	{
-		try {
-			Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
-			Method m = recipeClass.getMethod("addSolarEvaporationRecipe", GasStack.class, GasStack.class);
+		try
+		{
+			final Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+			final Method m = recipeClass.getMethod("addSolarEvaporationRecipe", GasStack.class, GasStack.class);
 			m.invoke(null, input, output);
-		} catch(Exception e) {
+		}
+		catch(final Exception e)
+		{
 			System.err.println("Error while adding recipe: " + e.getMessage());
 		}
 	}
diff --git a/src/api/java/mekanism/api/recipe/package-info.java b/src/api/java/mekanism/api/recipe/package-info.java
index f166da4..060e5ab 100644
--- a/src/api/java/mekanism/api/recipe/package-info.java
+++ b/src/api/java/mekanism/api/recipe/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe")
 package mekanism.api.recipe;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/transmitters/DynamicNetwork.java b/src/api/java/mekanism/api/transmitters/DynamicNetwork.java
index ee4e8a2..39932c7 100644
--- a/src/api/java/mekanism/api/transmitters/DynamicNetwork.java
+++ b/src/api/java/mekanism/api/transmitters/DynamicNetwork.java
@@ -1,10 +1,13 @@
 package mekanism.api.transmitters;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.Event;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import mekanism.api.Coord4D;
 import mekanism.api.IClientTicker;
 import mekanism.api.Range4D;
@@ -14,31 +17,35 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.*;
-import java.util.Map.Entry;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
 
 public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implements IClientTicker, INetworkDataHandler
 {
-	public LinkedHashSet<IGridTransmitter<A, N>> transmitters = Sets.newLinkedHashSet();
-	public LinkedHashSet<IGridTransmitter<A, N>> transmittersToAdd = Sets.newLinkedHashSet();
-	public LinkedHashSet<IGridTransmitter<A, N>> transmittersAdded = Sets.newLinkedHashSet();
+	public LinkedHashSet<IGridTransmitter<A, N>>					transmitters		= Sets.newLinkedHashSet();
+	public LinkedHashSet<IGridTransmitter<A, N>>					transmittersToAdd	= Sets.newLinkedHashSet();
+	public LinkedHashSet<IGridTransmitter<A, N>>					transmittersAdded	= Sets.newLinkedHashSet();
 
-	public HashMap<Coord4D, A> possibleAcceptors = new HashMap<Coord4D, A>();
-	public HashMap<Coord4D, EnumSet<ForgeDirection>> acceptorDirections = new HashMap<Coord4D, EnumSet<ForgeDirection>>();
-	public HashMap<IGridTransmitter<A, N>, EnumSet<ForgeDirection>> changedAcceptors = Maps.newHashMap();
+	public HashMap<Coord4D, A>										possibleAcceptors	= new HashMap<Coord4D, A>();
+	public HashMap<Coord4D, EnumSet<ForgeDirection>>				acceptorDirections	= new HashMap<Coord4D, EnumSet<ForgeDirection>>();
+	public HashMap<IGridTransmitter<A, N>, EnumSet<ForgeDirection>>	changedAcceptors	= Maps.newHashMap();
 
-	private Set<DelayQueue> updateQueue = new LinkedHashSet<DelayQueue>();
+	private final Set<DelayQueue>											updateQueue			= new LinkedHashSet<DelayQueue>();
 
-	protected Range4D packetRange = null;
+	protected Range4D												packetRange			= null;
 
-	protected int capacity = 0;
-	protected double meanCapacity = 0;
+	protected int													capacity			= 0;
+	protected double												meanCapacity		= 0;
 
-	protected boolean needsUpdate = false;
-	protected int updateDelay = 0;
+	protected boolean												needsUpdate			= false;
+	protected int													updateDelay			= 0;
 
-	protected boolean firstUpdate = true;
-	protected World worldObj = null;
+	protected boolean												firstUpdate			= true;
+	protected World													worldObj			= null;
 
 	public void addNewTransmitters(Collection<IGridTransmitter<A, N>> newTransmitters)
 	{
@@ -49,7 +56,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 	{
 		if(!transmittersToAdd.isEmpty())
 		{
-			for(IGridTransmitter<A, N> transmitter : transmittersToAdd)
+			for(final IGridTransmitter<A, N> transmitter : transmittersToAdd)
 			{
 				if(transmitter.isValid())
 				{
@@ -58,17 +65,17 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 						worldObj = transmitter.world();
 					}
 
-					for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
+					for(final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 					{
 						updateTransmitterOnSide(transmitter, side);
 					}
-					
-					transmitter.setTransmitterNetwork((N)this);
+
+					transmitter.setTransmitterNetwork((N) this);
 					absorbBuffer(transmitter);
 					transmitters.add(transmitter);
 				}
 			}
-			
+
 			updateCapacity();
 			clampBuffer();
 			queueClientUpdate(Lists.newArrayList(transmittersToAdd));
@@ -77,30 +84,30 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 		if(!changedAcceptors.isEmpty())
 		{
-			for(Entry<IGridTransmitter<A, N>, EnumSet<ForgeDirection>> entry : changedAcceptors.entrySet())
+			for(final Entry<IGridTransmitter<A, N>, EnumSet<ForgeDirection>> entry : changedAcceptors.entrySet())
 			{
-				IGridTransmitter<A, N> transmitter = entry.getKey();
-				
+				final IGridTransmitter<A, N> transmitter = entry.getKey();
+
 				if(transmitter.isValid())
 				{
-					EnumSet<ForgeDirection> directionsChanged = entry.getValue();
+					final EnumSet<ForgeDirection> directionsChanged = entry.getValue();
 
-					for(ForgeDirection side : directionsChanged)
+					for(final ForgeDirection side : directionsChanged)
 					{
 						updateTransmitterOnSide(transmitter, side);
 					}
 				}
 			}
-			
+
 			changedAcceptors.clear();
 		}
 	}
 
 	public void updateTransmitterOnSide(IGridTransmitter<A, N> transmitter, ForgeDirection side)
 	{
-		A acceptor = transmitter.getAcceptor(side);
-		Coord4D acceptorCoord = transmitter.coord().getFromSide(side);
-		EnumSet<ForgeDirection> directions = acceptorDirections.get(acceptorCoord);
+		final A acceptor = transmitter.getAcceptor(side);
+		final Coord4D acceptorCoord = transmitter.coord().getFromSide(side);
+		final EnumSet<ForgeDirection> directions = acceptorDirections.get(acceptorCoord);
 
 		if(acceptor != null)
 		{
@@ -110,11 +117,13 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 			{
 				directions.add(side.getOpposite());
 			}
-			else {
+			else
+			{
 				acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite()));
 			}
 		}
-		else {
+		else
+		{
 			if(directions != null)
 			{
 				directions.remove(side.getOpposite());
@@ -125,7 +134,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 					acceptorDirections.remove(acceptorCoord);
 				}
 			}
-			else {
+			else
+			{
 				possibleAcceptors.remove(acceptorCoord);
 				acceptorDirections.remove(acceptorCoord);
 			}
@@ -139,33 +149,33 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public void invalidate()
 	{
-        //Remove invalid transmitters first for share calculations
-        for(Iterator<IGridTransmitter<A, N>> iter = transmitters.iterator(); iter.hasNext();)
-        {
-            IGridTransmitter<A, N> transmitter = iter.next();
-
-            if(!transmitter.isValid())
-            {
-                iter.remove();
-                continue;
-            }
-        }
-
-        //Clamp the new buffer
-        clampBuffer();
-
-        //Update all shares
-        for(IGridTransmitter<A, N> transmitter : transmitters)
-        {
-            transmitter.updateShare();
-        }
-
-        //Now invalidate the transmitters
-		for(IGridTransmitter<A, N> transmitter : transmitters)
+		//Remove invalid transmitters first for share calculations
+		for(final Iterator<IGridTransmitter<A, N>> iter = transmitters.iterator(); iter.hasNext();)
+		{
+			final IGridTransmitter<A, N> transmitter = iter.next();
+
+			if(!transmitter.isValid())
+			{
+				iter.remove();
+				continue;
+			}
+		}
+
+		//Clamp the new buffer
+		clampBuffer();
+
+		//Update all shares
+		for(final IGridTransmitter<A, N> transmitter : transmitters)
+		{
+			transmitter.updateShare();
+		}
+
+		//Now invalidate the transmitters
+		for(final IGridTransmitter<A, N> transmitter : transmitters)
 		{
 			invalidateTransmitter(transmitter);
 		}
-		
+
 		transmitters.clear();
 		deregister();
 	}
@@ -182,39 +192,41 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public void acceptorChanged(IGridTransmitter<A, N> transmitter, ForgeDirection side)
 	{
-		EnumSet<ForgeDirection> directions = changedAcceptors.get(transmitter);
-		
+		final EnumSet<ForgeDirection> directions = changedAcceptors.get(transmitter);
+
 		if(directions != null)
 		{
 			directions.add(side);
-		} 
-		else {
+		}
+		else
+		{
 			changedAcceptors.put(transmitter, EnumSet.of(side));
 		}
-		
+
 		TransmitterNetworkRegistry.registerChangedNetwork(this);
 	}
 
 	public void adoptTransmittersAndAcceptorsFrom(N net)
 	{
-		for(IGridTransmitter<A, N> transmitter : net.transmitters)
+		for(final IGridTransmitter<A, N> transmitter : net.transmitters)
 		{
-			transmitter.setTransmitterNetwork((N)this);
+			transmitter.setTransmitterNetwork((N) this);
 			transmitters.add(transmitter);
 			transmittersAdded.add(transmitter);
 		}
-		
+
 		possibleAcceptors.putAll(net.possibleAcceptors);
-		
-		for(Entry<Coord4D, EnumSet<ForgeDirection>> entry : net.acceptorDirections.entrySet())
+
+		for(final Entry<Coord4D, EnumSet<ForgeDirection>> entry : net.acceptorDirections.entrySet())
 		{
-			Coord4D coord = entry.getKey();
-			
+			final Coord4D coord = entry.getKey();
+
 			if(acceptorDirections.containsKey(coord))
 			{
 				acceptorDirections.get(coord).addAll(entry.getValue());
 			}
-			else {
+			else
+			{
 				acceptorDirections.put(coord, entry.getValue());
 			}
 		}
@@ -227,10 +239,10 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 		{
 			return genPacketRange();
 		}
-		
+
 		return packetRange;
 	}
-	
+
 	protected Range4D genPacketRange()
 	{
 		if(getSize() == 0)
@@ -239,29 +251,48 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 			return null;
 		}
 
-		IGridTransmitter<A, N> initTransmitter = transmitters.iterator().next();
-		Coord4D initCoord = initTransmitter.coord();
-		
+		final IGridTransmitter<A, N> initTransmitter = transmitters.iterator().next();
+		final Coord4D initCoord = initTransmitter.coord();
+
 		int minX = initCoord.xCoord;
 		int minY = initCoord.yCoord;
 		int minZ = initCoord.zCoord;
 		int maxX = initCoord.xCoord;
 		int maxY = initCoord.yCoord;
 		int maxZ = initCoord.zCoord;
-		
-		for(IGridTransmitter transmitter : transmitters)
+
+		for(final IGridTransmitter transmitter : transmitters)
 		{
-			Coord4D coord = transmitter.coord();
-			
-			if(coord.xCoord < minX) minX = coord.xCoord;
-			if(coord.yCoord < minY) minY = coord.yCoord;
-			if(coord.zCoord < minZ) minZ = coord.zCoord;
-			if(coord.xCoord > maxX) maxX = coord.xCoord;
-			if(coord.yCoord > maxY) maxY = coord.yCoord;
-			if(coord.zCoord > maxZ) maxZ = coord.zCoord;
+			final Coord4D coord = transmitter.coord();
+
+			if(coord.xCoord < minX)
+			{
+				minX = coord.xCoord;
+			}
+			if(coord.yCoord < minY)
+			{
+				minY = coord.yCoord;
+			}
+			if(coord.zCoord < minZ)
+			{
+				minZ = coord.zCoord;
+			}
+			if(coord.xCoord > maxX)
+			{
+				maxX = coord.xCoord;
+			}
+			if(coord.yCoord > maxY)
+			{
+				maxY = coord.yCoord;
+			}
+			if(coord.zCoord > maxZ)
+			{
+				maxZ = coord.zCoord;
+			}
 		}
-		
-		return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.dimensionId);
+
+		return new Range4D(minX, minY, minZ, maxX, maxY, maxZ,
+				initTransmitter.world().provider.dimensionId);
 	}
 
 	public void register()
@@ -270,8 +301,9 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 		{
 			TransmitterNetworkRegistry.getInstance().registerNetwork(this);
 		}
-		else {
-			MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1));
+		else
+		{
+			MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte) 1));
 		}
 	}
 
@@ -283,8 +315,9 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 		{
 			TransmitterNetworkRegistry.getInstance().removeNetwork(this);
 		}
-		else {
-			MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)0));
+		else
+		{
+			MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte) 0));
 		}
 	}
 
@@ -298,31 +331,32 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 		return possibleAcceptors.size();
 	}
 
-	public synchronized void updateCapacity() 
+	public synchronized void updateCapacity()
 	{
 		updateMeanCapacity();
-		capacity = (int)meanCapacity * transmitters.size();
+		capacity = (int) meanCapacity * transmitters.size();
 	}
 
-    /**
-     * Override this if things can have variable capacity along the network.
-     * @return An 'average' value of capacity. Calculate it how you will.
-     */
-	protected synchronized void updateMeanCapacity() 
+	/**
+	 * Override this if things can have variable capacity along the network.
+	 * @return An 'average' value of capacity. Calculate it how you will.
+	 */
+	protected synchronized void updateMeanCapacity()
 	{
-		if(transmitters.size() > 0) 
+		if(transmitters.size() > 0)
 		{
 			meanCapacity = transmitters.iterator().next().getCapacity();
-		} 
-		else {
+		}
+		else
+		{
 			meanCapacity = 0;
 		}
 	}
-	
-    public int getCapacity()
-    {
-    	return capacity;
-    }
+
+	public int getCapacity()
+	{
+		return capacity;
+	}
 
 	public World getWorld()
 	{
@@ -340,24 +374,29 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 	{
 		if(FMLCommonHandler.instance().getEffectiveSide().isServer())
 		{
-			Iterator<DelayQueue> i = updateQueue.iterator();
+			final Iterator<DelayQueue> i = updateQueue.iterator();
 
-			try {
+			try
+			{
 				while(i.hasNext())
 				{
-					DelayQueue q = i.next();
+					final DelayQueue q = i.next();
 
 					if(q.delay > 0)
 					{
 						q.delay--;
-					} 
-					else {
+					}
+					else
+					{
 						transmittersAdded.addAll(transmitters);
 						updateDelay = 1;
 						i.remove();
 					}
 				}
-			} catch(Exception e) {}
+			}
+			catch(final Exception e)
+			{
+			}
 
 			if(updateDelay > 0)
 			{
@@ -365,7 +404,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 				if(updateDelay == 0)
 				{
-					MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(this, firstUpdate, (Collection)transmittersAdded));
+					MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(
+							this, firstUpdate, (Collection) transmittersAdded));
 					firstUpdate = false;
 					transmittersAdded.clear();
 					needsUpdate = true;
@@ -381,7 +421,9 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 	}
 
 	@Override
-	public void clientTick() {}
+	public void clientTick()
+	{
+	}
 
 	public void queueClientUpdate(Collection<IGridTransmitter<A, N>> newTransmitters)
 	{
@@ -391,9 +433,9 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public static class TransmittersAddedEvent extends Event
 	{
-		public DynamicNetwork<?, ?> network;
-		public boolean newNetwork;
-		public Collection<IGridTransmitter> newTransmitters;
+		public DynamicNetwork<?, ?>			network;
+		public boolean						newNetwork;
+		public Collection<IGridTransmitter>	newTransmitters;
 
 		public TransmittersAddedEvent(DynamicNetwork net, boolean newNet, Collection<IGridTransmitter> added)
 		{
@@ -405,8 +447,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public static class ClientTickUpdate extends Event
 	{
-		public DynamicNetwork network;
-		public byte operation; /*0 remove, 1 add*/
+		public DynamicNetwork	network;
+		public byte				operation;	/*0 remove, 1 add*/
 
 		public ClientTickUpdate(DynamicNetwork net, byte b)
 		{
@@ -417,7 +459,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public static class NetworkClientRequest extends Event
 	{
-		public TileEntity tileEntity;
+		public TileEntity	tileEntity;
 
 		public NetworkClientRequest(TileEntity tile)
 		{
@@ -432,8 +474,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 
 	public static class DelayQueue
 	{
-		public EntityPlayer player;
-		public int delay;
+		public EntityPlayer	player;
+		public int			delay;
 
 		public DelayQueue(EntityPlayer p)
 		{
@@ -450,7 +492,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
 		@Override
 		public boolean equals(Object o)
 		{
-			return o instanceof DelayQueue && ((DelayQueue)o).player.equals(this.player);
+			return o instanceof DelayQueue && ((DelayQueue) o).player.equals(this.player);
 		}
 	}
 }
diff --git a/src/api/java/mekanism/api/transmitters/IBlockableConnection.java b/src/api/java/mekanism/api/transmitters/IBlockableConnection.java
index f6811fb..1183975 100644
--- a/src/api/java/mekanism/api/transmitters/IBlockableConnection.java
+++ b/src/api/java/mekanism/api/transmitters/IBlockableConnection.java
@@ -5,6 +5,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 public interface IBlockableConnection
 {
 	public boolean canConnectMutual(ForgeDirection side);
-	
+
 	public boolean canConnect(ForgeDirection side);
 }
diff --git a/src/api/java/mekanism/api/transmitters/IGridTransmitter.java b/src/api/java/mekanism/api/transmitters/IGridTransmitter.java
index 9d82d48..a184377 100644
--- a/src/api/java/mekanism/api/transmitters/IGridTransmitter.java
+++ b/src/api/java/mekanism/api/transmitters/IGridTransmitter.java
@@ -1,11 +1,11 @@
 package mekanism.api.transmitters;
 
+import java.util.Collection;
+
 import mekanism.api.Coord4D;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.Collection;
-
 public interface IGridTransmitter<A, N extends DynamicNetwork<A, N>> extends ITransmitter
 {
 	public boolean hasTransmitterNetwork();
@@ -37,7 +37,7 @@ public interface IGridTransmitter<A, N extends DynamicNetwork<A, N>> extends ITr
 	public int getCapacity();
 
 	public World world();
-	
+
 	public Coord4D coord();
 
 	public Coord4D getAdjacentConnectableTransmitterCoord(ForgeDirection side);
@@ -58,7 +58,7 @@ public interface IGridTransmitter<A, N extends DynamicNetwork<A, N>> extends ITr
 
 	public void takeShare();
 
-    public void updateShare();
+	public void updateShare();
 
 	public Object getBuffer();
 }
diff --git a/src/api/java/mekanism/api/transmitters/TransmissionType.java b/src/api/java/mekanism/api/transmitters/TransmissionType.java
index 7b54e9c..34aed37 100644
--- a/src/api/java/mekanism/api/transmitters/TransmissionType.java
+++ b/src/api/java/mekanism/api/transmitters/TransmissionType.java
@@ -1,37 +1,32 @@
 package mekanism.api.transmitters;
 
 import mekanism.api.gas.IGasTransmitter;
-
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
 
 public enum TransmissionType
 {
-	ENERGY("EnergyNetwork", "Energy"),
-	FLUID("FluidNetwork", "Fluids"),
-	GAS("GasNetwork", "Gases"),
-	ITEM("InventoryNetwork", "Items"),
-	HEAT("HeatNetwork", "Heat");
-	
-	private String name;
-	private String transmission;
-	
+	ENERGY("EnergyNetwork", "Energy"), FLUID("FluidNetwork", "Fluids"), GAS("GasNetwork", "Gases"), ITEM("InventoryNetwork", "Items"), HEAT("HeatNetwork", "Heat");
+
+	private String	name;
+	private String	transmission;
+
 	private TransmissionType(String n, String t)
 	{
 		name = n;
 		transmission = t;
 	}
-	
+
 	public String getName()
 	{
 		return name;
 	}
-	
+
 	public String getTransmission()
 	{
 		return transmission;
 	}
-	
+
 	public String localize()
 	{
 		return StatCollector.translateToLocal("transmission." + getTransmission());
@@ -61,7 +56,7 @@ public enum TransmissionType
 	{
 		if(sideTile instanceof ITransmitter)
 		{
-			if(((ITransmitter)sideTile).getTransmissionType() == this)
+			if(((ITransmitter) sideTile).getTransmissionType() == this)
 			{
 				return true;
 			}
@@ -69,7 +64,7 @@ public enum TransmissionType
 
 		if(this == GAS && currentTile instanceof IGasTransmitter)
 		{
-			if(((IGasTransmitter)currentTile).canTransferGasToTube(sideTile))
+			if(((IGasTransmitter) currentTile).canTransferGasToTube(sideTile))
 			{
 				return true;
 			}
@@ -77,4 +72,4 @@ public enum TransmissionType
 
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
index 0f9c1c5..4bf6a22 100644
--- a/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
+++ b/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
@@ -21,16 +21,16 @@ import cpw.mods.fml.relauncher.Side;
 
 public class TransmitterNetworkRegistry
 {
-	private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry();
-	private static boolean loaderRegistered = false;
+	private static TransmitterNetworkRegistry	INSTANCE			= new TransmitterNetworkRegistry();
+	private static boolean						loaderRegistered	= false;
 
-	private HashSet<DynamicNetwork> networks = Sets.newHashSet();
-	private HashSet<DynamicNetwork> networksToChange = Sets.newHashSet();
+	private final HashSet<DynamicNetwork>				networks			= Sets.newHashSet();
+	private final HashSet<DynamicNetwork>				networksToChange	= Sets.newHashSet();
 
-	private HashSet<IGridTransmitter> invalidTransmitters = Sets.newHashSet();
-	private HashMap<Coord4D, IGridTransmitter> orphanTransmitters = Maps.newHashMap();
+	private final HashSet<IGridTransmitter>			invalidTransmitters	= Sets.newHashSet();
+	private final HashMap<Coord4D, IGridTransmitter>	orphanTransmitters	= Maps.newHashMap();
 
-	private Logger logger = LogManager.getLogger("MekanismTransmitters");
+	private final Logger								logger				= LogManager.getLogger("MekanismTransmitters");
 
 	public static void initiate()
 	{
@@ -100,7 +100,7 @@ public class TransmitterNetworkRegistry
 
 		commitChanges();
 
-		for(DynamicNetwork net : networks)
+		for(final DynamicNetwork net : networks)
 		{
 			net.tick();
 		}
@@ -112,20 +112,20 @@ public class TransmitterNetworkRegistry
 		{
 			logger.info("Dealing with " + invalidTransmitters.size() + " invalid Transmitters");
 		}
-		
-		for(IGridTransmitter invalid : invalidTransmitters)
+
+		for(final IGridTransmitter invalid : invalidTransmitters)
 		{
 			if(!(invalid.isOrphan() && invalid.isValid()))
 			{
-				DynamicNetwork n = invalid.getTransmitterNetwork();
-				
+				final DynamicNetwork n = invalid.getTransmitterNetwork();
+
 				if(n != null)
 				{
 					n.invalidate();
 				}
 			}
 		}
-		
+
 		invalidTransmitters.clear();
 	}
 
@@ -135,18 +135,18 @@ public class TransmitterNetworkRegistry
 		{
 			logger.info("Dealing with " + orphanTransmitters.size() + " orphan Transmitters");
 		}
-		
-		for(IGridTransmitter orphanTransmitter : orphanTransmitters.values())
+
+		for(final IGridTransmitter orphanTransmitter : orphanTransmitters.values())
 		{
-			DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter);
-			
+			final DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter);
+
 			if(network != null)
 			{
 				networksToChange.add(network);
 				network.register();
 			}
 		}
-		
+
 		orphanTransmitters.clear();
 	}
 
@@ -154,10 +154,11 @@ public class TransmitterNetworkRegistry
 	{
 		if(startOrphan.isValid() && startOrphan.isOrphan())
 		{
-			OrphanPathFinder<A, N> finder = new OrphanPathFinder<A, N>(startOrphan);
+			final OrphanPathFinder<A, N> finder = new OrphanPathFinder<A, N>(
+					startOrphan);
 			finder.start();
 			N network;
-			
+
 			switch(finder.networksFound.size())
 			{
 				case 0:
@@ -165,43 +166,43 @@ public class TransmitterNetworkRegistry
 					{
 						logger.info("No networks found. Creating new network for " + finder.connectedTransmitters.size() + " transmitters");
 					}
-					
+
 					network = startOrphan.createEmptyNetwork();
-					
+
 					break;
 				case 1:
 					if(MekanismAPI.debug)
 					{
 						logger.info("Adding " + finder.connectedTransmitters.size() + " transmitters to single found network");
 					}
-					
+
 					network = finder.networksFound.iterator().next();
-					
+
 					break;
 				default:
 					if(MekanismAPI.debug)
 					{
 						logger.info("Merging " + finder.networksFound.size() + " networks with " + finder.connectedTransmitters.size() + " new transmitters");
 					}
-					
+
 					network = startOrphan.mergeNetworks(finder.networksFound);
 			}
-			
+
 			network.addNewTransmitters(finder.connectedTransmitters);
-			
+
 			return network;
 		}
-		
+
 		return null;
 	}
 
 	public void commitChanges()
 	{
-		for(DynamicNetwork network : networksToChange)
+		for(final DynamicNetwork network : networksToChange)
 		{
 			network.commit();
 		}
-		
+
 		networksToChange.clear();
 	}
 
@@ -213,10 +214,10 @@ public class TransmitterNetworkRegistry
 
 	public String[] toStrings()
 	{
-		String[] strings = new String[networks.size()];
+		final String[] strings = new String[networks.size()];
 		int i = 0;
 
-		for(DynamicNetwork network : networks)
+		for(final DynamicNetwork network : networks)
 		{
 			strings[i++] = network.toString();
 		}
@@ -226,12 +227,12 @@ public class TransmitterNetworkRegistry
 
 	public class OrphanPathFinder<A, N extends DynamicNetwork<A, N>>
 	{
-		public IGridTransmitter<A, N> startPoint;
+		public IGridTransmitter<A, N>			startPoint;
 
-		public HashSet<Coord4D> iterated = Sets.newHashSet();
+		public HashSet<Coord4D>					iterated				= Sets.newHashSet();
 
-		public HashSet<IGridTransmitter<A, N>> connectedTransmitters = Sets.newHashSet();
-		public HashSet<N> networksFound = Sets.newHashSet();
+		public HashSet<IGridTransmitter<A, N>>	connectedTransmitters	= Sets.newHashSet();
+		public HashSet<N>						networksFound			= Sets.newHashSet();
 
 		public OrphanPathFinder(IGridTransmitter<A, N> start)
 		{
@@ -251,22 +252,22 @@ public class TransmitterNetworkRegistry
 			}
 
 			iterated.add(from);
-			
+
 			if(orphanTransmitters.containsKey(from))
 			{
-				IGridTransmitter<A, N> transmitter = orphanTransmitters.get(from);
-				
+				final IGridTransmitter<A, N> transmitter = orphanTransmitters.get(from);
+
 				if(transmitter.isValid() && transmitter.isOrphan())
 				{
 					connectedTransmitters.add(transmitter);
 					transmitter.setOrphan(false);
-					
-					for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
+
+					for(final ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
 					{
 						if(direction != fromDirection)
 						{
-							Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
-							
+							final Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
+
 							if(!(directionCoord == null || iterated.contains(directionCoord)))
 							{
 								iterate(directionCoord, direction.getOpposite());
@@ -274,16 +275,20 @@ public class TransmitterNetworkRegistry
 						}
 					}
 				}
-			} 
-			else {
+			}
+			else
+			{
 				addNetworkToIterated(from);
 			}
 		}
 
 		public void addNetworkToIterated(Coord4D from)
 		{
-			N net = startPoint.getExternalNetwork(from);
-			if(net != null) networksFound.add(net);
+			final N net = startPoint.getExternalNetwork(from);
+			if(net != null)
+			{
+				networksFound.add(net);
+			}
 		}
 	}
 }
diff --git a/src/api/java/mekanism/api/transmitters/package-info.java b/src/api/java/mekanism/api/transmitters/package-info.java
index 06819e7..e959a85 100644
--- a/src/api/java/mekanism/api/transmitters/package-info.java
+++ b/src/api/java/mekanism/api/transmitters/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter")
 package mekanism.api.transmitters;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mekanism/api/util/BlockInfo.java b/src/api/java/mekanism/api/util/BlockInfo.java
index 2cb40d7..a0e349d 100644
--- a/src/api/java/mekanism/api/util/BlockInfo.java
+++ b/src/api/java/mekanism/api/util/BlockInfo.java
@@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack;
 
 public class BlockInfo
 {
-	public Block block;
-	public int meta;
+	public Block	block;
+	public int		meta;
 
 	public BlockInfo(Block b, int j)
 	{
@@ -16,15 +16,14 @@ public class BlockInfo
 
 	public static BlockInfo get(ItemStack stack)
 	{
-		return new BlockInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage());
+		return new BlockInfo(Block.getBlockFromItem(stack.getItem()),
+				stack.getItemDamage());
 	}
 
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof BlockInfo &&
-				((BlockInfo)obj).block == block &&
-				((BlockInfo)obj).meta == meta;
+		return obj instanceof BlockInfo && ((BlockInfo) obj).block == block && ((BlockInfo) obj).meta == meta;
 	}
 
 	@Override
@@ -35,4 +34,4 @@ public class BlockInfo
 		code = 31 * code + meta;
 		return code;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/api/java/mekanism/api/util/ItemInfo.java b/src/api/java/mekanism/api/util/ItemInfo.java
index f27065b..9a810b7 100644
--- a/src/api/java/mekanism/api/util/ItemInfo.java
+++ b/src/api/java/mekanism/api/util/ItemInfo.java
@@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack;
 
 public class ItemInfo
 {
-	public Item item;
-	public int meta;
+	public Item	item;
+	public int	meta;
 
 	public ItemInfo(Item i, int j)
 	{
@@ -22,9 +22,7 @@ public class ItemInfo
 	@Override
 	public boolean equals(Object obj)
 	{
-		return obj instanceof ItemInfo &&
-				((ItemInfo)obj).item == item &&
-				((ItemInfo)obj).meta == meta;
+		return obj instanceof ItemInfo && ((ItemInfo) obj).item == item && ((ItemInfo) obj).meta == meta;
 	}
 
 	@Override
diff --git a/src/api/java/mekanism/api/util/ListUtils.java b/src/api/java/mekanism/api/util/ListUtils.java
index e20807c..4637ae3 100644
--- a/src/api/java/mekanism/api/util/ListUtils.java
+++ b/src/api/java/mekanism/api/util/ListUtils.java
@@ -9,7 +9,7 @@ public class ListUtils
 {
 	public static <V> List<V> inverse(List<V> list)
 	{
-		List<V> toReturn = new ArrayList<V>();
+		final List<V> toReturn = new ArrayList<V>();
 
 		for(int i = list.size() - 1; i >= 0; i--)
 		{
@@ -27,10 +27,11 @@ public class ListUtils
 		{
 			toReturn = copy(list);
 		}
-		else {
+		else
+		{
 			int count = 0;
 
-			for(V obj : list)
+			for(final V obj : list)
 			{
 				count++;
 
@@ -48,9 +49,9 @@ public class ListUtils
 
 	public static <V> List<V> copy(List<V> list)
 	{
-		List<V> toReturn = new ArrayList<V>();
+		final List<V> toReturn = new ArrayList<V>();
 
-		for(V obj : list)
+		for(final V obj : list)
 		{
 			toReturn.add(obj);
 		}
@@ -60,14 +61,14 @@ public class ListUtils
 
 	public static <V> List<V> merge(List<V> listOne, List<V> listTwo)
 	{
-		List<V> newList = new ArrayList<V>();
+		final List<V> newList = new ArrayList<V>();
 
-		for(V obj : listOne)
+		for(final V obj : listOne)
 		{
 			newList.add(obj);
 		}
 
-		for(V obj : listTwo)
+		for(final V obj : listTwo)
 		{
 			newList.add(obj);
 		}
@@ -77,19 +78,20 @@ public class ListUtils
 
 	public static <V> List<V> capRemains(List<V> list, int cap)
 	{
-		List<V> toReturn = new ArrayList<V>();
+		final List<V> toReturn = new ArrayList<V>();
 
 		if(list.size() <= cap)
 		{
 			return toReturn;
 		}
-		else {
-			List<V> inverse = inverse(list);
+		else
+		{
+			inverse(list);
 
-			int iterNeeded = list.size() - cap;
+			final int iterNeeded = list.size() - cap;
 			int count = 0;
 
-			for(V obj : list)
+			for(final V obj : list)
 			{
 				count++;
 
@@ -108,18 +110,18 @@ public class ListUtils
 	public static <V> ArrayList<List<V>> split(List<V> list, int divide)
 	{
 		int remain = list.size() % divide;
-		int size = (list.size() - remain) / divide;
+		final int size = (list.size() - remain) / divide;
 
-		ArrayList<List<V>> toReturn = new ArrayList<List<V>>();
+		final ArrayList<List<V>> toReturn = new ArrayList<List<V>>();
 
 		for(int i = 0; i < divide; i++)
 		{
 			toReturn.add(i, new ArrayList<V>());
 		}
 
-		for(List<V> iterSet : toReturn)
+		for(final List<V> iterSet : toReturn)
 		{
-			List<V> removed = new ArrayList<V>();
+			final List<V> removed = new ArrayList<V>();
 
 			int toAdd = size;
 
@@ -129,7 +131,7 @@ public class ListUtils
 				toAdd++;
 			}
 
-			for(V obj : list)
+			for(final V obj : list)
 			{
 				if(toAdd == 0)
 				{
@@ -141,7 +143,7 @@ public class ListUtils
 				toAdd--;
 			}
 
-			for(V obj : removed)
+			for(final V obj : removed)
 			{
 				list.remove(obj);
 			}
@@ -152,7 +154,7 @@ public class ListUtils
 
 	public static <V> V getTop(List<V> list)
 	{
-		for(V obj : list)
+		for(final V obj : list)
 		{
 			return obj;
 		}
@@ -162,22 +164,22 @@ public class ListUtils
 
 	public static <V> List<V> asList(Set<V> set)
 	{
-		return (List<V>)Arrays.asList(set.toArray());
+		return (List<V>) Arrays.asList(set.toArray());
 	}
 
 	public static <V> List<V> asList(V... values)
 	{
-		return (List<V>)Arrays.asList(values);
+		return Arrays.asList(values);
 	}
 
 	public static double[] splitDouble(int size, double num)
 	{
-		double[] split = new double[size];
+		final double[] split = new double[size];
 
 		for(int i = 0; i < size; i++)
 		{
-			double remain = num%size;
-			double ret = (num-remain)/size;
+			final double remain = num % size;
+			double ret = (num - remain) / size;
 			ret += remain;
 
 			split[i] = ret;
@@ -189,14 +191,17 @@ public class ListUtils
 
 	public static double[] percent(double[] values)
 	{
-		double[] ret = new double[values.length];
+		final double[] ret = new double[values.length];
 		double total = 0;
 
-		for(double d : values) total += d;
+		for(final double d : values)
+		{
+			total += d;
+		}
 
 		for(int i = 0; i < values.length; i++)
 		{
-			ret[i] = values[i]/total;
+			ret[i] = values[i] / total;
 		}
 
 		return ret;
@@ -204,23 +209,26 @@ public class ListUtils
 
 	public static int[] calcPercentInt(double[] percent, int val)
 	{
-		int[] ret = new int[percent.length];
+		final int[] ret = new int[percent.length];
 
 		for(int i = 0; i < percent.length; i++)
 		{
-			ret[i] = (int)Math.round(val*percent[i]);
+			ret[i] = (int) Math.round(val * percent[i]);
 		}
 
 		int newTotal = 0;
-		for(int i : ret) newTotal += i;
+		for(final int i : ret)
+		{
+			newTotal += i;
+		}
 
-		int diff = val-newTotal;
+		int diff = val - newTotal;
 
 		if(diff != val)
 		{
 			for(int i = 0; i < ret.length; i++)
 			{
-				int num = ret[i];
+				final int num = ret[i];
 
 				if(diff < 0 && num == 0)
 				{
@@ -250,12 +258,12 @@ public class ListUtils
 
 	public static int[] splitInt(int size, int num)
 	{
-		int[] split = new int[size];
+		final int[] split = new int[size];
 
 		for(int i = 0; i < size; i++)
 		{
-			int remain = num%size;
-			int ret = (num-remain)/size;
+			final int remain = num % size;
+			int ret = (num - remain) / size;
 			ret += remain;
 
 			split[i] = ret;
@@ -267,14 +275,17 @@ public class ListUtils
 
 	public static double[] percent(int[] values)
 	{
-		double[] ret = new double[values.length];
+		final double[] ret = new double[values.length];
 		double total = 0;
 
-		for(double d : values) total += d;
+		for(final double d : values)
+		{
+			total += d;
+		}
 
 		for(int i = 0; i < values.length; i++)
 		{
-			ret[i] = values[i]/total;
+			ret[i] = values[i] / total;
 		}
 
 		return ret;
diff --git a/src/api/java/mekanism/api/util/StackUtils.java b/src/api/java/mekanism/api/util/StackUtils.java
index 7363c75..17cfe3e 100644
--- a/src/api/java/mekanism/api/util/StackUtils.java
+++ b/src/api/java/mekanism/api/util/StackUtils.java
@@ -16,7 +16,7 @@ public final class StackUtils
 			return null;
 		}
 
-		List<ItemStack> ret = new ArrayList<ItemStack>();
+		final List<ItemStack> ret = new ArrayList<ItemStack>();
 
 		if(stack.stackSize == 1)
 		{
@@ -24,10 +24,10 @@ public final class StackUtils
 			return ret;
 		}
 
-		int remain = stack.stackSize % 2;
-		int split = (int)((float)(stack.stackSize)/2F);
+		final int remain = stack.stackSize % 2;
+		final int split = (int) ((stack.stackSize) / 2F);
 
-		ret.add(size(stack, split+remain));
+		ret.add(size(stack, split + remain));
 		ret.add(size(stack, split));
 
 		return ret;
@@ -59,7 +59,7 @@ public final class StackUtils
 		{
 			return check == wild;
 		}
-		
+
 		return wild.getItem() == check.getItem() && (wild.getItemDamage() == OreDictionary.WILDCARD_VALUE || wild.getItemDamage() == check.getItemDamage());
 	}
 
@@ -70,9 +70,9 @@ public final class StackUtils
 
 	public static List<ItemStack> even(ItemStack stack1, ItemStack stack2)
 	{
-		ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+		final ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
 
-		if(getSize(stack1) == getSize(stack2) || Math.abs(getSize(stack1)-getSize(stack2)) == 1)
+		if(getSize(stack1) == getSize(stack2) || Math.abs(getSize(stack1) - getSize(stack2)) == 1)
 		{
 			ret.add(stack1);
 			ret.add(stack2);
@@ -82,18 +82,18 @@ public final class StackUtils
 
 		if(getSize(stack1) > getSize(stack2))
 		{
-			int diff = getSize(stack1)-getSize(stack2);
+			final int diff = getSize(stack1) - getSize(stack2);
 
-			List<ItemStack> split = split(size(stack1, diff));
+			final List<ItemStack> split = split(size(stack1, diff));
 
 			ret.add(subtract(stack1, split.get(0)));
 			ret.add(add(stack2, split.get(0)));
 		}
 		else if(getSize(stack2) > getSize(stack1))
 		{
-			int diff = getSize(stack2)-getSize(stack1);
+			final int diff = getSize(stack2) - getSize(stack1);
 
-			List<ItemStack> split = split(size(stack2, diff));
+			final List<ItemStack> split = split(size(stack2, diff));
 
 			ret.add(subtract(stack2, split.get(0)));
 			ret.add(add(stack1, split.get(0)));
@@ -113,7 +113,7 @@ public final class StackUtils
 			return stack1;
 		}
 
-		return size(stack1, getSize(stack1)+getSize(stack2));
+		return size(stack1, getSize(stack1) + getSize(stack2));
 	}
 
 	public static ItemStack subtract(ItemStack stack1, ItemStack stack2)
@@ -127,7 +127,7 @@ public final class StackUtils
 			return stack1;
 		}
 
-		return size(stack1, getSize(stack1)-getSize(stack2));
+		return size(stack1, getSize(stack1) - getSize(stack2));
 	}
 
 	public static ItemStack size(ItemStack stack, int size)
@@ -137,7 +137,7 @@ public final class StackUtils
 			return null;
 		}
 
-		ItemStack ret = stack.copy();
+		final ItemStack ret = stack.copy();
 		ret.stackSize = size;
 		return ret;
 	}
@@ -156,27 +156,27 @@ public final class StackUtils
 	{
 		return stack != null ? stack.stackSize : 0;
 	}
-	
+
 	public static List<ItemStack> getMergeRejects(ItemStack[] orig, ItemStack[] toAdd)
 	{
-		List<ItemStack> ret = new ArrayList<ItemStack>();
-		
+		final List<ItemStack> ret = new ArrayList<ItemStack>();
+
 		for(int i = 0; i < toAdd.length; i++)
 		{
 			if(toAdd[i] != null)
 			{
-				ItemStack reject = getMergeReject(orig[i], toAdd[i]);
-				
+				final ItemStack reject = getMergeReject(orig[i], toAdd[i]);
+
 				if(reject != null)
 				{
 					ret.add(reject);
 				}
 			}
 		}
-			
+
 		return ret;
 	}
-	
+
 	public static void merge(ItemStack[] orig, ItemStack[] toAdd)
 	{
 		for(int i = 0; i < toAdd.length; i++)
@@ -187,51 +187,52 @@ public final class StackUtils
 			}
 		}
 	}
-	
+
 	public static ItemStack merge(ItemStack orig, ItemStack toAdd)
 	{
 		if(orig == null)
 		{
 			return toAdd;
 		}
-		
+
 		if(toAdd == null)
 		{
 			return orig;
 		}
-		
+
 		if(!orig.isItemEqual(toAdd) || !ItemStack.areItemStackTagsEqual(orig, toAdd))
 		{
 			return orig;
 		}
-		
-		return StackUtils.size(orig, Math.min(orig.getMaxStackSize(), orig.stackSize+toAdd.stackSize));
+
+		return StackUtils.size(orig, Math.min(orig.getMaxStackSize(), orig.stackSize + toAdd.stackSize));
 	}
-	
+
 	public static ItemStack getMergeReject(ItemStack orig, ItemStack toAdd)
 	{
 		if(orig == null)
 		{
 			return null;
 		}
-		
+
 		if(toAdd == null)
 		{
 			return orig;
 		}
-		
+
 		if(!orig.isItemEqual(toAdd) || !ItemStack.areItemStackTagsEqual(orig, toAdd))
 		{
 			return orig;
 		}
-		
-		int newSize = orig.stackSize+toAdd.stackSize;
-		
+
+		final int newSize = orig.stackSize + toAdd.stackSize;
+
 		if(newSize > orig.getMaxStackSize())
 		{
-			return StackUtils.size(orig, newSize-orig.getMaxStackSize());
+			return StackUtils.size(orig, newSize - orig.getMaxStackSize());
 		}
-		else {
+		else
+		{
 			return StackUtils.size(orig, newSize);
 		}
 	}
@@ -247,8 +248,8 @@ public final class StackUtils
 		{
 			return -1;
 		}
-		
-		String name = stack.getItemDamage() == OreDictionary.WILDCARD_VALUE ? stack.getItem().getUnlocalizedName() : stack.getItem().getUnlocalizedName(stack);
+
+		final String name = stack.getItemDamage() == OreDictionary.WILDCARD_VALUE ? stack.getItem().getUnlocalizedName() : stack.getItem().getUnlocalizedName(stack);
 		return name.hashCode() << 8 | stack.getItemDamage();
 	}
 }
diff --git a/src/api/java/mekanism/api/util/UnitDisplayUtils.java b/src/api/java/mekanism/api/util/UnitDisplayUtils.java
index 9dd3e28..30eace1 100644
--- a/src/api/java/mekanism/api/util/UnitDisplayUtils.java
+++ b/src/api/java/mekanism/api/util/UnitDisplayUtils.java
@@ -7,13 +7,10 @@ public class UnitDisplayUtils
 {
 	public static enum ElectricUnit
 	{
-		JOULES("Joule", "J"),
-		REDSTONE_FLUX("Redstone Flux", "RF"),
-		MINECRAFT_JOULES("Minecraft Joule", "MJ"),
-		ELECTRICAL_UNITS("Electrical Unit", "EU");
+		JOULES("Joule", "J"), REDSTONE_FLUX("Redstone Flux", "RF"), MINECRAFT_JOULES("Minecraft Joule", "MJ"), ELECTRICAL_UNITS("Electrical Unit", "EU");
 
-		public String name;
-		public String symbol;
+		public String	name;
+		public String	symbol;
 
 		private ElectricUnit(String s, String s1)
 		{
@@ -29,16 +26,12 @@ public class UnitDisplayUtils
 
 	public static enum TemperatureUnit
 	{
-		KELVIN("Kelvin", "K", 0, 1),
-		CELSIUS("Celsius", "°C", 273.15, 1),
-		RANKINE("Rankine", "R", 0, 9D/5D),
-		FAHRENHEIT("Fahrenheit", "°F", 459.67, 9D/5D),
-		AMBIENT("Ambient", "+STP", 300, 1);
+		KELVIN("Kelvin", "K", 0, 1), CELSIUS("Celsius", "°C", 273.15, 1), RANKINE("Rankine", "R", 0, 9D / 5D), FAHRENHEIT("Fahrenheit", "°F", 459.67, 9D / 5D), AMBIENT("Ambient", "+STP", 300, 1);
 
-		public String name;
-		public String symbol;
-		double zeroOffset;
-		double intervalSize;
+		public String	name;
+		public String	symbol;
+		double			zeroOffset;
+		double			intervalSize;
 
 		private TemperatureUnit(String s, String s1, double offset, double size)
 		{
@@ -62,29 +55,16 @@ public class UnitDisplayUtils
 	/** Metric system of measurement. */
 	public static enum MeasurementUnit
 	{
-		FEMTO("Femto", "f", 0.000000000000001D),
-		PICO("Pico", "p", 0.000000000001D),
-		NANO("Nano", "n", 0.000000001D),
-		MICRO("Micro", "u", 0.000001D),
-		MILLI("Milli", "m", 0.001D),
-		BASE("", "", 1),
-		KILO("Kilo", "k", 1000D),
-		MEGA("Mega", "M", 1000000D),
-		GIGA("Giga", "G", 1000000000D),
-		TERA("Tera", "T", 1000000000000D),
-		PETA("Peta", "P", 1000000000000000D),
-		EXA("Exa", "E", 1000000000000000000D),
-		ZETTA("Zetta", "Z", 1000000000000000000000D),
-		YOTTA("Yotta", "Y", 1000000000000000000000000D);
+		FEMTO("Femto", "f", 0.000000000000001D), PICO("Pico", "p", 0.000000000001D), NANO("Nano", "n", 0.000000001D), MICRO("Micro", "u", 0.000001D), MILLI("Milli", "m", 0.001D), BASE("", "", 1), KILO("Kilo", "k", 1000D), MEGA("Mega", "M", 1000000D), GIGA("Giga", "G", 1000000000D), TERA("Tera", "T", 1000000000000D), PETA("Peta", "P", 1000000000000000D), EXA("Exa", "E", 1000000000000000000D), ZETTA("Zetta", "Z", 1000000000000000000000D), YOTTA("Yotta", "Y", 1000000000000000000000000D);
 
 		/** long name for the unit */
-		public String name;
+		public String	name;
 
 		/** short unit version of the unit */
-		public String symbol;
+		public String	symbol;
 
 		/** Point by which a number is consider to be of this unit */
-		public double value;
+		public double	value;
 
 		private MeasurementUnit(String s, String s1, double v)
 		{
@@ -99,7 +79,8 @@ public class UnitDisplayUtils
 			{
 				return symbol;
 			}
-			else {
+			else
+			{
 				return name;
 			}
 		}
@@ -149,10 +130,11 @@ public class UnitDisplayUtils
 		{
 			return value + " " + unitName;
 		}
-		else {
+		else
+		{
 			for(int i = 0; i < MeasurementUnit.values().length; i++)
 			{
-				MeasurementUnit lowerMeasure = MeasurementUnit.values()[i];
+				final MeasurementUnit lowerMeasure = MeasurementUnit.values()[i];
 
 				if(lowerMeasure.below(value) && lowerMeasure.ordinal() == 0)
 				{
@@ -164,7 +146,7 @@ public class UnitDisplayUtils
 					return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + " " + lowerMeasure.getName(isShort) + unitName;
 				}
 
-				MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1];
+				final MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1];
 
 				if((lowerMeasure.above(value) && upperMeasure.below(value)) || lowerMeasure.value == value)
 				{
@@ -192,7 +174,7 @@ public class UnitDisplayUtils
 		{
 			if(decimalPlaces < 1)
 			{
-				return (int)value + " " + unit.getPlural();
+				return (int) value + " " + unit.getPlural();
 			}
 
 			return roundDecimals(value, decimalPlaces) + " " + unit.getPlural();
@@ -200,7 +182,7 @@ public class UnitDisplayUtils
 
 		if(decimalPlaces < 1)
 		{
-			return (int)value + " " + unit.name;
+			return (int) value + " " + unit.name;
 		}
 
 		return roundDecimals(value, decimalPlaces) + " " + unit.name;
@@ -228,10 +210,11 @@ public class UnitDisplayUtils
 		{
 			return value + (isShort ? "" : " ") + unitName;
 		}
-		else {
+		else
+		{
 			for(int i = 0; i < MeasurementUnit.values().length; i++)
 			{
-				MeasurementUnit lowerMeasure = MeasurementUnit.values()[i];
+				final MeasurementUnit lowerMeasure = MeasurementUnit.values()[i];
 
 				if(lowerMeasure.below(value) && lowerMeasure.ordinal() == 0)
 				{
@@ -243,7 +226,7 @@ public class UnitDisplayUtils
 					return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + (isShort ? "" : " ") + lowerMeasure.getName(isShort) + unitName;
 				}
 
-				MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1];
+				final MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1];
 
 				if((lowerMeasure.above(value) && upperMeasure.below(value)) || lowerMeasure.value == value)
 				{
@@ -267,8 +250,8 @@ public class UnitDisplayUtils
 
 	public static double roundDecimals(double d, int decimalPlaces)
 	{
-		int j = (int)(d*Math.pow(10, decimalPlaces));
-		return j/Math.pow(10, decimalPlaces);
+		final int j = (int) (d * Math.pow(10, decimalPlaces));
+		return j / Math.pow(10, decimalPlaces);
 	}
 
 	public static double roundDecimals(double d)
@@ -278,18 +261,11 @@ public class UnitDisplayUtils
 
 	public static enum EnergyType
 	{
-		J,
-		RF,
-		EU,
-		MJ
+		J, RF, EU, MJ
 	}
 
 	public static enum TempType
 	{
-		K,
-		C,
-		R,
-		F,
-		STP
+		K, C, R, F, STP
 	}
 }
diff --git a/src/api/java/mekanism/api/util/package-info.java b/src/api/java/mekanism/api/util/package-info.java
index e5253bc..78fd35b 100644
--- a/src/api/java/mekanism/api/util/package-info.java
+++ b/src/api/java/mekanism/api/util/package-info.java
@@ -1,3 +1,5 @@
 @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|util")
 package mekanism.api.util;
-import cpw.mods.fml.common.API;
\ No newline at end of file
+
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mods/battlegear2/api/IAllowItem.java b/src/api/java/mods/battlegear2/api/IAllowItem.java
index 78e9ffa..2610f74 100644
--- a/src/api/java/mods/battlegear2/api/IAllowItem.java
+++ b/src/api/java/mods/battlegear2/api/IAllowItem.java
@@ -2,10 +2,11 @@ package mods.battlegear2.api;
 
 import net.minecraft.item.ItemStack;
 
-public interface IAllowItem {
+public interface IAllowItem
+{
 
 	/**
-     * Returns true if the mainhand {@link ItemStack} allows the offhand {@link ItemStack} to be placed in the partner offhand slot
-     */
+	 * Returns true if the mainhand {@link ItemStack} allows the offhand {@link ItemStack} to be placed in the partner offhand slot
+	 */
 	public boolean allowOffhand(ItemStack mainhand, ItemStack offhand);
 }
diff --git a/src/api/java/mods/battlegear2/api/IOffhandDual.java b/src/api/java/mods/battlegear2/api/IOffhandDual.java
index 4e93dd5..91f1293 100644
--- a/src/api/java/mods/battlegear2/api/IOffhandDual.java
+++ b/src/api/java/mods/battlegear2/api/IOffhandDual.java
@@ -1,62 +1,63 @@
 package mods.battlegear2.api;
 
-import cpw.mods.fml.relauncher.Side;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import cpw.mods.fml.relauncher.Side;
 
-public interface IOffhandDual {
+public interface IOffhandDual
+{
 	/**
-     * Returns true if this item can be dual wielded in the offhand slot
-     * @param off The {@link ItemStack} holding this item
-     */
-    public boolean isOffhandHandDual(ItemStack off);
-    
-    /**
-     * Perform any function when this item is held in the offhand and the user right clicks an entity.
-     * This is generally used to attack an entity with the offhand item.
-     * If this is the case the {@link PlayerEventChild.OffhandAttackEvent#parent} field should
-     * be canceled (or {@link PlayerEventChild.OffhandAttackEvent#cancelParent} field left at true, to prevent any default right clicking events (Eg Villager Trading)
-     *
-     * @param event        the OffhandAttackEvent that was generated
-     * @param mainhandItem the {@link ItemStack} currently being held in the right hand
-     * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
-     * @return true if the off hand swing animation should be performed
-     */
-    public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem);
+	 * Returns true if this item can be dual wielded in the offhand slot
+	 * @param off The {@link ItemStack} holding this item
+	 */
+	public boolean isOffhandHandDual(ItemStack off);
 
-    /**
-     * Perform any function when this item is held in the offhand and the user right clicks "Air".
-     * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled and mainhandItem is not null,
-     * following Forge rules for PlayerInteractEvent with Action==RIGHT_CLICK_AIR
-     * Note: PlayerInteractEvent is already cancelled beforehand, and will be cancelled after if this method returns false
-     * Note: Above issues will be fixed in next Minecraft versions by replacing first arg with a shallow copy
-     * @param event        the PlayerInteractEvent that was generated
-     * @param mainhandItem the {@link ItemStack} currently being held in the right hand
-     * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
-     * @return true if the off hand swing animation should be performed
-     */
-    public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
+	/**
+	 * Perform any function when this item is held in the offhand and the user right clicks an entity.
+	 * This is generally used to attack an entity with the offhand item.
+	 * If this is the case the {@link PlayerEventChild.OffhandAttackEvent#parent} field should
+	 * be canceled (or {@link PlayerEventChild.OffhandAttackEvent#cancelParent} field left at true, to prevent any default right clicking events (Eg Villager Trading)
+	 *
+	 * @param event        the OffhandAttackEvent that was generated
+	 * @param mainhandItem the {@link ItemStack} currently being held in the right hand
+	 * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
+	 * @return true if the off hand swing animation should be performed
+	 */
+	public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem);
 
-    /**
-     * Perform any function when this item is held in the offhand and the user right clicks a block.
-     * Note: this will happen prior to the activation of any activation functions of blocks
-     * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled
-     * Note: {@link PlayerInteractEvent#useItem} is already set on {@link Event.Result#DENY} before reaching this method, in order to avoid mainhandItem usage
-     *
-     * @param event        the PlayerInteractEvent that was generated
-     * @param mainhandItem the {@link ItemStack} currently being held in the right hand
-     * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
-     * @return true if the off hand swing animation should be performed
-     */
-    public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
+	/**
+	 * Perform any function when this item is held in the offhand and the user right clicks "Air".
+	 * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled and mainhandItem is not null,
+	 * following Forge rules for PlayerInteractEvent with Action==RIGHT_CLICK_AIR
+	 * Note: PlayerInteractEvent is already cancelled beforehand, and will be cancelled after if this method returns false
+	 * Note: Above issues will be fixed in next Minecraft versions by replacing first arg with a shallow copy
+	 * @param event        the PlayerInteractEvent that was generated
+	 * @param mainhandItem the {@link ItemStack} currently being held in the right hand
+	 * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
+	 * @return true if the off hand swing animation should be performed
+	 */
+	public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
 
-    @SuppressWarnings("unused")
-    /**
-     * Perform any passive effects on each game tick when this item is held in the offhand
-     * @deprecated See {@link Item#onUpdate(ItemStack, World, Entity, int, boolean)}
-     * @param effectiveSide the effective side the method was called from
-     * @param mainhandItem  the {@link ItemStack} currently being held in the right hand
-     * @param offhandItem   the {@link ItemStack} currently being held in the left hand
-     */
-    public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem);
+	/**
+	 * Perform any function when this item is held in the offhand and the user right clicks a block.
+	 * Note: this will happen prior to the activation of any activation functions of blocks
+	 * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled
+	 * Note: {@link PlayerInteractEvent#useItem} is already set on {@link Event.Result#DENY} before reaching this method, in order to avoid mainhandItem usage
+	 *
+	 * @param event        the PlayerInteractEvent that was generated
+	 * @param mainhandItem the {@link ItemStack} currently being held in the right hand
+	 * @param offhandItem  the {@link ItemStack} currently being held in the left hand, holding this item
+	 * @return true if the off hand swing animation should be performed
+	 */
+	public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
+
+	@SuppressWarnings("unused")
+	/**
+	 * Perform any passive effects on each game tick when this item is held in the offhand
+	 * @deprecated See {@link Item#onUpdate(ItemStack, World, Entity, int, boolean)}
+	 * @param effectiveSide the effective side the method was called from
+	 * @param mainhandItem  the {@link ItemStack} currently being held in the right hand
+	 * @param offhandItem   the {@link ItemStack} currently being held in the left hand
+	 */
+	public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem);
 }
diff --git a/src/api/java/mods/battlegear2/api/ISheathed.java b/src/api/java/mods/battlegear2/api/ISheathed.java
index 411c639..5a96625 100644
--- a/src/api/java/mods/battlegear2/api/ISheathed.java
+++ b/src/api/java/mods/battlegear2/api/ISheathed.java
@@ -10,11 +10,12 @@ import net.minecraft.item.ItemStack;
  * See {@link mods.battlegear2.api.RenderPlayerEventChild.PreRenderSheathed} and {@link mods.battlegear2.api.RenderPlayerEventChild.PostRenderSheathed}
  * for more flexibility over the rendering
  */
-public interface ISheathed {
+public interface ISheathed
+{
 
-    /**
-     * Returns true if this item should always be sheathed on the back, false if it should be sheathed on the hip
-     * @param item the {@link ItemStack} to be sheathed
-     */
-    public boolean sheatheOnBack(ItemStack item);
+	/**
+	 * Returns true if this item should always be sheathed on the back, false if it should be sheathed on the hip
+	 * @param item the {@link ItemStack} to be sheathed
+	 */
+	public boolean sheatheOnBack(ItemStack item);
 }
diff --git a/src/api/java/mods/battlegear2/api/PlayerEventChild.java b/src/api/java/mods/battlegear2/api/PlayerEventChild.java
index 95ea329..d6a04f4 100644
--- a/src/api/java/mods/battlegear2/api/PlayerEventChild.java
+++ b/src/api/java/mods/battlegear2/api/PlayerEventChild.java
@@ -1,271 +1,306 @@
 package mods.battlegear2.api;
 
-import cpw.mods.fml.common.eventhandler.Cancelable;
+import mods.battlegear2.api.quiver.IArrowContainer2;
+import mods.battlegear2.api.shield.IShield;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.player.ArrowLooseEvent;
+import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.event.entity.player.EntityInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import cpw.mods.fml.common.eventhandler.Cancelable;
 
-public abstract class PlayerEventChild extends PlayerEvent{
+public abstract class PlayerEventChild extends PlayerEvent
+{
 
-    /**
-     * The event that this event is a child of
-     */
-	public final PlayerEvent parent;
+	/**
+	 * The event that this event is a child of
+	 */
+	public final PlayerEvent	parent;
 
-	public PlayerEventChild(PlayerEvent parent) {
+	public PlayerEventChild(PlayerEvent parent)
+	{
 		super(parent.entityPlayer);
 		this.parent = parent;
 	}
 
-    public void setCancelParentEvent(boolean cancel) {
-        parent.setCanceled(cancel);
-    }
+	public void setCancelParentEvent(boolean cancel)
+	{
+		parent.setCanceled(cancel);
+	}
 
-    @Override
-    public void setCanceled(boolean cancel) {
-        super.setCanceled(cancel);
-        parent.setCanceled(cancel);
-    }
+	@Override
+	public void setCanceled(boolean cancel)
+	{
+		super.setCanceled(cancel);
+		parent.setCanceled(cancel);
+	}
 
-    @Override
-    public void setResult(Result value) {
-        super.setResult(value);
-        parent.setResult(value);
-    }
+	@Override
+	public void setResult(Result value)
+	{
+		super.setResult(value);
+		parent.setResult(value);
+	}
+
+	public EntityPlayer getPlayer()
+	{
+		return parent.entityPlayer;
+	}
 
-    public EntityPlayer getPlayer(){
-        return parent.entityPlayer;
-    }
-    
 	/**
 	 * Event fired when a shield successfully blocks an attack (in {@link LivingHurtEvent})
 	 */
-	 public static class ShieldBlockEvent extends PlayerEventChild {
-	 	public final ItemStack shield;
-	 	public final DamageSource source;
-	 	public final float ammount; // use same name as other Forge events
-	 	public float ammountRemaining = 0.0F; // damage remaining after shield block event, if any
-        /**
-         * If the {@link IShield#blockAnimation(EntityPlayer, float)} should be called
-         */
-        public boolean performAnimation = true;
-        /**
-         * If the shield should be damaged based on the ammount and the result of {@link IShield#getDamageReduction(ItemStack, DamageSource)}
-         */
-        public boolean damageShield = true;
-	 	public ShieldBlockEvent(PlayerEvent parent, ItemStack shield, DamageSource source, float ammount) {
-	 		super(parent);
-	 		this.shield = shield;
-	 		this.source = source;
-	 		this.ammount = ammount;
-	 	}
-	 }
+	public static class ShieldBlockEvent extends PlayerEventChild
+	{
+		public final ItemStack		shield;
+		public final DamageSource	source;
+		public final float			ammount;					// use same name as other Forge events
+		public float				ammountRemaining	= 0.0F; // damage remaining after shield block event, if any
+		/**
+		 * If the {@link IShield#blockAnimation(EntityPlayer, float)} should be called
+		 */
+		public boolean				performAnimation	= true;
+		/**
+		 * If the shield should be damaged based on the ammount and the result of {@link IShield#getDamageReduction(ItemStack, DamageSource)}
+		 */
+		public boolean				damageShield		= true;
 
-    /**
-     * Called when a player right clicks in battlemode
-     * The parent event can be either {@link PlayerInteractEvent} or {@link EntityInteractEvent} if the OffhandAttackEvent allowed swinging
-     * Both {@link ItemStack} can be null
-     * If cancelled, no offhand swinging will be performed
-     */
-    @Cancelable
-    public static class OffhandSwingEvent extends PlayerEventChild {
-        public final ItemStack mainHand;
-        public final ItemStack offHand;
-        public OffhandSwingEvent(PlayerEvent parent, ItemStack mainHand, ItemStack offHand){
-            super(parent);
-            this.mainHand = mainHand;
-            this.offHand = offHand;
-        }
-    }
+		public ShieldBlockEvent(PlayerEvent parent, ItemStack shield, DamageSource source, float ammount)
+		{
+			super(parent);
+			this.shield = shield;
+			this.source = source;
+			this.ammount = ammount;
+		}
+	}
 
-    /**
-     * Called when a player right clicks an entity in battlemode
-     * Both {@link ItemStack} can be null
-     * Cancelling will prevent any further processing and prevails over the boolean fields
-     */
-    @Cancelable
-    public static class OffhandAttackEvent extends PlayerEventChild {
+	/**
+	 * Called when a player right clicks in battlemode
+	 * The parent event can be either {@link PlayerInteractEvent} or {@link EntityInteractEvent} if the OffhandAttackEvent allowed swinging
+	 * Both {@link ItemStack} can be null
+	 * If cancelled, no offhand swinging will be performed
+	 */
+	@Cancelable
+	public static class OffhandSwingEvent extends PlayerEventChild
+	{
+		public final ItemStack	mainHand;
+		public final ItemStack	offHand;
 
-        /**
-         * If we should call the OffhandSwingEvent and perform swinging
-         */
-        public boolean swingOffhand = true;
-        /**
-         * If we should perform an attack on the entity with the offhand item
-         * Note: Will post {@link AttackEntityEvent} and {@link Item#onLeftClickEntity(ItemStack, EntityPlayer, Entity)}
-         * with {@link InventoryPlayer#currentItem} offset to the offhand
-         */
-        public boolean shouldAttack = true;
-        /**
-         * If we should cancel the base entity interaction event
-         */
-        public boolean cancelParent = true;
-        /**
-         * The base entity interaction event
-         */
-        public final EntityInteractEvent event;
-        /**
-         * Content of the main hand slot
-         */
-        public final ItemStack mainHand;
-        /**
-         * Content of the off hand slot
-         */
-        public final ItemStack offHand;
+		public OffhandSwingEvent(PlayerEvent parent, ItemStack mainHand, ItemStack offHand)
+		{
+			super(parent);
+			this.mainHand = mainHand;
+			this.offHand = offHand;
+		}
+	}
 
-        public OffhandAttackEvent(EntityInteractEvent parent, ItemStack mainHand, ItemStack offHand) {
-            super(parent);
-            this.event = parent;
-            this.mainHand = mainHand;
-            this.offHand = offHand;
-        }
+	/**
+	 * Called when a player right clicks an entity in battlemode
+	 * Both {@link ItemStack} can be null
+	 * Cancelling will prevent any further processing and prevails over the boolean fields
+	 */
+	@Cancelable
+	public static class OffhandAttackEvent extends PlayerEventChild
+	{
+
+		/**
+		 * If we should call the OffhandSwingEvent and perform swinging
+		 */
+		public boolean						swingOffhand	= true;
+		/**
+		 * If we should perform an attack on the entity with the offhand item
+		 * Note: Will post {@link AttackEntityEvent} and {@link Item#onLeftClickEntity(ItemStack, EntityPlayer, Entity)}
+		 * with {@link InventoryPlayer#currentItem} offset to the offhand
+		 */
+		public boolean						shouldAttack	= true;
+		/**
+		 * If we should cancel the base entity interaction event
+		 */
+		public boolean						cancelParent	= true;
+		/**
+		 * The base entity interaction event
+		 */
+		public final EntityInteractEvent	event;
+		/**
+		 * Content of the main hand slot
+		 */
+		public final ItemStack				mainHand;
+		/**
+		 * Content of the off hand slot
+		 */
+		public final ItemStack				offHand;
+
+		public OffhandAttackEvent(EntityInteractEvent parent, ItemStack mainHand, ItemStack offHand)
+		{
+			super(parent);
+			event = parent;
+			this.mainHand = mainHand;
+			this.offHand = offHand;
+		}
+
+		public Entity getTarget()
+		{
+			return ((EntityInteractEvent) parent).target;
+		}
+	}
 
-        public Entity getTarget() {
-            return ((EntityInteractEvent)parent).target;
-        }
-    }
+	/**
+	 * This event replicates the event usage of {@link PlayerInteractEvent} for the item in left hand on right click,
+	 * allowing support for other mods that use such event to customize item usage
+	 * {@link Item#onItemUseFirst}, {@link Item#onItemRightClick} and {@link Item#onItemUse} will then get called the same way as with the item in the player right hand for PlayerInteractEvent
+	 */
+	@Cancelable
+	public static class UseOffhandItemEvent extends PlayerEventChild
+	{
+		/**
+		 * The {@link ItemStack} held in left hand
+		 */
+		public final ItemStack				offhand;
+		/**
+		 * The equivalent {@link PlayerInteractEvent} that would have been triggered if the offhand item was held in right hand and right click was pressed
+		 */
+		public final PlayerInteractEvent	event;
+
+		public UseOffhandItemEvent(PlayerInteractEvent event, ItemStack offhand)
+		{
+			super(event);
+			this.event = event;
+			this.offhand = offhand;
+		}
+	}
+
+	public static class QuiverArrowEvent extends PlayerEventChild
+	{
+		/**
+		 * The event from which this occurred
+		 */
+		protected final ArrowLooseEvent	event;
 
-    /**
-     * This event replicates the event usage of {@link PlayerInteractEvent} for the item in left hand on right click,
-     * allowing support for other mods that use such event to customize item usage
-     * {@link Item#onItemUseFirst}, {@link Item#onItemRightClick} and {@link Item#onItemUse} will then get called the same way as with the item in the player right hand for PlayerInteractEvent
-     */
-    @Cancelable
-    public static class UseOffhandItemEvent extends PlayerEventChild{
-        /**
-         * The {@link ItemStack} held in left hand
-         */
-        public final ItemStack offhand;
-        /**
-         * The equivalent {@link PlayerInteractEvent} that would have been triggered if the offhand item was held in right hand and right click was pressed
-         */
-        public final PlayerInteractEvent event;
-        public UseOffhandItemEvent(PlayerInteractEvent event, ItemStack offhand){
-            super(event);
-            this.event = event;
-            this.offhand = offhand;
-        }
-    }
+		public QuiverArrowEvent(ArrowLooseEvent event)
+		{
+			super(event);
+			this.event = event;
+		}
 
-    public static class QuiverArrowEvent extends PlayerEventChild{
-        /**
-         * The event from which this occurred
-         */
-        protected final ArrowLooseEvent event;
-        public QuiverArrowEvent(ArrowLooseEvent event){
-            super(event);
-            this.event = event;
-        }
+		/**
+		 * @return the player using the bow
+		 */
+		public EntityPlayer getArcher()
+		{
+			return getPlayer();
+		}
 
-        /**
-         * @return the player using the bow
-         */
-        public EntityPlayer getArcher(){
-            return getPlayer();
-        }
+		/**
+		 * @return the bow trying to fire
+		 */
+		public ItemStack getBow()
+		{
+			return event.bow;
+		}
 
-        /**
-         * @return the bow trying to fire
-         */
-        public ItemStack getBow()
-        {
-            return event.bow;
-        }
+		/**
+		 * @return the amount of charge in the bow
+		 */
+		public float getCharge()
+		{
+			return event.charge;
+		}
 
-        /**
-         * @return the amount of charge in the bow
-         */
-        public float getCharge()
-        {
-            return event.charge;
-        }
+		/**
+		 * Event fired after an arrow has been selected and taken from a {@link IArrowContainer2}, before it is actually spawned
+		 */
+		@Cancelable
+		public static class Firing extends QuiverArrowEvent
+		{
+			/**
+			 * Damage done to the bow after arrow is fired
+			 */
+			public int					bowDamage		= 1;
+			/**
+			 * The volume of the sound emitted from the bow after arrow is fired
+			 */
+			public float				bowSoundVolume	= 1.0F;
+			/**
+			 * Decides if standard enchantments can be added to the arrow
+			 */
+			public boolean				addEnchantments	= true;
+			/**
+			 * Decides if critical state should be forced into the arrow
+			 */
+			public boolean				isCritical		= false;
+			/**
+			 * The quiver from which the arrow was pulled from
+			 */
+			public final ItemStack		quiver;
+			/**
+			 * The arrow to be fired, can't be null
+			 */
+			public final EntityArrow	arrow;
 
-        /**
-         * Event fired after an arrow has been selected and taken from a {@link IArrowContainer2}, before it is actually spawned
-         */
-        @Cancelable
-        public static class Firing extends QuiverArrowEvent {
-            /**
-             * Damage done to the bow after arrow is fired
-             */
-            public int bowDamage = 1;
-            /**
-             * The volume of the sound emitted from the bow after arrow is fired
-             */
-            public float bowSoundVolume = 1.0F;
-            /**
-             * Decides if standard enchantments can be added to the arrow
-             */
-            public boolean addEnchantments = true;
-            /**
-             * Decides if critical state should be forced into the arrow
-             */
-            public boolean isCritical = false;
-            /**
-             * The quiver from which the arrow was pulled from
-             */
-            public final ItemStack quiver;
-            /**
-             * The arrow to be fired, can't be null
-             */
-            public final EntityArrow arrow;
+			public Firing(ArrowLooseEvent parent, ItemStack quiver, EntityArrow arrow)
+			{
+				super(parent);
+				this.quiver = quiver;
+				this.arrow = arrow;
+			}
 
-            public Firing(ArrowLooseEvent parent, ItemStack quiver, EntityArrow arrow) {
-                super(parent);
-                this.quiver = quiver;
-                this.arrow = arrow;
-            }
+		}
 
-        }
+		/**
+		 * The DEFAULT result for this event is the vanilla charge calculated value
+		 * Use setNewCharge to override the value with the one provided
+		 * Change the event result to DENY to prevent further processing
+		 */
+		@HasResult
+		public static class ChargeCalculations extends QuiverArrowEvent
+		{
+			/**
+			 * Returned value if the result is set to allow
+			 */
+			protected float	charge;
 
-        /**
-         * The DEFAULT result for this event is the vanilla charge calculated value
-         * Use setNewCharge to override the value with the one provided
-         * Change the event result to DENY to prevent further processing
-         */
-        @HasResult
-        public static class ChargeCalculations extends QuiverArrowEvent {
-            /**
-             * Returned value if the result is set to allow
-             */
-            protected float charge;
-            public ChargeCalculations(ArrowLooseEvent event){
-                super(event);
-            }
+			public ChargeCalculations(ArrowLooseEvent event)
+			{
+				super(event);
+			}
 
-            @Override
-            public float getCharge(){
-                MinecraftForge.EVENT_BUS.post(this);
-                switch (this.getResult()){
-                    case ALLOW:
-                        return charge;
-                    case DENY:
-                        return 0;
-                }
-                float f = super.getCharge()/20.0F;
-                f = (f * f + f * 2.0F) / 3.0F;
-                if ((double)f < 0.1D)
-                {
-                    return 0;
-                }
-                if (f > 1.0F)
-                {
-                    f = 1.0F;
-                }
-                return f;
-            }
+			@Override
+			public float getCharge()
+			{
+				MinecraftForge.EVENT_BUS.post(this);
+				switch(getResult())
+				{
+					case ALLOW:
+						return charge;
+					case DENY:
+						return 0;
+				}
+				float f = super.getCharge() / 20.0F;
+				f = (f * f + f * 2.0F) / 3.0F;
+				if(f < 0.1D)
+				{
+					return 0;
+				}
+				if(f > 1.0F)
+				{
+					f = 1.0F;
+				}
+				return f;
+			}
 
-            public void setNewCharge(float charge){
-                this.setResult(Result.ALLOW);
-                this.charge = charge;
-            }
-        }
-    }
+			public void setNewCharge(float charge)
+			{
+				setResult(Result.ALLOW);
+				this.charge = charge;
+			}
+		}
+	}
 }
diff --git a/src/api/java/mods/battlegear2/api/package-info.java b/src/api/java/mods/battlegear2/api/package-info.java
index 49f47ea..81dbfe8 100644
--- a/src/api/java/mods/battlegear2/api/package-info.java
+++ b/src/api/java/mods/battlegear2/api/package-info.java
@@ -1,4 +1,5 @@
 @API(owner = "battlegear2", provides = "DualWield", apiVersion = "0.1")
 package mods.battlegear2.api;
 
-import cpw.mods.fml.common.API;
\ No newline at end of file
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
index 8442153..61ca8cc 100644
--- a/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
+++ b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
@@ -8,6 +8,7 @@ import mods.battlegear2.api.ISheathed;
  * A generic flag for weapon
  * <strong>Not</strong> necessary for an item to be wielded in battlegear slots
  */
-public interface IBattlegearWeapon extends ISheathed,IOffhandDual,IAllowItem{
+public interface IBattlegearWeapon extends ISheathed, IOffhandDual, IAllowItem
+{
 
-}
\ No newline at end of file
+}
diff --git a/src/api/java/mods/battlegear2/api/weapons/package-info.java b/src/api/java/mods/battlegear2/api/weapons/package-info.java
index 2e3232b..152cc47 100644
--- a/src/api/java/mods/battlegear2/api/weapons/package-info.java
+++ b/src/api/java/mods/battlegear2/api/weapons/package-info.java
@@ -1,4 +1,5 @@
 @API(owner = "battlegear2", provides = "Weapons", apiVersion = "0.1")
 package mods.battlegear2.api.weapons;
 
-import cpw.mods.fml.common.API;
\ No newline at end of file
+import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/modwarriors/notenoughkeys/api/Api.java b/src/api/java/modwarriors/notenoughkeys/api/Api.java
index 390d28a..5da1ae8 100644
--- a/src/api/java/modwarriors/notenoughkeys/api/Api.java
+++ b/src/api/java/modwarriors/notenoughkeys/api/Api.java
@@ -10,14 +10,16 @@ import cpw.mods.fml.relauncher.SideOnly;
  * @author TheTemportalist
  */
 @SideOnly(Side.CLIENT)
-public class Api {
+public class Api
+{
 
 	/**
 	 * Checks if NotEnoughKeys is loaded in the current environment
 	 *
 	 * @return 'true' if loaded
 	 */
-	public static boolean isLoaded() {
+	public static boolean isLoaded()
+	{
 		return Loader.isModLoaded("notenoughkeys");
 	}
 
@@ -27,12 +29,14 @@ public class Api {
 	 * @param modname        The NAME of the mod registering the key
 	 * @param keyDecriptions A String[] (Array[String]) of the key descriptions. i.e. new String[]{"key.hotbar1"}
 	 */
-	public static void registerMod(String modname, String[] keyDecriptions) {
-		try {
-			Class.forName("modwarriors.notenoughkeys.keys.KeyHelper").getMethod(
-					"registerMod", String.class, String[].class
-			).invoke(null, modname, keyDecriptions);
-		} catch (Exception e) {
+	public static void registerMod(String modname, String[] keyDecriptions)
+	{
+		try
+		{
+			Class.forName("modwarriors.notenoughkeys.keys.KeyHelper").getMethod("registerMod", String.class, String[].class).invoke(null, modname, keyDecriptions);
+		}
+		catch(final Exception e)
+		{
 			e.printStackTrace();
 		}
 	}
diff --git a/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java b/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java
index d17b808..850ec6a 100644
--- a/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java
+++ b/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java
@@ -1,10 +1,10 @@
 package modwarriors.notenoughkeys.api;
 
+import net.minecraft.client.settings.KeyBinding;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.settings.KeyBinding;
 
 /**
  * Called when a keybinding is triggered with the passed with valid modifiers
@@ -13,16 +13,18 @@ import net.minecraft.client.settings.KeyBinding;
  */
 @SideOnly(Side.CLIENT)
 @Cancelable
-public class KeyBindingPressedEvent extends Event {
+public class KeyBindingPressedEvent extends Event
+{
 
 	/**
 	 * The KeyBinding being triggered
 	 */
-	public KeyBinding keyBinding = null;
+	public KeyBinding	keyBinding	= null;
 	/**
 	 * Tells whether a modifier was required AND was down when triggered
 	 */
-	public boolean shiftRequired = false, ctrlRequired = false, altRequired = false;
+	public boolean		shiftRequired	= false, ctrlRequired = false,
+			altRequired = false;
 
 	/**
 	 * Called with the passed keyBinding and modifiers.
@@ -31,12 +33,13 @@ public class KeyBindingPressedEvent extends Event {
 	 * @param keyBinding The KeyBinding being triggered. Stores the key's description and keycode
 	 * @param modifiers  The modifiers (SHIFT, CTRL, ALT) that determine when a compatible key is pressed
 	 */
-	public KeyBindingPressedEvent(KeyBinding keyBinding, boolean[] modifiers) {
+	public KeyBindingPressedEvent(KeyBinding keyBinding, boolean[] modifiers)
+	{
 		super();
 		this.keyBinding = keyBinding;
-		this.shiftRequired = modifiers[0];
-		this.ctrlRequired = modifiers[1];
-		this.altRequired = modifiers[2];
+		shiftRequired = modifiers[0];
+		ctrlRequired = modifiers[1];
+		altRequired = modifiers[2];
 
 	}
 
diff --git a/src/api/java/modwarriors/notenoughkeys/api/package-info.java b/src/api/java/modwarriors/notenoughkeys/api/package-info.java
index d53b000..913ae44 100644
--- a/src/api/java/modwarriors/notenoughkeys/api/package-info.java
+++ b/src/api/java/modwarriors/notenoughkeys/api/package-info.java
@@ -1,5 +1,5 @@
-
-@API(owner = "Not Enough Keys", provides = "API_NEK",
-		apiVersion = "1.0.0") package modwarriors.notenoughkeys.api;
+@API(owner = "Not Enough Keys", provides = "API_NEK", apiVersion = "1.0.0")
+package modwarriors.notenoughkeys.api;
 
 import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/morph/api/Ability.java b/src/api/java/morph/api/Ability.java
index 36a75e9..266855b 100644
--- a/src/api/java/morph/api/Ability.java
+++ b/src/api/java/morph/api/Ability.java
@@ -15,18 +15,18 @@ import cpw.mods.fml.relauncher.SideOnly;
  * @author iChun
  *
  */
-public abstract class Ability 
+public abstract class Ability
 {
 	/**
 	 * Ability parent field. Will be null for instances used in registration. Ability is then cloned and parent assigned later on.
 	 */
-	private EntityLivingBase parent;
+	private EntityLivingBase	parent;
+
+	/**
+	 * Flag for Ability activity. If true, tick/postRender/kill will notbe called.
+	 */
+	public boolean				inactive;
 
-    /**
-     * Flag for Ability activity. If true, tick/postRender/kill will notbe called.
-     */
-    public boolean inactive;
-	
 	/**
 	 * Basic constructor (but you didn't really need me to tell you that ;D )
 	 */
@@ -34,12 +34,15 @@ public abstract class Ability
 	{
 		parent = null;
 	}
-	
+
 	/**
 	 * Function for mod mob support, with args.
 	 */
-	public Ability parse(String[] args) { return this; }
-	
+	public Ability parse(String[] args)
+	{
+		return this;
+	}
+
 	/**
 	 * Since parent is private it needs a setter.
 	 * @param newParent
@@ -48,7 +51,7 @@ public abstract class Ability
 	{
 		parent = ent;
 	}
-	
+
 	/**
 	 * Get's the parent entity for this ability
 	 * @return Entity the ability takes effect on
@@ -57,7 +60,7 @@ public abstract class Ability
 	{
 		return parent;
 	}
-	
+
 	/**
 	 * Each ability has to return a String type.
 	 * This is used for comparison, saving, as well as construction/loading of Ability.
@@ -65,60 +68,61 @@ public abstract class Ability
 	 * @return Ability type
 	 */
 	public abstract String getType();
-	
+
 	/**
 	 * Ticks every world tick, basically an ability onUpdate, similar to Entity's onUpdate.
 	 * Will only tick if getParent() is not null.
 	 * Please remember that getParent is not necessarily a player.
 	 */
 	public abstract void tick();
-	
+
 	/**
 	 * Called when the ability is finally removed when the parent demorphs or morphs into a state that does not have this ability type.
 	 * This will NOT be called if the parent morphs into another morph that has this type of ability.
 	 */
 	public abstract void kill();
-	
+
 	/**
 	 * Creates a copy of this ability for use with parents.
 	 * As previously stated before the ability instance used during registration is a base so it needs to be cloned for use with parents.
 	 */
+	@Override
 	public abstract Ability clone();
 
-    /**
-     * Return true for this if you need an inactive copy of this morph in-between morph states (abilities of the next morph are only swapped over when morph is complete)
-     * Currently used for AbilitySwim to adjust the fog render.
-     * @return requiresInactiveClone
-     */
-    public boolean requiresInactiveClone()
-    {
-        return false;
-    }
-	
+	/**
+	 * Return true for this if you need an inactive copy of this morph in-between morph states (abilities of the next morph are only swapped over when morph is complete)
+	 * Currently used for AbilitySwim to adjust the fog render.
+	 * @return requiresInactiveClone
+	 */
+	public boolean requiresInactiveClone()
+	{
+		return false;
+	}
+
 	/**
 	 * Saving of ability to NBTTagCompound. 
 	 * Mainly used for synching Abilities between the client-server for mod mobs which do not use the API to add abilities.
 	 * The ability type (getType()) is appended to nbt before function is called.
-     * Not actually used.
+	 * Not actually used.
 	 * @param NBTTagCompound saveData
 	 */
 	public abstract void save(NBTTagCompound tag);
-	
+
 	/**
 	 * Loading of ability from NBTTagCompound.
 	 * Mainly used to load custom fields from NBT.
-     * Not actually used.
+	 * Not actually used.
 	 * @param NBTTagCompound saveData
 	 */
 	public abstract void load(NBTTagCompound tag);
-	
+
 	/**
 	 * Rendering to be done post-render.
 	 * EG: Used by AbilitySwim to render air bubbles whilst on land.
 	 */
 	@SideOnly(Side.CLIENT)
 	public abstract void postRender();
-	
+
 	/**
 	 * Icon location for ability. Can be null.
 	 * Mod's default icons are 32x32. Can be any resolution though.
@@ -126,13 +130,13 @@ public abstract class Ability
 	 */
 	@SideOnly(Side.CLIENT)
 	public abstract ResourceLocation getIcon();
-	
+
 	@SideOnly(Side.CLIENT)
 	public boolean entityHasAbility(EntityLivingBase living)
 	{
 		return true;
 	}
-	
+
 	/**
 	 * Registers the ability so the mod can look up the class when attempting to load Ability save data.
 	 * Call this no later than PostInit.
@@ -141,9 +145,12 @@ public abstract class Ability
 	 */
 	public static void registerAbility(String name, Class<? extends Ability> clz)
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("registerAbility", String.class, Class.class).invoke(null, name, clz);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
 
@@ -156,14 +163,17 @@ public abstract class Ability
 	 * @param entClass
 	 * @param abilities
 	 */
-	public static void mapAbilities(Class<? extends EntityLivingBase> entClass, Ability...abilities)
+	public static void mapAbilities(Class<? extends EntityLivingBase> entClass, Ability... abilities)
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("mapAbilities", Class.class, Ability[].class).invoke(null, entClass, abilities);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
-	
+
 	/**
 	 * Superman's kryptonite.
 	 * @param Entity class to remove ability from
@@ -171,12 +181,15 @@ public abstract class Ability
 	 */
 	public static void removeAbility(Class<? extends EntityLivingBase> entClass, String type)
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("removeAbility", Class.class, String.class).invoke(null, entClass, type);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
-	
+
 	/**
 	 * Checks to see if the entity class has a mapped ability type.
 	 * @param entClass
@@ -185,24 +198,30 @@ public abstract class Ability
 	 */
 	public static boolean hasAbility(Class<? extends EntityLivingBase> entClass, String type)
 	{
-		try {
-			return (Boolean)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("hasAbility", Class.class, String.class).invoke(null, entClass, type);
-		} catch (Exception e) {
+		try
+		{
+			return (Boolean) Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("hasAbility", Class.class, String.class).invoke(null, entClass, type);
+		}
+		catch(final Exception e)
+		{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Creates an ability by type.
-     * Check out AbilityHandler to see each Ability type and the parse function in their respective classes for the arguments.
+	 * Check out AbilityHandler to see each Ability type and the parse function in their respective classes for the arguments.
 	 * @return
 	 */
-    public static Ability createNewAbilityByType(String type, String[] arguments)
-    {
-        try {
-            return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("createNewAbilityByType", String.class, String[].class).invoke(null, type, arguments);
-        } catch (Exception e) {
-            return null;
-        }
-    }
+	public static Ability createNewAbilityByType(String type, String[] arguments)
+	{
+		try
+		{
+			return (Ability) Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("createNewAbilityByType", String.class, String[].class).invoke(null, type, arguments);
+		}
+		catch(final Exception e)
+		{
+			return null;
+		}
+	}
 }
diff --git a/src/api/java/morph/api/Api.java b/src/api/java/morph/api/Api.java
index 1cfb49d..a02c62f 100644
--- a/src/api/java/morph/api/Api.java
+++ b/src/api/java/morph/api/Api.java
@@ -9,7 +9,7 @@ import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public final class Api 
+public final class Api
 {
 	/**
 	 * Returns if a player is has a morph. If morph progress < 1.0F, player is mid-morphing.
@@ -19,13 +19,16 @@ public final class Api
 	 */
 	public static boolean hasMorph(String playerName, boolean isClient)
 	{
-		try {
-			return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("hasMorph", String.class, boolean.class).invoke(null, playerName, isClient);
-		} catch (Exception e) {
+		try
+		{
+			return (Boolean) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("hasMorph", String.class, boolean.class).invoke(null, playerName, isClient);
+		}
+		catch(final Exception e)
+		{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Returns morph progression of a player. Time per morph is 80 ticks.
 	 * If player does not have a morph, 1.0F will be returned.
@@ -34,13 +37,16 @@ public final class Api
 	 */
 	public static float morphProgress(String playerName, boolean isClient)
 	{
-		try {
-			return (Float)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("morphProgress", String.class, boolean.class).invoke(null, playerName, isClient);
-		} catch (Exception e) {
+		try
+		{
+			return (Float) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("morphProgress", String.class, boolean.class).invoke(null, playerName, isClient);
+		}
+		catch(final Exception e)
+		{
 			return 1.0F;
 		}
 	}
-	
+
 	/**
 	 * Returns previous entity instance used to render the morph.
 	 * If player does not have a previous morph state, null will be returned.
@@ -49,9 +55,12 @@ public final class Api
 	 */
 	public static EntityLivingBase getPrevMorphEntity(String playerName, boolean isClient)
 	{
-		try {
-			return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getPrevMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient);
-		} catch (Exception e) {
+		try
+		{
+			return (EntityLivingBase) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getPrevMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient);
+		}
+		catch(final Exception e)
+		{
 			return null;
 		}
 	}
@@ -64,13 +73,16 @@ public final class Api
 	 */
 	public static EntityLivingBase getMorphEntity(String playerName, boolean isClient)
 	{
-		try {
-			return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient);
-		} catch (Exception e) {
+		try
+		{
+			return (EntityLivingBase) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient);
+		}
+		catch(final Exception e)
+		{
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Blacklists an entity from being morphed into.
 	 * Previously saved morphs of the classtype will not be removed.
@@ -78,12 +90,15 @@ public final class Api
 	 */
 	public static void blacklistEntity(Class<? extends EntityLivingBase> clz)
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("blacklistEntity", Class.class).invoke(null, clz);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
-	
+
 	/**
 	 * Forces a player to morph into an EntityLivingBase, also adds said entity to the morph list.
 	 * Called Serverside only.
@@ -93,13 +108,16 @@ public final class Api
 	 */
 	public static boolean forceMorph(EntityPlayerMP player, EntityLivingBase living)
 	{
-		try {
-			return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceMorph", EntityPlayerMP.class, EntityLivingBase.class).invoke(null, player, living);
-		} catch (Exception e) {
+		try
+		{
+			return (Boolean) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceMorph", EntityPlayerMP.class, EntityLivingBase.class).invoke(null, player, living);
+		}
+		catch(final Exception e)
+		{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Forces a player to demorph.
 	 * Called Serverside only.
@@ -107,12 +125,15 @@ public final class Api
 	 */
 	public static void forceDemorph(EntityPlayerMP player)
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceDemorph", EntityPlayerMP.class).invoke(null, player);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
-	
+
 	/**
 	 * Checks if the entity passed on is a Morph.
 	 * If it is, the player name will be passed, else null.
@@ -121,25 +142,31 @@ public final class Api
 	 */
 	public static String isEntityAMorph(EntityLivingBase living, boolean isClient)
 	{
-		try {
-			return (String)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("isEntityAMorph", EntityLivingBase.class, boolean.class).invoke(null, living, isClient);
-		} catch (Exception e) {
+		try
+		{
+			return (String) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("isEntityAMorph", EntityLivingBase.class, boolean.class).invoke(null, living, isClient);
+		}
+		catch(final Exception e)
+		{
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Allows the rendering of the next player rendered.
 	 * Prevents Morph from cancelling the player render event to render the morphed entity.
 	 */
 	public static void allowNextPlayerRender()
 	{
-		try {
+		try
+		{
 			Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("allowNextPlayerRender").invoke(null);
-		} catch (Exception e) {
+		}
+		catch(final Exception e)
+		{
 		}
 	}
-	
+
 	/**
 	 * Returns the black grainy morph skin that overlays the player when the player is morphing
 	 * @return Morph Skin Resource Location
@@ -147,24 +174,30 @@ public final class Api
 	@SideOnly(Side.CLIENT)
 	public static ResourceLocation getMorphSkinTexture()
 	{
-		try {
-			return (ResourceLocation)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphSkinTexture").invoke(null);
-		} catch (Exception e) {
+		try
+		{
+			return (ResourceLocation) Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphSkinTexture").invoke(null);
+		}
+		catch(final Exception e)
+		{
 			return AbstractClientPlayer.locationStevePng;
 		}
 	}
 
-    /**
-     * Assign a specific arm to a model for rendering in First Person.
-     * @param model Model which arm you are registering for
-     * @param arm The arm in a ModelRenderer form.
-     */
-    @SideOnly(Side.CLIENT)
-    public static void registerArmForModel(ModelBase model, ModelRenderer arm)
-    {
-        try {
-            Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("registerArmForModel", ModelBase.class, ModelRenderer.class).invoke(null, model, arm);
-        } catch (Exception e) {
-        }
-    }
+	/**
+	 * Assign a specific arm to a model for rendering in First Person.
+	 * @param model Model which arm you are registering for
+	 * @param arm The arm in a ModelRenderer form.
+	 */
+	@SideOnly(Side.CLIENT)
+	public static void registerArmForModel(ModelBase model, ModelRenderer arm)
+	{
+		try
+		{
+			Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("registerArmForModel", ModelBase.class, ModelRenderer.class).invoke(null, model, arm);
+		}
+		catch(final Exception e)
+		{
+		}
+	}
 }
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
index 8eff88d..d83db32 100644
--- a/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
@@ -1,12 +1,12 @@
 package powercrystals.minefactoryreloaded.api;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
 /**
  * @author PowerCrystals
  * 
@@ -94,18 +94,19 @@ public class FactoryRegistry
 	 */
 	public static void sendMessage(String message, Object value)
 	{
-		if (!Loader.isModLoaded("MineFactoryReloaded") ||
-				Loader.instance().activeModContainer() == null)
+		if(!Loader.isModLoaded("MineFactoryReloaded") || Loader.instance().activeModContainer() == null)
+		{
 			return;
+		}
 		try
 		{
-			Method m = FMLInterModComms.class.getDeclaredMethod("enqueueMessage", Object.class, String.class, IMCMessage.class);
+			final Method m = FMLInterModComms.class.getDeclaredMethod("enqueueMessage", Object.class, String.class, IMCMessage.class);
 			m.setAccessible(true);
-			Constructor<IMCMessage> c = IMCMessage.class.getDeclaredConstructor(String.class, Object.class);
+			final Constructor<IMCMessage> c = IMCMessage.class.getDeclaredConstructor(String.class, Object.class);
 			c.setAccessible(true);
 			m.invoke(null, Loader.instance().activeModContainer(), "MineFactoryReloaded", c.newInstance(message, value));
 		}
-		catch(Exception e)
+		catch(final Exception e)
 		{
 			e.printStackTrace();
 		}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
index d4e620a..1191149 100644
--- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
@@ -19,17 +19,17 @@ public interface IFactoryHarvestable
 	 * @return The block this harvestable instance is managing.
 	 */
 	public Block getPlant();
-	
+
 	/**
 	 * @return The type of harvest the Harvester should perform on this block.
 	 */
 	public HarvestType getHarvestType();
-	
+
 	/**
 	 * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself.
 	 */
 	public boolean breakBlock();
-	
+
 	/**
 	 * @param world The world this block is in.
 	 * @param harvesterSettings The harvester's current settings. Do not modify these.
@@ -39,7 +39,7 @@ public interface IFactoryHarvestable
 	 * @return True if this block can be harvested.
 	 */
 	public boolean canBeHarvested(World world, Map<String, Boolean> harvesterSettings, int x, int y, int z);
-	
+
 	/**
 	 * @param world The world this block is in.
 	 * @param rand A Random instance to use when generating drops.
@@ -50,7 +50,7 @@ public interface IFactoryHarvestable
 	 * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient.
 	 */
 	public List<ItemStack> getDrops(World world, Random rand, Map<String, Boolean> harvesterSettings, int x, int y, int z);
-	
+
 	/**
 	 * Called before the block is going to be harvested. Usually empty.
 	 * @param world The world this block is in.
@@ -59,7 +59,7 @@ public interface IFactoryHarvestable
 	 * @param z The Z coordinate of the block being harvested.
 	 */
 	public void preHarvest(World world, int x, int y, int z);
-	
+
 	/**
 	 * Called after the block is going to be harvested. Used to re-till soil, for example.
 	 * @param world The world this block is in.
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
index 7f5dd7c..84a34a5 100644
--- a/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
@@ -5,17 +5,20 @@ import net.minecraft.util.WeightedRandom;
 
 public class MobDrop extends WeightedRandom.Item
 {
-	private ItemStack _stack;
-	
+	private final ItemStack	_stack;
+
 	public MobDrop(int weight, ItemStack stack)
 	{
 		super(weight);
 		_stack = stack;
 	}
-	
+
 	public ItemStack getStack()
 	{
-		if(_stack == null) return null;
+		if(_stack == null)
+		{
+			return null;
+		}
 		return _stack.copy();
 	}
 }
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java b/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java
index 3d075fa..d9b1b55 100644
--- a/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java
@@ -4,11 +4,11 @@ import net.minecraft.item.ItemStack;
 
 public class ValuedItem
 {
-	public final int value;
-	public final ItemStack item;
-	public final String key;
-	public final Object object;
-	
+	public final int		value;
+	public final ItemStack	item;
+	public final String		key;
+	public final Object		object;
+
 	public ValuedItem(int v, ItemStack i)
 	{
 		value = v;
@@ -16,7 +16,7 @@ public class ValuedItem
 		key = null;
 		object = null;
 	}
-	
+
 	public ValuedItem(String v, Object i)
 	{
 		value = -1;
@@ -24,12 +24,12 @@ public class ValuedItem
 		key = v;
 		object = i;
 	}
-	
+
 	/**
 	 * Presently unused but included so that if they do get used in the future,
 	 * people including this in their jar and loading before MFR don't destroy everyone
 	 */
-	
+
 	public ValuedItem(int v, Object i)
 	{
 		value = v;
@@ -37,7 +37,7 @@ public class ValuedItem
 		key = null;
 		object = i;
 	}
-	
+
 	public ValuedItem(String v, ItemStack i)
 	{
 		value = -1;
@@ -45,7 +45,7 @@ public class ValuedItem
 		key = v;
 		object = null;
 	}
-	
+
 	public ValuedItem(int v, String k, ItemStack i)
 	{
 		value = v;
@@ -53,7 +53,7 @@ public class ValuedItem
 		key = k;
 		object = null;
 	}
-	
+
 	public ValuedItem(int v, String k, Object i)
 	{
 		value = v;
@@ -61,7 +61,7 @@ public class ValuedItem
 		key = k;
 		object = i;
 	}
-	
+
 	public ValuedItem(int v, String k, ItemStack i, Object o)
 	{
 		value = v;
diff --git a/src/api/java/thaumcraft/api/BlockCoordinates.java b/src/api/java/thaumcraft/api/BlockCoordinates.java
index 27a28f8..9fb5dd8 100644
--- a/src/api/java/thaumcraft/api/BlockCoordinates.java
+++ b/src/api/java/thaumcraft/api/BlockCoordinates.java
@@ -5,104 +5,111 @@ import net.minecraft.tileentity.TileEntity;
 
 public class BlockCoordinates implements Comparable
 {
-    public int x;
-
-    /** the y coordinate */
-    public int y;
-
-    /** the z coordinate */
-    public int z;
-
-    public BlockCoordinates() {}
-
-    public BlockCoordinates(int par1, int par2, int par3)
-    {
-        this.x = par1;
-        this.y = par2;
-        this.z = par3;
-    }
-    
-    public BlockCoordinates(TileEntity tile)
-    {
-        this.x = tile.xCoord;
-        this.y = tile.yCoord;
-        this.z = tile.zCoord;
-    }
-
-    public BlockCoordinates(BlockCoordinates par1ChunkCoordinates)
-    {
-        this.x = par1ChunkCoordinates.x;
-        this.y = par1ChunkCoordinates.y;
-        this.z = par1ChunkCoordinates.z;
-    }
-
-    public boolean equals(Object par1Obj)
-    {
-        if (!(par1Obj instanceof BlockCoordinates))
-        {
-            return false;
-        }
-        else
-        {
-        	BlockCoordinates coordinates = (BlockCoordinates)par1Obj;
-            return this.x == coordinates.x && this.y == coordinates.y && this.z == coordinates.z ;
-        }
-    }
-
-    public int hashCode()
-    {
-        return this.x + this.y << 8 + this.z << 16;
-    }
-
-    /**
-     * Compare the coordinate with another coordinate
-     */
-    public int compareWorldCoordinate(BlockCoordinates par1)
-    {
-        return this.y == par1.y ? (this.z == par1.z ? this.x - par1.x : this.z - par1.z) : this.y - par1.y;
-    }
-
-    public void set(int par1, int par2, int par3, int d)
-    {
-        this.x = par1;
-        this.y = par2;
-        this.z = par3;
-    }
-
-    /**
-     * Returns the squared distance between this coordinates and the coordinates given as argument.
-     */
-    public float getDistanceSquared(int par1, int par2, int par3)
-    {
-        float f = (float)(this.x - par1);
-        float f1 = (float)(this.y - par2);
-        float f2 = (float)(this.z - par3);
-        return f * f + f1 * f1 + f2 * f2;
-    }
-
-    /**
-     * Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
-     */
-    public float getDistanceSquaredToWorldCoordinates(BlockCoordinates par1ChunkCoordinates)
-    {
-        return this.getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z);
-    }
-
-    public int compareTo(Object par1Obj)
-    {
-        return this.compareWorldCoordinate((BlockCoordinates)par1Obj);
-    }
-    
-    public void readNBT(NBTTagCompound nbt) {
-    	this.x = nbt.getInteger("b_x");
-    	this.y = nbt.getInteger("b_y");
-    	this.z = nbt.getInteger("b_z");
-    }
-    
-    public void writeNBT(NBTTagCompound nbt) {
-    	nbt.setInteger("b_x",x);
-    	nbt.setInteger("b_y",y);
-    	nbt.setInteger("b_z",z);
-    }
-    
+	public int	x;
+
+	/** the y coordinate */
+	public int	y;
+
+	/** the z coordinate */
+	public int	z;
+
+	public BlockCoordinates()
+	{
+	}
+
+	public BlockCoordinates(int par1, int par2, int par3)
+	{
+		x = par1;
+		y = par2;
+		z = par3;
+	}
+
+	public BlockCoordinates(TileEntity tile)
+	{
+		x = tile.xCoord;
+		y = tile.yCoord;
+		z = tile.zCoord;
+	}
+
+	public BlockCoordinates(BlockCoordinates par1ChunkCoordinates)
+	{
+		x = par1ChunkCoordinates.x;
+		y = par1ChunkCoordinates.y;
+		z = par1ChunkCoordinates.z;
+	}
+
+	@Override
+	public boolean equals(Object par1Obj)
+	{
+		if(!(par1Obj instanceof BlockCoordinates))
+		{
+			return false;
+		}
+		else
+		{
+			final BlockCoordinates coordinates = (BlockCoordinates) par1Obj;
+			return x == coordinates.x && y == coordinates.y && z == coordinates.z;
+		}
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return x + y << 8 + z << 16;
+	}
+
+	/**
+	 * Compare the coordinate with another coordinate
+	 */
+	public int compareWorldCoordinate(BlockCoordinates par1)
+	{
+		return y == par1.y ? (z == par1.z ? x - par1.x : z - par1.z) : y - par1.y;
+	}
+
+	public void set(int par1, int par2, int par3, int d)
+	{
+		x = par1;
+		y = par2;
+		z = par3;
+	}
+
+	/**
+	 * Returns the squared distance between this coordinates and the coordinates given as argument.
+	 */
+	public float getDistanceSquared(int par1, int par2, int par3)
+	{
+		final float f = x - par1;
+		final float f1 = y - par2;
+		final float f2 = z - par3;
+		return f * f + f1 * f1 + f2 * f2;
+	}
+
+	/**
+	 * Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
+	 */
+	public float getDistanceSquaredToWorldCoordinates(BlockCoordinates par1ChunkCoordinates)
+	{
+		return getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z);
+	}
+
+	@Override
+	public int compareTo(Object par1Obj)
+	{
+		return compareWorldCoordinate((BlockCoordinates) par1Obj);
+	}
+
+	public void readNBT(NBTTagCompound nbt)
+	{
+		x = nbt.getInteger("b_x");
+		y = nbt.getInteger("b_y");
+		z = nbt.getInteger("b_z");
+	}
+
+	public void writeNBT(NBTTagCompound nbt)
+	{
+		nbt.setInteger("b_x", x);
+		nbt.setInteger("b_y", y);
+		nbt.setInteger("b_z", z);
+	}
+
 }
diff --git a/src/api/java/thaumcraft/api/IArchitect.java b/src/api/java/thaumcraft/api/IArchitect.java
index c733af5..ba25d98 100644
--- a/src/api/java/thaumcraft/api/IArchitect.java
+++ b/src/api/java/thaumcraft/api/IArchitect.java
@@ -6,20 +6,21 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public interface IArchitect {
+public interface IArchitect
+{
 
 	/**
 	 * Returns a list of blocks that should be highlighted in world.
 	 */
-	public ArrayList<BlockCoordinates> getArchitectBlocks(ItemStack stack, World world, 
-			int x, int y, int z, int side, EntityPlayer player);
-	
+	public ArrayList<BlockCoordinates> getArchitectBlocks(ItemStack stack, World world, int x, int y, int z, int side, EntityPlayer player);
+
 	/**
 	 * which axis should be displayed. 
 	 */
 	public boolean showAxis(ItemStack stack, World world, EntityPlayer player, int side, EnumAxis axis);
-	
-	public enum EnumAxis {
+
+	public enum EnumAxis
+	{
 		X, // east / west
 		Y, // up / down
 		Z; // north / south
diff --git a/src/api/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java
index 2f53d81..743e0e9 100644
--- a/src/api/java/thaumcraft/api/IGoggles.java
+++ b/src/api/java/thaumcraft/api/IGoggles.java
@@ -12,8 +12,9 @@ import net.minecraft.item.ItemStack;
  *
  */
 
-public interface IGoggles {
-	
+public interface IGoggles
+{
+
 	/*
 	 * If this method returns true things like block essentia contents will be shown.
 	 */
diff --git a/src/api/java/thaumcraft/api/IRepairable.java b/src/api/java/thaumcraft/api/IRepairable.java
index 48c6dff..a742f2b 100644
--- a/src/api/java/thaumcraft/api/IRepairable.java
+++ b/src/api/java/thaumcraft/api/IRepairable.java
@@ -1,13 +1,11 @@
 package thaumcraft.api;
 
-
-
 /**
  * @author Azanor
  * Items, armor and tools with this interface can receive the Repair enchantment. 
  * Repairs 1 point of durability every 10 seconds (2 for repair II)
  */
-public interface IRepairable {
-	
+public interface IRepairable
+{
 
 }
diff --git a/src/api/java/thaumcraft/api/IRepairableExtended.java b/src/api/java/thaumcraft/api/IRepairableExtended.java
index 3382712..87e4479 100644
--- a/src/api/java/thaumcraft/api/IRepairableExtended.java
+++ b/src/api/java/thaumcraft/api/IRepairableExtended.java
@@ -3,15 +3,14 @@ package thaumcraft.api;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-
-
 /**
  * @author Azanor
  * Items, armor and tools with this interface can receive the Repair enchantment. 
  * Repairs 1 point of durability every 10 seconds (2 for repair II)
  */
-public interface IRepairableExtended extends IRepairable {
-	
+public interface IRepairableExtended extends IRepairable
+{
+
 	public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantlevel);
 
 }
diff --git a/src/api/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java
index 5dd3110..d9ed818 100644
--- a/src/api/java/thaumcraft/api/IRunicArmor.java
+++ b/src/api/java/thaumcraft/api/IRunicArmor.java
@@ -11,12 +11,12 @@ import net.minecraft.item.ItemStack;
  *
  */
 
-public interface IRunicArmor {
-	
+public interface IRunicArmor
+{
+
 	/**
 	 * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. 
 	 */
 	public int getRunicCharge(ItemStack itemstack);
-	
 
 }
diff --git a/src/api/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java
index 8800fa5..d6dbb8d 100644
--- a/src/api/java/thaumcraft/api/IScribeTools.java
+++ b/src/api/java/thaumcraft/api/IScribeTools.java
@@ -1,6 +1,5 @@
 package thaumcraft.api;
 
-
 /**
  * 
  * @author Azanor
@@ -9,6 +8,7 @@ package thaumcraft.api;
  *
  */
 
-public interface IScribeTools {
-	
+public interface IScribeTools
+{
+
 }
diff --git a/src/api/java/thaumcraft/api/IVisDiscountGear.java b/src/api/java/thaumcraft/api/IVisDiscountGear.java
index 3793ea3..6032b07 100644
--- a/src/api/java/thaumcraft/api/IVisDiscountGear.java
+++ b/src/api/java/thaumcraft/api/IVisDiscountGear.java
@@ -4,17 +4,15 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import thaumcraft.api.aspects.Aspect;
 
-
-
-
 /**
  * @author Azanor
  * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands.
  * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but 
  * individual items really shouldn't have a discount more than 5%
  */
-public interface IVisDiscountGear {
-		
+public interface IVisDiscountGear
+{
+
 	int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect);
 
 }
diff --git a/src/api/java/thaumcraft/api/IWarpingGear.java b/src/api/java/thaumcraft/api/IWarpingGear.java
index e7415ab..674054f 100644
--- a/src/api/java/thaumcraft/api/IWarpingGear.java
+++ b/src/api/java/thaumcraft/api/IWarpingGear.java
@@ -11,12 +11,12 @@ import net.minecraft.item.ItemStack;
  *
  */
 
-public interface IWarpingGear {
-	
+public interface IWarpingGear
+{
+
 	/**
 	 * returns how much warp this item adds while worn or held. 
 	 */
 	public int getWarp(ItemStack itemstack, EntityPlayer player);
-	
 
 }
diff --git a/src/api/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java
index 25dda28..3aea4f1 100644
--- a/src/api/java/thaumcraft/api/ItemApi.java
+++ b/src/api/java/thaumcraft/api/ItemApi.java
@@ -13,38 +13,53 @@ import cpw.mods.fml.common.FMLLog;
  * require a bit of work for you to get hold of everything you need.
  *
  */
-public class ItemApi {
-	
-	public static ItemStack getItem(String itemString, int meta) {
+public class ItemApi
+{
+
+	public static ItemStack getItem(String itemString, int meta)
+	{
 		ItemStack item = null;
 
-		try {
-			String itemClass = "thaumcraft.common.config.ConfigItems";
-			Object obj = Class.forName(itemClass).getField(itemString).get(null);
-			if (obj instanceof Item) {
-				item = new ItemStack((Item) obj,1,meta);
-			} else if (obj instanceof ItemStack) {
+		try
+		{
+			final String itemClass = "thaumcraft.common.config.ConfigItems";
+			final Object obj = Class.forName(itemClass).getField(itemString).get(null);
+			if(obj instanceof Item)
+			{
+				item = new ItemStack((Item) obj, 1, meta);
+			}
+			else if(obj instanceof ItemStack)
+			{
 				item = (ItemStack) obj;
 			}
-		} catch (Exception ex) {
+		}
+		catch(final Exception ex)
+		{
 			FMLLog.warning("[Thaumcraft] Could not retrieve item identified by: " + itemString);
 		}
 
 		return item;
 	}
-	
-	public static ItemStack getBlock(String itemString, int meta) {
+
+	public static ItemStack getBlock(String itemString, int meta)
+	{
 		ItemStack item = null;
 
-		try {
-			String itemClass = "thaumcraft.common.config.ConfigBlocks";
-			Object obj = Class.forName(itemClass).getField(itemString).get(null);
-			if (obj instanceof Block) {
-				item = new ItemStack((Block) obj,1,meta);
-			} else if (obj instanceof ItemStack) {
+		try
+		{
+			final String itemClass = "thaumcraft.common.config.ConfigBlocks";
+			final Object obj = Class.forName(itemClass).getField(itemString).get(null);
+			if(obj instanceof Block)
+			{
+				item = new ItemStack((Block) obj, 1, meta);
+			}
+			else if(obj instanceof ItemStack)
+			{
 				item = (ItemStack) obj;
 			}
-		} catch (Exception ex) {
+		}
+		catch(final Exception ex)
+		{
 			FMLLog.warning("[Thaumcraft] Could not retrieve block identified by: " + itemString);
 		}
 
diff --git a/src/api/java/thaumcraft/api/ItemRunic.java b/src/api/java/thaumcraft/api/ItemRunic.java
index 80251f5..3517558 100644
--- a/src/api/java/thaumcraft/api/ItemRunic.java
+++ b/src/api/java/thaumcraft/api/ItemRunic.java
@@ -3,19 +3,21 @@ package thaumcraft.api;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public class ItemRunic extends Item implements IRunicArmor  {
-	
-	int charge;
-	
-	public ItemRunic (int charge)
-    {
-        super();
-        this.charge = charge;
-    }
-			
+public class ItemRunic extends Item implements IRunicArmor
+{
+
+	int	charge;
+
+	public ItemRunic(int charge)
+	{
+		super();
+		this.charge = charge;
+	}
+
 	@Override
-	public int getRunicCharge(ItemStack itemstack) {
+	public int getRunicCharge(ItemStack itemstack)
+	{
 		return charge;
 	}
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java
index fbf7880..c01d521 100644
--- a/src/api/java/thaumcraft/api/ThaumcraftApi.java
+++ b/src/api/java/thaumcraft/api/ThaumcraftApi.java
@@ -31,7 +31,6 @@ import thaumcraft.api.research.ResearchCategoryList;
 import thaumcraft.api.research.ResearchItem;
 import thaumcraft.api.research.ResearchPage;
 
-
 /**
  * @author Azanor
  *
@@ -39,66 +38,76 @@ import thaumcraft.api.research.ResearchPage;
  * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen.
  *
  */
-public class ThaumcraftApi {
-	
+public class ThaumcraftApi
+{
+
 	//Materials	
-	public static ToolMaterial toolMatThaumium = EnumHelper.addToolMaterial("THAUMIUM", 3, 400, 7F, 2, 22);
-	public static ToolMaterial toolMatVoid = EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10);
-	public static ToolMaterial toolMatElemental = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 10F, 3, 18);
-	public static ArmorMaterial armorMatThaumium = EnumHelper.addArmorMaterial("THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25);
-	public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25);
-	public static ArmorMaterial armorMatThaumiumFortress = EnumHelper.addArmorMaterial("FORTRESS", 40, new int[] { 3, 7, 6, 3 }, 25);
-	public static ArmorMaterial armorMatVoid = EnumHelper.addArmorMaterial("VOID", 10, new int[] { 3, 7, 6, 3 }, 10);
-	public static ArmorMaterial armorMatVoidFortress = EnumHelper.addArmorMaterial("VOIDFORTRESS", 18, new int[] { 4, 8, 7, 4 }, 10);
-	
+	public static ToolMaterial					toolMatThaumium				= EnumHelper.addToolMaterial("THAUMIUM", 3, 400, 7F, 2, 22);
+	public static ToolMaterial					toolMatVoid					= EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10);
+	public static ToolMaterial					toolMatElemental			= EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 10F, 3, 18);
+	public static ArmorMaterial					armorMatThaumium			= EnumHelper.addArmorMaterial("THAUMIUM", 25, new int[] {2, 6, 5, 2}, 25);
+	public static ArmorMaterial					armorMatSpecial				= EnumHelper.addArmorMaterial("SPECIAL", 25, new int[] {1, 3, 2, 1}, 25);
+	public static ArmorMaterial					armorMatThaumiumFortress	= EnumHelper.addArmorMaterial("FORTRESS", 40, new int[] {3, 7, 6, 3}, 25);
+	public static ArmorMaterial					armorMatVoid				= EnumHelper.addArmorMaterial("VOID", 10, new int[] {3, 7, 6, 3}, 10);
+	public static ArmorMaterial					armorMatVoidFortress		= EnumHelper.addArmorMaterial("VOIDFORTRESS", 18, new int[] {4, 8, 7, 4}, 10);
+
 	//Enchantment references
-	public static int enchantFrugal;
-	public static int enchantPotency;
-	public static int enchantWandFortune;
-	public static int enchantHaste;
-	public static int enchantRepair;
-	
+	public static int							enchantFrugal;
+	public static int							enchantPotency;
+	public static int							enchantWandFortune;
+	public static int							enchantHaste;
+	public static int							enchantRepair;
+
 	//Miscellaneous
 	/**
 	 * Portable Hole Block-id Blacklist. 
 	 * Simply add the block-id's of blocks you don't want the portable hole to go through.
 	 */
-	public static ArrayList<Block> portableHoleBlackList = new ArrayList<Block>();
-	
+	public static ArrayList<Block>				portableHoleBlackList		= new ArrayList<Block>();
+
 	//Internal (Do not alter this unless you like pretty explosions)
 	//Calling methods from this will only work properly once Thaumcraft is past the FMLPreInitializationEvent phase.
-	public static IInternalMethodHandler internalMethods = new DummyInternalMethodHandler();	
-	
+	public static IInternalMethodHandler		internalMethods				= new DummyInternalMethodHandler();
+
 	//RESEARCH/////////////////////////////////////////
-	public static ArrayList<IScanEventHandler> scanEventhandlers = new ArrayList<IScanEventHandler>();
-	public static ArrayList<EntityTags> scanEntities = new ArrayList<EntityTags>();
-	public static class EntityTagsNBT {
-		public EntityTagsNBT(String name, Object value) {
+	public static ArrayList<IScanEventHandler>	scanEventhandlers			= new ArrayList<IScanEventHandler>();
+	public static ArrayList<EntityTags>			scanEntities				= new ArrayList<EntityTags>();
+
+	public static class EntityTagsNBT
+	{
+		public EntityTagsNBT(String name, Object value)
+		{
 			this.name = name;
 			this.value = value;
 		}
-		public String name;
-		public Object value;
+
+		public String	name;
+		public Object	value;
 	}
-	public static class EntityTags {
-		public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) {
+
+	public static class EntityTags
+	{
+		public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts)
+		{
 			this.entityName = entityName;
 			this.nbts = nbts;
 			this.aspects = aspects;
 		}
-		public String entityName;
-		public EntityTagsNBT[] nbts;
-		public AspectList aspects;
+
+		public String			entityName;
+		public EntityTagsNBT[]	nbts;
+		public AspectList		aspects;
 	}
-	
+
 	/**
 	 * not really working atm, so ignore it for now
 	 * @param scanEventHandler
 	 */
-	public static void registerScanEventhandler(IScanEventHandler scanEventHandler) {
+	public static void registerScanEventhandler(IScanEventHandler scanEventHandler)
+	{
 		scanEventhandlers.add(scanEventHandler);
 	}
-	
+
 	/**
 	 * This is used to add aspects to entities which you can then scan using a thaumometer.
 	 * Also used to calculate vis drops from mobs.
@@ -109,83 +118,92 @@ public class ThaumcraftApi {
 	 * 	<br>ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5));
 	 * 	<br>ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1));
 	 */
-	public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) {
-		scanEntities.add(new EntityTags(entityName,aspects,nbt));
+	public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt)
+	{
+		scanEntities.add(new EntityTags(entityName, aspects, nbt));
 	}
-	
+
 	//RECIPES/////////////////////////////////////////
-	private static ArrayList craftingRecipes = new ArrayList();	
-	private static HashMap<Object,ItemStack> smeltingBonus = new HashMap<Object,ItemStack>();
-	
+	private static ArrayList					craftingRecipes	= new ArrayList();
+	private static HashMap<Object, ItemStack>	smeltingBonus	= new HashMap<Object, ItemStack>();
+
 	/**
 	 * This method is used to determine what bonus items are generated when the infernal furnace smelts items
 	 * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold)
 	 * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0).
 	 * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced.
 	 */
-	public static void addSmeltingBonus(ItemStack in, ItemStack out) {
-		smeltingBonus.put(
-				Arrays.asList(in.getItem(),in.getItemDamage()), 
-				new ItemStack(out.getItem(),0,out.getItemDamage()));
+	public static void addSmeltingBonus(ItemStack in, ItemStack out)
+	{
+		smeltingBonus.put(Arrays.asList(in.getItem(), in.getItemDamage()), new ItemStack(
+				out.getItem(), 0, out.getItemDamage()));
 	}
-	
+
 	/**
 	 * This method is used to determine what bonus items are generated when the infernal furnace smelts items
 	 * @param in The ore dictionary input of the smelting operation. e.g. "oreGold"
 	 * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0).
 	 * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced.
 	 */
-	public static void addSmeltingBonus(String in, ItemStack out) {
-		smeltingBonus.put(	in, new ItemStack(out.getItem(),0,out.getItemDamage()));
+	public static void addSmeltingBonus(String in, ItemStack out)
+	{
+		smeltingBonus.put(in, new ItemStack(out.getItem(), 0,
+				out.getItemDamage()));
 	}
-	
+
 	/**
 	 * Returns the bonus item produced from a smelting operation in the infernal furnace
 	 * @param in The input of the smelting operation. e.g. new ItemStack(oreGold)
 	 * @return the The bonus item that can be produced
 	 */
-	public static ItemStack getSmeltingBonus(ItemStack in) {
-		ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage()));
-		if (out==null) {
-			out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE));
+	public static ItemStack getSmeltingBonus(ItemStack in)
+	{
+		ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(), in.getItemDamage()));
+		if(out == null)
+		{
+			out = smeltingBonus.get(Arrays.asList(in.getItem(), OreDictionary.WILDCARD_VALUE));
 		}
-		if (out==null) {
-			String od = OreDictionary.getOreName( OreDictionary.getOreID(in));
+		if(out == null)
+		{
+			final String od = OreDictionary.getOreName(OreDictionary.getOreID(in));
 			out = smeltingBonus.get(od);
 		}
 		return out;
 	}
-	
-	public static List getCraftingRecipes() {
+
+	public static List getCraftingRecipes()
+	{
 		return craftingRecipes;
 	}
-	
+
 	/**
 	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
 	 * @param result the recipe output
 	 * @param aspects the vis cost per aspect. 
 	 * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive.
 	 */
-	public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe)
-    {
-		ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe);
-        craftingRecipes.add(r);
+	public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
+	{
+		final ShapedArcaneRecipe r = new ShapedArcaneRecipe(research, result,
+				aspects, recipe);
+		craftingRecipes.add(r);
 		return r;
-    }
-	
+	}
+
 	/**
 	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
 	 * @param result the recipe output
 	 * @param aspects the vis cost per aspect
 	 * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive.
 	 */
-	public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe)
-    {
-		ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe);
-        craftingRecipes.add(r);
+	public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
+	{
+		final ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result,
+				aspects, recipe);
+		craftingRecipes.add(r);
 		return r;
-    }
-	
+	}
+
 	/**
 	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
 	 * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item
@@ -197,14 +215,18 @@ public class ThaumcraftApi {
 	 * 				Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches.
 	 * 
 	 */
-	public static InfusionRecipe addInfusionCraftingRecipe(String research, Object result, int instability, AspectList aspects, ItemStack input,ItemStack[] recipe)
-    {
-		if (!(result instanceof ItemStack || result instanceof Object[])) return null;
-		InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe);
-        craftingRecipes.add(r);
+	public static InfusionRecipe addInfusionCraftingRecipe(String research, Object result, int instability, AspectList aspects, ItemStack input, ItemStack[] recipe)
+	{
+		if(!(result instanceof ItemStack || result instanceof Object[]))
+		{
+			return null;
+		}
+		final InfusionRecipe r = new InfusionRecipe(research, result, instability,
+				aspects, input, recipe);
+		craftingRecipes.add(r);
 		return r;
-    }
-	
+	}
+
 	/**
 	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
 	 * @param enchantment the enchantment that will be applied to the item
@@ -216,158 +238,214 @@ public class ThaumcraftApi {
 	 * 
 	 */
 	public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, ItemStack[] recipe)
-    {
-		InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe);
-        craftingRecipes.add(r);
+	{
+		final InfusionEnchantmentRecipe r = new InfusionEnchantmentRecipe(research,
+				enchantment, instability, aspects, recipe);
+		craftingRecipes.add(r);
 		return r;
-    }
-	
+	}
+
 	/**
 	 * @param stack the recipe result
 	 * @return the recipe
 	 */
-	public static InfusionRecipe getInfusionRecipe(ItemStack res) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof InfusionRecipe) {
-				if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) {
-					if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res))
-						return (InfusionRecipe)r;
-				} 
+	public static InfusionRecipe getInfusionRecipe(ItemStack res)
+	{
+		for(final Object r : getCraftingRecipes())
+		{
+			if(r instanceof InfusionRecipe)
+			{
+				if(((InfusionRecipe) r).getRecipeOutput() instanceof ItemStack)
+				{
+					if(((ItemStack) ((InfusionRecipe) r).getRecipeOutput()).isItemEqual(res))
+					{
+						return (InfusionRecipe) r;
+					}
+				}
 			}
 		}
 		return null;
 	}
 
-    
-    /**
-     * @param key the research key required for this recipe to work. 
-     * @param result the output result
-     * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item
-     * @param cost the vis cost
-     * @param tags the aspects required to craft this
-     */
-    public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) {
-    	CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags);
-    	getCraftingRecipes().add(rc);
+	/**
+	 * @param key the research key required for this recipe to work. 
+	 * @param result the output result
+	 * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item
+	 * @param cost the vis cost
+	 * @param tags the aspects required to craft this
+	 */
+	public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags)
+	{
+		final CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags);
+		getCraftingRecipes().add(rc);
 		return rc;
 	}
-    
-	
+
 	/**
 	 * @param stack the recipe result
 	 * @return the recipe
 	 */
-	public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof CrucibleRecipe) {
-				if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack))
-					return (CrucibleRecipe)r;
+	public static CrucibleRecipe getCrucibleRecipe(ItemStack stack)
+	{
+		for(final Object r : getCraftingRecipes())
+		{
+			if(r instanceof CrucibleRecipe)
+			{
+				if(((CrucibleRecipe) r).getRecipeOutput().isItemEqual(stack))
+				{
+					return (CrucibleRecipe) r;
+				}
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * @param hash the unique recipe code
 	 * @return the recipe
 	 */
-	public static CrucibleRecipe getCrucibleRecipeFromHash(int hash) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof CrucibleRecipe) {
-				if (((CrucibleRecipe)r).hash==hash)
-					return (CrucibleRecipe)r;
+	public static CrucibleRecipe getCrucibleRecipeFromHash(int hash)
+	{
+		for(final Object r : getCraftingRecipes())
+		{
+			if(r instanceof CrucibleRecipe)
+			{
+				if(((CrucibleRecipe) r).hash == hash)
+				{
+					return (CrucibleRecipe) r;
+				}
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Used by the thaumonomicon drilldown feature.
 	 * @param stack the item
 	 * @return the thaumcraft recipe key that produces that item. 
 	 */
-	private static HashMap<int[],Object[]> keyCache = new HashMap<int[],Object[]>();
-	
-	public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) {
-		int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()};
-		if (keyCache.containsKey(key)) {
-			if (keyCache.get(key)==null) return null;
-			if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0]))
+	private static HashMap<int[], Object[]>	keyCache	= new HashMap<int[], Object[]>();
+
+	public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack)
+	{
+		final int[] key = new int[] {Item.getIdFromItem(stack.getItem()), stack.getItemDamage()};
+		if(keyCache.containsKey(key))
+		{
+			if(keyCache.get(key) == null)
+			{
+				return null;
+			}
+			if(ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), (String) (keyCache.get(key))[0]))
+			{
 				return keyCache.get(key);
-			else 
+			}
+			else
+			{
 				return null;
+			}
 		}
-		for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) {
-			for (ResearchItem ri:rcl.research.values()) {
-				if (ri.getPages()==null) continue;
-				for (int a=0;a<ri.getPages().length;a++) {
-					ResearchPage page = ri.getPages()[a];
-					if (page.recipe!=null && page.recipe instanceof CrucibleRecipe[]) {
-						CrucibleRecipe[] crs = (CrucibleRecipe[]) page.recipe;
-						for (CrucibleRecipe cr:crs) {
-							if (cr.getRecipeOutput().isItemEqual(stack)) {
-								keyCache.put(key,new Object[] {ri.key,a});
-								if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
-									return new Object[] {ri.key,a};
+		for(final ResearchCategoryList rcl : ResearchCategories.researchCategories.values())
+		{
+			for(final ResearchItem ri : rcl.research.values())
+			{
+				if(ri.getPages() == null)
+				{
+					continue;
+				}
+				for(int a = 0; a < ri.getPages().length; a++)
+				{
+					final ResearchPage page = ri.getPages()[a];
+					if(page.recipe != null && page.recipe instanceof CrucibleRecipe[])
+					{
+						final CrucibleRecipe[] crs = (CrucibleRecipe[]) page.recipe;
+						for(final CrucibleRecipe cr : crs)
+						{
+							if(cr.getRecipeOutput().isItemEqual(stack))
+							{
+								keyCache.put(key, new Object[] {ri.key, a});
+								if(ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
+								{
+									return new Object[] {ri.key, a};
+								}
 							}
 						}
-					} else
-					if (page.recipeOutput!=null && stack !=null && page.recipeOutput.isItemEqual(stack)) {
-						keyCache.put(key,new Object[] {ri.key,a});
-						if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
-							return new Object[] {ri.key,a};
-						else 
+					}
+					else if(page.recipeOutput != null && stack != null && page.recipeOutput.isItemEqual(stack))
+					{
+						keyCache.put(key, new Object[] {ri.key, a});
+						if(ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
+						{
+							return new Object[] {ri.key, a};
+						}
+						else
+						{
 							return null;
+						}
 					}
 				}
 			}
 		}
-		keyCache.put(key,null);
+		keyCache.put(key, null);
 		return null;
 	}
-	
+
 	//ASPECTS////////////////////////////////////////
-	
-	public static ConcurrentHashMap<List,AspectList> objectTags = new ConcurrentHashMap<List,AspectList>();
-	public static ConcurrentHashMap<List,int[]> groupedObjectTags = new ConcurrentHashMap<List,int[]>();
-	
+
+	public static ConcurrentHashMap<List, AspectList>	objectTags			= new ConcurrentHashMap<List, AspectList>();
+	public static ConcurrentHashMap<List, int[]>		groupedObjectTags	= new ConcurrentHashMap<List, int[]>();
+
 	/**
 	 * Checks to see if the passed item/block already has aspects associated with it.
 	 * @param id
 	 * @param meta
 	 * @return 
 	 */
-	public static boolean exists(Item item, int meta) {
-		AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta));
-		if (tmp==null) {
-			tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE));
-			if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) {
-				int index=0;
-				do {
-					tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index));
+	public static boolean exists(Item item, int meta)
+	{
+		AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item, meta));
+		if(tmp == null)
+		{
+			tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item, OreDictionary.WILDCARD_VALUE));
+			if(meta == OreDictionary.WILDCARD_VALUE && tmp == null)
+			{
+				int index = 0;
+				do
+				{
+					tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item, index));
 					index++;
-				} while (index<16 && tmp==null);
+				}
+				while(index < 16 && tmp == null);
+			}
+			if(tmp == null)
+			{
+				return false;
 			}
-			if (tmp==null) return false;
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:<p>
 	 * <i>ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1));</i>
 	 * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects
 	 * @param aspects A ObjectTags object of the associated aspects
 	 */
-	public static void registerObjectTag(ItemStack item, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		try {
-		objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects);
-		} catch (Exception e) {}
-	}	
-	
-	
+	public static void registerObjectTag(ItemStack item, AspectList aspects)
+	{
+		if(aspects == null)
+		{
+			aspects = new AspectList();
+		}
+		try
+		{
+			objectTags.put(Arrays.asList(item.getItem(), item.getItemDamage()), aspects);
+		}
+		catch(final Exception e)
+		{
+		}
+	}
+
 	/**
 	 * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:<p>
 	 * <i>ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1));</i>
@@ -375,34 +453,53 @@ public class ThaumcraftApi {
 	 * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations)
 	 * @param aspects A ObjectTags object of the associated aspects
 	 */
-	public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		try {			
-			objectTags.put(Arrays.asList(item.getItem(),meta[0]), aspects);
-			for (int m:meta) {				
-				groupedObjectTags.put(Arrays.asList(item.getItem(),m), meta);
+	public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects)
+	{
+		if(aspects == null)
+		{
+			aspects = new AspectList();
+		}
+		try
+		{
+			objectTags.put(Arrays.asList(item.getItem(), meta[0]), aspects);
+			for(final int m : meta)
+			{
+				groupedObjectTags.put(Arrays.asList(item.getItem(), m), meta);
 			}
-			
-		} catch (Exception e) {}
+
+		}
+		catch(final Exception e)
+		{
+		}
 	}
-	
+
 	/**
 	 * Used to assign apsects to the given ore dictionary item. 
 	 * @param oreDict the ore dictionary name
 	 * @param aspects A ObjectTags object of the associated aspects
 	 */
-	public static void registerObjectTag(String oreDict, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		ArrayList<ItemStack> ores = OreDictionary.getOres(oreDict);
-		if (ores!=null && ores.size()>0) {
-			for (ItemStack ore:ores) {
-				try {
-				objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects);
-				} catch (Exception e) {}
+	public static void registerObjectTag(String oreDict, AspectList aspects)
+	{
+		if(aspects == null)
+		{
+			aspects = new AspectList();
+		}
+		final ArrayList<ItemStack> ores = OreDictionary.getOres(oreDict);
+		if(ores != null && ores.size() > 0)
+		{
+			for(final ItemStack ore : ores)
+			{
+				try
+				{
+					objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects);
+				}
+				catch(final Exception e)
+				{
+				}
 			}
 		}
 	}
-	
+
 	/**
 	 * Used to assign aspects to the given item/block. 
 	 * Attempts to automatically generate aspect tags by checking registered recipes.
@@ -412,90 +509,121 @@ public class ThaumcraftApi {
 	 * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects
 	 * @param aspects A ObjectTags object of the associated aspects
 	 */
-	public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) {
-		if (!exists(item.getItem(),item.getItemDamage())) {
-			AspectList tmp = ThaumcraftApiHelper.generateTags(item.getItem(), item.getItemDamage());
-			if (tmp != null && tmp.size()>0) {
-				for(Aspect tag:tmp.getAspects()) {
+	public static void registerComplexObjectTag(ItemStack item, AspectList aspects)
+	{
+		if(!exists(item.getItem(), item.getItemDamage()))
+		{
+			final AspectList tmp = ThaumcraftApiHelper.generateTags(item.getItem(), item.getItemDamage());
+			if(tmp != null && tmp.size() > 0)
+			{
+				for(final Aspect tag : tmp.getAspects())
+				{
 					aspects.add(tag, tmp.getAmount(tag));
 				}
 			}
-			registerObjectTag(item,aspects);
-		} else {
-			AspectList tmp = ThaumcraftApiHelper.getObjectAspects(item);
-			for(Aspect tag:aspects.getAspects()) {
+			registerObjectTag(item, aspects);
+		}
+		else
+		{
+			final AspectList tmp = ThaumcraftApiHelper.getObjectAspects(item);
+			for(final Aspect tag : aspects.getAspects())
+			{
 				tmp.merge(tag, tmp.getAmount(tag));
 			}
-			registerObjectTag(item,tmp);
+			registerObjectTag(item, tmp);
 		}
 	}
-	
+
 	//WARP ///////////////////////////////////////////////////////////////////////////////////////
-		private static HashMap<Object,Integer> warpMap = new HashMap<Object,Integer>();
-		
-		/**
-		 * This method is used to determine how much warp is gained if the item is crafted. The warp
-		 * added is "sticky" warp
-		 * @param craftresult The item crafted
-		 * @param amount how much warp is gained
-		 */
-		public static void addWarpToItem(ItemStack craftresult, int amount) {
-			warpMap.put(Arrays.asList(craftresult.getItem(),craftresult.getItemDamage()),amount);
+	private static HashMap<Object, Integer>	warpMap	= new HashMap<Object, Integer>();
+
+	/**
+	 * This method is used to determine how much warp is gained if the item is crafted. The warp
+	 * added is "sticky" warp
+	 * @param craftresult The item crafted
+	 * @param amount how much warp is gained
+	 */
+	public static void addWarpToItem(ItemStack craftresult, int amount)
+	{
+		warpMap.put(Arrays.asList(craftresult.getItem(), craftresult.getItemDamage()), amount);
+	}
+
+	/**
+	 * This method is used to determine how much permanent warp is gained if the research is completed
+	 * @param in The item crafted
+	 * @param amount how much warp is gained
+	 */
+	public static void addWarpToResearch(String research, int amount)
+	{
+		warpMap.put(research, amount);
+	}
+
+	/**
+	 * Returns how much warp is gained from the item or research passed in
+	 * @param in itemstack or string
+	 * @return how much warp it will give
+	 */
+	public static int getWarp(Object in)
+	{
+		if(in == null)
+		{
+			return 0;
 		}
-		
-		/**
-		 * This method is used to determine how much permanent warp is gained if the research is completed
-		 * @param in The item crafted
-		 * @param amount how much warp is gained
-		 */
-		public static void addWarpToResearch(String research, int amount) {
-			warpMap.put(research, amount);
+		if(in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack) in).getItem(), ((ItemStack) in).getItemDamage())))
+		{
+			return warpMap.get(Arrays.asList(((ItemStack) in).getItem(), ((ItemStack) in).getItemDamage()));
 		}
-		
-		/**
-		 * Returns how much warp is gained from the item or research passed in
-		 * @param in itemstack or string
-		 * @return how much warp it will give
-		 */
-		public static int getWarp(Object in) {
-			if (in==null) return 0;
-			if (in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()))) {
-				return warpMap.get(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()));
-			} else
-			if (in instanceof String && warpMap.containsKey((String)in)) {
-				return warpMap.get((String)in);
-			}
-			return 0;
+		else if(in instanceof String && warpMap.containsKey(in))
+		{
+			return warpMap.get(in);
 		}
-	
+		return 0;
+	}
+
 	//LOOT BAGS //////////////////////////////////////////////////////////////////////////////////////////
-		
-		/**
-		 * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 
-		 * and a diamond is 50.
-		 * The weights are the same for all loot bag types - the only difference is how many items the bag
-		 * contains.
-		 * @param item
-		 * @param weight
-		 * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified
-		 * 0 = common, 1 = uncommon, 2 = rare
-		 */
-		public static void addLootBagItem(ItemStack item, int weight, int... bagTypes) {
-			if (bagTypes==null || bagTypes.length==0)
-				WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight));
-			else {
-				for (int rarity:bagTypes) {
-					switch(rarity) {
-						case 0: WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); break;
-						case 1: WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(item,weight)); break;
-						case 2: WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(item,weight)); break;
-					}
+
+	/**
+	 * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 
+	 * and a diamond is 50.
+	 * The weights are the same for all loot bag types - the only difference is how many items the bag
+	 * contains.
+	 * @param item
+	 * @param weight
+	 * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified
+	 * 0 = common, 1 = uncommon, 2 = rare
+	 */
+	public static void addLootBagItem(ItemStack item, int weight, int... bagTypes)
+	{
+		if(bagTypes == null || bagTypes.length == 0)
+		{
+			WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,
+					weight));
+		}
+		else
+		{
+			for(final int rarity : bagTypes)
+			{
+				switch(rarity)
+				{
+					case 0:
+						WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(
+								item, weight));
+						break;
+					case 1:
+						WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(
+								item, weight));
+						break;
+					case 2:
+						WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(
+								item, weight));
+						break;
 				}
 			}
 		}
-		
+	}
+
 	//CROPS //////////////////////////////////////////////////////////////////////////////////////////
-	
+
 	/**
 	 * To define mod crops you need to use FMLInterModComms in your @Mod.Init method.
 	 * There are two 'types' of crops you can add. Standard crops and clickable crops.
@@ -522,9 +650,9 @@ public class ThaumcraftApi {
 	 * Example: 
 	 * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7));
 	 */
-	
+
 	//NATIVE CLUSTERS //////////////////////////////////////////////////////////////////////////////////
-	
+
 	/**
 	 * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms 
 	 * in your @Mod.Init method using the "nativeCluster" string message.
@@ -536,7 +664,7 @@ public class ThaumcraftApi {
 	 * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: 
 	 * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0");
 	 */
-	
+
 	//LAMP OF GROWTH BLACKLIST ///////////////////////////////////////////////////////////////////////////
 	/**
 	 * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms 
@@ -545,7 +673,7 @@ public class ThaumcraftApi {
 	 * Example for vanilla wheat: 
 	 * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE));
 	 */
-	
+
 	//DIMENSION BLACKLIST ///////////////////////////////////////////////////////////////////////////
 	/**
 	 * You can blacklist a dimension to not spawn certain thaumcraft features 
@@ -558,7 +686,7 @@ public class ThaumcraftApi {
 	 * Example: 
 	 * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1");
 	 */
-	
+
 	//BIOME BLACKLIST ///////////////////////////////////////////////////////////////////////////
 	/**
 	 * You can blacklist a biome to not spawn certain thaumcraft features 
@@ -571,7 +699,7 @@ public class ThaumcraftApi {
 	 * Example: 
 	 * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2");
 	 */
-		
+
 	//CHAMPION MOB WHITELIST ///////////////////////////////////////////////////////////////////////////
 	/**
 	 * You can whitelist an entity class so it can rarely spawn champion versions in your @Mod.Init method using 
diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java
index 77d5588..83ac4d2 100644
--- a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java
+++ b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java
@@ -19,181 +19,236 @@ import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.aspects.IEssentiaTransport;
 
-public class ThaumcraftApiHelper {
-	
-	public static AspectList cullTags(AspectList temp) {
-		AspectList temp2 = new AspectList();
-		for (Aspect tag:temp.getAspects()) {
-			if (tag!=null)
+public class ThaumcraftApiHelper
+{
+
+	public static AspectList cullTags(AspectList temp)
+	{
+		final AspectList temp2 = new AspectList();
+		for(final Aspect tag : temp.getAspects())
+		{
+			if(tag != null)
+			{
 				temp2.add(tag, temp.getAmount(tag));
+			}
 		}
-		while (temp2!=null && temp2.size()>6) {
+		while(temp2 != null && temp2.size() > 6)
+		{
 			Aspect lowest = null;
 			float low = Short.MAX_VALUE;
-			for (Aspect tag:temp2.getAspects()) {
-				if (tag==null) continue;
-				float ta=temp2.getAmount(tag);
-				if (tag.isPrimal()) {
+			for(final Aspect tag : temp2.getAspects())
+			{
+				if(tag == null)
+				{
+					continue;
+				}
+				float ta = temp2.getAmount(tag);
+				if(tag.isPrimal())
+				{
 					ta *= .9f;
-				} else {
-					if (!tag.getComponents()[0].isPrimal()) {
+				}
+				else
+				{
+					if(!tag.getComponents()[0].isPrimal())
+					{
 						ta *= 1.1f;
-						if (!tag.getComponents()[0].getComponents()[0].isPrimal()) {
+						if(!tag.getComponents()[0].getComponents()[0].isPrimal())
+						{
 							ta *= 1.05f;
 						}
-						if (!tag.getComponents()[0].getComponents()[1].isPrimal()) {
+						if(!tag.getComponents()[0].getComponents()[1].isPrimal())
+						{
 							ta *= 1.05f;
 						}
 					}
-					if (!tag.getComponents()[1].isPrimal()) {
+					if(!tag.getComponents()[1].isPrimal())
+					{
 						ta *= 1.1f;
-						if (!tag.getComponents()[1].getComponents()[0].isPrimal()) {
+						if(!tag.getComponents()[1].getComponents()[0].isPrimal())
+						{
 							ta *= 1.05f;
 						}
-						if (!tag.getComponents()[1].getComponents()[1].isPrimal()) {
+						if(!tag.getComponents()[1].getComponents()[1].isPrimal())
+						{
 							ta *= 1.05f;
 						}
 					}
 				}
-				
-				if (ta<low) {
-					low = ta;					 
+
+				if(ta < low)
+				{
+					low = ta;
 					lowest = tag;
 				}
 			}
 			temp2.aspects.remove(lowest);
 		}
-		return temp2; 
+		return temp2;
 	}
-	
-	public static boolean areItemsEqual(ItemStack s1,ItemStack s2)
-    {
-		if (s1.isItemStackDamageable() && s2.isItemStackDamageable())
+
+	public static boolean areItemsEqual(ItemStack s1, ItemStack s2)
+	{
+		if(s1.isItemStackDamageable() && s2.isItemStackDamageable())
 		{
 			return s1.getItem() == s2.getItem();
-		} else
+		}
+		else
+		{
 			return s1.getItem() == s2.getItem() && s1.getItemDamage() == s2.getItemDamage();
-    }
+		}
+	}
 
-	public static boolean isResearchComplete(String username, String researchkey) {
+	public static boolean isResearchComplete(String username, String researchkey)
+	{
 		return ThaumcraftApi.internalMethods.isResearchComplete(username, researchkey);
 	}
-	
-	public static boolean hasDiscoveredAspect(String username, Aspect aspect) {
+
+	public static boolean hasDiscoveredAspect(String username, Aspect aspect)
+	{
 		return ThaumcraftApi.internalMethods.hasDiscoveredAspect(username, aspect);
 	}
-	
-	public static AspectList getDiscoveredAspects(String username) {
+
+	public static AspectList getDiscoveredAspects(String username)
+	{
 		return ThaumcraftApi.internalMethods.getDiscoveredAspects(username);
 	}
 
-	public static ItemStack getStackInRowAndColumn(Object instance, int row, int column) {
+	public static ItemStack getStackInRowAndColumn(Object instance, int row, int column)
+	{
 		return ThaumcraftApi.internalMethods.getStackInRowAndColumn(instance, row, column);
 	}
 
-	public static AspectList getObjectAspects(ItemStack is) {
+	public static AspectList getObjectAspects(ItemStack is)
+	{
 		return ThaumcraftApi.internalMethods.getObjectAspects(is);
 	}
 
-	public static AspectList getBonusObjectTags(ItemStack is,AspectList ot) {
+	public static AspectList getBonusObjectTags(ItemStack is, AspectList ot)
+	{
 		return ThaumcraftApi.internalMethods.getBonusObjectTags(is, ot);
 	}
 
-	public static AspectList generateTags(Item item, int meta) {
+	public static AspectList generateTags(Item item, int meta)
+	{
 		return ThaumcraftApi.internalMethods.generateTags(item, meta);
 	}
-	
+
 	public static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets)
-    {
-        for (ItemStack input : inputs)
-        {
-            for (ItemStack target : targets)
-            {
-                if (itemMatches(target, input, strict))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-	
-	public static boolean areItemStackTagsEqualForCrafting(ItemStack slotItem,ItemStack recipeItem)
-    {
-    	if (recipeItem == null || slotItem == null) return false;
-    	if (recipeItem.stackTagCompound!=null && slotItem.stackTagCompound==null ) return false;
-    	if (recipeItem.stackTagCompound==null ) return true;
-    	
-    	Iterator iterator = recipeItem.stackTagCompound.func_150296_c().iterator();
-        while (iterator.hasNext())
-        {
-            String s = (String)iterator.next();
-            if (slotItem.stackTagCompound.hasKey(s)) {
-            	if (!slotItem.stackTagCompound.getTag(s).toString().equals(
-            			recipeItem.stackTagCompound.getTag(s).toString())) {
-            		return false;
-            	}
-            } else {
-        		return false;
-            }
-            
-        }
-        return true;
-    }
-
-    public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict)
-    {
-        if (input == null && target != null || input != null && target == null)
-        {
-            return false;
-        }
-        return (target.getItem() == input.getItem() && 
-        		((target.getItemDamage() == OreDictionary.WILDCARD_VALUE && !strict) || target.getItemDamage() == input.getItemDamage()));
-    }
-    
-    
-    public static TileEntity getConnectableTile(World world, int x, int y, int z, ForgeDirection face) {
-		TileEntity te = world.getTileEntity(x+face.offsetX, y+face.offsetY, z+face.offsetZ);
-		if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) 
+	{
+		for(final ItemStack input : inputs)
+		{
+			for(final ItemStack target : targets)
+			{
+				if(itemMatches(target, input, strict))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static boolean areItemStackTagsEqualForCrafting(ItemStack slotItem, ItemStack recipeItem)
+	{
+		if(recipeItem == null || slotItem == null)
+		{
+			return false;
+		}
+		if(recipeItem.stackTagCompound != null && slotItem.stackTagCompound == null)
+		{
+			return false;
+		}
+		if(recipeItem.stackTagCompound == null)
+		{
+			return true;
+		}
+
+		final Iterator iterator = recipeItem.stackTagCompound.func_150296_c().iterator();
+		while(iterator.hasNext())
+		{
+			final String s = (String) iterator.next();
+			if(slotItem.stackTagCompound.hasKey(s))
+			{
+				if(!slotItem.stackTagCompound.getTag(s).toString().equals(recipeItem.stackTagCompound.getTag(s).toString()))
+				{
+					return false;
+				}
+			}
+			else
+			{
+				return false;
+			}
+
+		}
+		return true;
+	}
+
+	public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict)
+	{
+		if(input == null && target != null || input != null && target == null)
+		{
+			return false;
+		}
+		return(target.getItem() == input.getItem() && ((target.getItemDamage() == OreDictionary.WILDCARD_VALUE && !strict) || target.getItemDamage() == input.getItemDamage()));
+	}
+
+	public static TileEntity getConnectableTile(World world, int x, int y, int z, ForgeDirection face)
+	{
+		final TileEntity te = world.getTileEntity(x + face.offsetX, y + face.offsetY, z + face.offsetZ);
+		if(te instanceof IEssentiaTransport && ((IEssentiaTransport) te).isConnectable(face.getOpposite()))
+		{
 			return te;
+		}
 		else
+		{
 			return null;
+		}
 	}
-    
-    public static TileEntity getConnectableTile(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		TileEntity te = world.getTileEntity(x+face.offsetX, y+face.offsetY, z+face.offsetZ);
-		if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) 
+
+	public static TileEntity getConnectableTile(IBlockAccess world, int x, int y, int z, ForgeDirection face)
+	{
+		final TileEntity te = world.getTileEntity(x + face.offsetX, y + face.offsetY, z + face.offsetZ);
+		if(te instanceof IEssentiaTransport && ((IEssentiaTransport) te).isConnectable(face.getOpposite()))
+		{
 			return te;
+		}
 		else
+		{
 			return null;
+		}
 	}
-    
-    private static HashMap<Integer, AspectList> allAspects= new HashMap<Integer, AspectList>();
-    private static HashMap<Integer, AspectList> allCompoundAspects= new HashMap<Integer, AspectList>();
-    
-    public static AspectList getAllAspects(int amount) {
-    	if (allAspects.get(amount)==null) {
-    		AspectList al = new AspectList();
-    		for (Aspect aspect:Aspect.aspects.values()) {
-    			al.add(aspect, amount);
-    		}
-    		allAspects.put(amount, al);
-    	} 
-    	return allAspects.get(amount);
-    }
-    
-    public static AspectList getAllCompoundAspects(int amount) {
-    	if (allCompoundAspects.get(amount)==null) {
-    		AspectList al = new AspectList();
-    		for (Aspect aspect:Aspect.getCompoundAspects()) {
-    			al.add(aspect, amount);
-    		}
-    		allCompoundAspects.put(amount, al);
-    	} 
-    	return allCompoundAspects.get(amount);
-    }
-    
-    
+
+	private static HashMap<Integer, AspectList>	allAspects			= new HashMap<Integer, AspectList>();
+	private static HashMap<Integer, AspectList>	allCompoundAspects	= new HashMap<Integer, AspectList>();
+
+	public static AspectList getAllAspects(int amount)
+	{
+		if(allAspects.get(amount) == null)
+		{
+			final AspectList al = new AspectList();
+			for(final Aspect aspect : Aspect.aspects.values())
+			{
+				al.add(aspect, amount);
+			}
+			allAspects.put(amount, al);
+		}
+		return allAspects.get(amount);
+	}
+
+	public static AspectList getAllCompoundAspects(int amount)
+	{
+		if(allCompoundAspects.get(amount) == null)
+		{
+			final AspectList al = new AspectList();
+			for(final Aspect aspect : Aspect.getCompoundAspects())
+			{
+				al.add(aspect, amount);
+			}
+			allCompoundAspects.put(amount, al);
+		}
+		return allCompoundAspects.get(amount);
+	}
+
 	/**
 	 * Use to subtract vis from a wand for most operations
 	 * Wands store vis differently so "real" vis costs need to be multiplied by 100 before calling this method
@@ -205,11 +260,11 @@ public class ThaumcraftApiHelper {
 	 * false then things like frugal and potency will apply to the costs
 	 * @return was the vis successfully subtracted
 	 */
-	public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, 
-			AspectList cost, boolean doit, boolean crafting) {
+	public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting)
+	{
 		return ThaumcraftApi.internalMethods.consumeVisFromWand(wand, player, cost, doit, crafting);
 	}
-	
+
 	/**
 	 * Subtract vis for use by a crafting mechanic. Costs are calculated slightly 
 	 * differently and things like the frugal enchant is ignored
@@ -220,11 +275,11 @@ public class ThaumcraftApiHelper {
 	 * @param doit actually subtract the vis from the wand if true - if false just simulate the result
 	 * @return was the vis successfully subtracted
 	 */
-	public static boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, 
-			AspectList cost, boolean doit) {
+	public static boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit)
+	{
 		return ThaumcraftApi.internalMethods.consumeVisFromWandCrafting(wand, player, cost, doit);
 	}
-	
+
 	/**
 	 * Subtract vis from a wand the player is carrying. Works like consumeVisFromWand in that actual vis
 	 * costs should be multiplied by 100. The costs are handled like crafting however and things like 
@@ -233,235 +288,236 @@ public class ThaumcraftApiHelper {
 	 * @param cost the cost of the operation. 
 	 * @return was the vis successfully subtracted
 	 */
-	public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) {
+	public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost)
+	{
 		return ThaumcraftApi.internalMethods.consumeVisFromInventory(player, cost);
 	}
-	
-	
+
 	/**
 	 * This adds permanents or temporary warp to a player. It will automatically be synced clientside
 	 * @param player the player using the wand
 	 * @param amount how much warp to add. Negative amounts are only valid for temporary warp
 	 * @param temporary add temporary warp instead of permanent
 	 */
-	public static void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary) {
+	public static void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary)
+	{
 		ThaumcraftApi.internalMethods.addWarpToPlayer(player, amount, temporary);
 	}
-	
+
 	/**
 	 * This "sticky" warp to a player. Sticky warp is permanent warp that can be removed.
 	 * It will automatically be synced clientside
 	 * @param player the player using the wand
 	 * @param amount how much warp to add. Can have negative amounts.
 	 */
-	public static void addStickyWarpToPlayer(EntityPlayer player, int amount) {
+	public static void addStickyWarpToPlayer(EntityPlayer player, int amount)
+	{
 		ThaumcraftApi.internalMethods.addStickyWarpToPlayer(player, amount);
 	}
 
-	public static MovingObjectPosition rayTraceIgnoringSource(World world, Vec3 v1, Vec3 v2, 
-			boolean bool1, boolean bool2, boolean bool3)
+	public static MovingObjectPosition rayTraceIgnoringSource(World world, Vec3 v1, Vec3 v2, boolean bool1, boolean bool2, boolean bool3)
 	{
-	    if (!Double.isNaN(v1.xCoord) && !Double.isNaN(v1.yCoord) && !Double.isNaN(v1.zCoord))
-	    {
-	        if (!Double.isNaN(v2.xCoord) && !Double.isNaN(v2.yCoord) && !Double.isNaN(v2.zCoord))
-	        {
-	            int i = MathHelper.floor_double(v2.xCoord);
-	            int j = MathHelper.floor_double(v2.yCoord);
-	            int k = MathHelper.floor_double(v2.zCoord);
-	            int l = MathHelper.floor_double(v1.xCoord);
-	            int i1 = MathHelper.floor_double(v1.yCoord);
-	            int j1 = MathHelper.floor_double(v1.zCoord);
-	            Block block = world.getBlock(l, i1, j1);
-	            int k1 = world.getBlockMetadata(l, i1, j1);
-	
-	            MovingObjectPosition movingobjectposition2 = null;
-	            k1 = 200;
-	
-	            while (k1-- >= 0)
-	            {
-	                if (Double.isNaN(v1.xCoord) || Double.isNaN(v1.yCoord) || Double.isNaN(v1.zCoord))
-	                {
-	                    return null;
-	                }
-	
-	                if (l == i && i1 == j && j1 == k)
-	                {
-	                    continue;
-	                }
-	
-	                boolean flag6 = true;
-	                boolean flag3 = true;
-	                boolean flag4 = true;
-	                double d0 = 999.0D;
-	                double d1 = 999.0D;
-	                double d2 = 999.0D;
-	
-	                if (i > l)
-	                {
-	                    d0 = (double)l + 1.0D;
-	                }
-	                else if (i < l)
-	                {
-	                    d0 = (double)l + 0.0D;
-	                }
-	                else
-	                {
-	                    flag6 = false;
-	                }
-	
-	                if (j > i1)
-	                {
-	                    d1 = (double)i1 + 1.0D;
-	                }
-	                else if (j < i1)
-	                {
-	                    d1 = (double)i1 + 0.0D;
-	                }
-	                else
-	                {
-	                    flag3 = false;
-	                }
-	
-	                if (k > j1)
-	                {
-	                    d2 = (double)j1 + 1.0D;
-	                }
-	                else if (k < j1)
-	                {
-	                    d2 = (double)j1 + 0.0D;
-	                }
-	                else
-	                {
-	                    flag4 = false;
-	                }
-	
-	                double d3 = 999.0D;
-	                double d4 = 999.0D;
-	                double d5 = 999.0D;
-	                double d6 = v2.xCoord - v1.xCoord;
-	                double d7 = v2.yCoord - v1.yCoord;
-	                double d8 = v2.zCoord - v1.zCoord;
-	
-	                if (flag6)
-	                {
-	                    d3 = (d0 - v1.xCoord) / d6;
-	                }
-	
-	                if (flag3)
-	                {
-	                    d4 = (d1 - v1.yCoord) / d7;
-	                }
-	
-	                if (flag4)
-	                {
-	                    d5 = (d2 - v1.zCoord) / d8;
-	                }
-	
-	                boolean flag5 = false;
-	                byte b0;
-	
-	                if (d3 < d4 && d3 < d5)
-	                {
-	                    if (i > l)
-	                    {
-	                        b0 = 4;
-	                    }
-	                    else
-	                    {
-	                        b0 = 5;
-	                    }
-	
-	                    v1.xCoord = d0;
-	                    v1.yCoord += d7 * d3;
-	                    v1.zCoord += d8 * d3;
-	                }
-	                else if (d4 < d5)
-	                {
-	                    if (j > i1)
-	                    {
-	                        b0 = 0;
-	                    }
-	                    else
-	                    {
-	                        b0 = 1;
-	                    }
-	
-	                    v1.xCoord += d6 * d4;
-	                    v1.yCoord = d1;
-	                    v1.zCoord += d8 * d4;
-	                }
-	                else
-	                {
-	                    if (k > j1)
-	                    {
-	                        b0 = 2;
-	                    }
-	                    else
-	                    {
-	                        b0 = 3;
-	                    }
-	
-	                    v1.xCoord += d6 * d5;
-	                    v1.yCoord += d7 * d5;
-	                    v1.zCoord = d2;
-	                }
-	
-	                Vec3 vec32 = Vec3.createVectorHelper(v1.xCoord, v1.yCoord, v1.zCoord);
-	                l = (int)(vec32.xCoord = (double)MathHelper.floor_double(v1.xCoord));
-	
-	                if (b0 == 5)
-	                {
-	                    --l;
-	                    ++vec32.xCoord;
-	                }
-	
-	                i1 = (int)(vec32.yCoord = (double)MathHelper.floor_double(v1.yCoord));
-	
-	                if (b0 == 1)
-	                {
-	                    --i1;
-	                    ++vec32.yCoord;
-	                }
-	
-	                j1 = (int)(vec32.zCoord = (double)MathHelper.floor_double(v1.zCoord));
-	
-	                if (b0 == 3)
-	                {
-	                    --j1;
-	                    ++vec32.zCoord;
-	                }
-	
-	                Block block1 = world.getBlock(l, i1, j1);
-	                int l1 = world.getBlockMetadata(l, i1, j1);
-	
-	                if (!bool2 || block1.getCollisionBoundingBoxFromPool(world, l, i1, j1) != null)
-	                {
-	                    if (block1.canCollideCheck(l1, bool1))
-	                    {
-	                        MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(world, l, i1, j1, v1, v2);
-	
-	                        if (movingobjectposition1 != null)
-	                        {
-	                            return movingobjectposition1;
-	                        }
-	                    }
-	                    else
-	                    {
-	                        movingobjectposition2 = new MovingObjectPosition(l, i1, j1, b0, v1, false);
-	                    }
-	                }
-	            }
-	
-	            return bool3 ? movingobjectposition2 : null;
-	        }
-	        else
-	        {
-	            return null;
-	        }
-	    }
-	    else
-	    {
-	        return null;
-	    }
+		if(!Double.isNaN(v1.xCoord) && !Double.isNaN(v1.yCoord) && !Double.isNaN(v1.zCoord))
+		{
+			if(!Double.isNaN(v2.xCoord) && !Double.isNaN(v2.yCoord) && !Double.isNaN(v2.zCoord))
+			{
+				final int i = MathHelper.floor_double(v2.xCoord);
+				final int j = MathHelper.floor_double(v2.yCoord);
+				final int k = MathHelper.floor_double(v2.zCoord);
+				int l = MathHelper.floor_double(v1.xCoord);
+				int i1 = MathHelper.floor_double(v1.yCoord);
+				int j1 = MathHelper.floor_double(v1.zCoord);
+				world.getBlock(l, i1, j1);
+				int k1 = world.getBlockMetadata(l, i1, j1);
+
+				MovingObjectPosition movingobjectposition2 = null;
+				k1 = 200;
+
+				while(k1-- >= 0)
+				{
+					if(Double.isNaN(v1.xCoord) || Double.isNaN(v1.yCoord) || Double.isNaN(v1.zCoord))
+					{
+						return null;
+					}
+
+					if(l == i && i1 == j && j1 == k)
+					{
+						continue;
+					}
+
+					boolean flag6 = true;
+					boolean flag3 = true;
+					boolean flag4 = true;
+					double d0 = 999.0D;
+					double d1 = 999.0D;
+					double d2 = 999.0D;
+
+					if(i > l)
+					{
+						d0 = l + 1.0D;
+					}
+					else if(i < l)
+					{
+						d0 = l + 0.0D;
+					}
+					else
+					{
+						flag6 = false;
+					}
+
+					if(j > i1)
+					{
+						d1 = i1 + 1.0D;
+					}
+					else if(j < i1)
+					{
+						d1 = i1 + 0.0D;
+					}
+					else
+					{
+						flag3 = false;
+					}
+
+					if(k > j1)
+					{
+						d2 = j1 + 1.0D;
+					}
+					else if(k < j1)
+					{
+						d2 = j1 + 0.0D;
+					}
+					else
+					{
+						flag4 = false;
+					}
+
+					double d3 = 999.0D;
+					double d4 = 999.0D;
+					double d5 = 999.0D;
+					final double d6 = v2.xCoord - v1.xCoord;
+					final double d7 = v2.yCoord - v1.yCoord;
+					final double d8 = v2.zCoord - v1.zCoord;
+
+					if(flag6)
+					{
+						d3 = (d0 - v1.xCoord) / d6;
+					}
+
+					if(flag3)
+					{
+						d4 = (d1 - v1.yCoord) / d7;
+					}
+
+					if(flag4)
+					{
+						d5 = (d2 - v1.zCoord) / d8;
+					}
+
+					byte b0;
+
+					if(d3 < d4 && d3 < d5)
+					{
+						if(i > l)
+						{
+							b0 = 4;
+						}
+						else
+						{
+							b0 = 5;
+						}
+
+						v1.xCoord = d0;
+						v1.yCoord += d7 * d3;
+						v1.zCoord += d8 * d3;
+					}
+					else if(d4 < d5)
+					{
+						if(j > i1)
+						{
+							b0 = 0;
+						}
+						else
+						{
+							b0 = 1;
+						}
+
+						v1.xCoord += d6 * d4;
+						v1.yCoord = d1;
+						v1.zCoord += d8 * d4;
+					}
+					else
+					{
+						if(k > j1)
+						{
+							b0 = 2;
+						}
+						else
+						{
+							b0 = 3;
+						}
+
+						v1.xCoord += d6 * d5;
+						v1.yCoord += d7 * d5;
+						v1.zCoord = d2;
+					}
+
+					final Vec3 vec32 = Vec3.createVectorHelper(v1.xCoord, v1.yCoord, v1.zCoord);
+					l = (int) (vec32.xCoord = MathHelper.floor_double(v1.xCoord));
+
+					if(b0 == 5)
+					{
+						--l;
+						++vec32.xCoord;
+					}
+
+					i1 = (int) (vec32.yCoord = MathHelper.floor_double(v1.yCoord));
+
+					if(b0 == 1)
+					{
+						--i1;
+						++vec32.yCoord;
+					}
+
+					j1 = (int) (vec32.zCoord = MathHelper.floor_double(v1.zCoord));
+
+					if(b0 == 3)
+					{
+						--j1;
+						++vec32.zCoord;
+					}
+
+					final Block block1 = world.getBlock(l, i1, j1);
+					final int l1 = world.getBlockMetadata(l, i1, j1);
+
+					if(!bool2 || block1.getCollisionBoundingBoxFromPool(world, l, i1, j1) != null)
+					{
+						if(block1.canCollideCheck(l1, bool1))
+						{
+							final MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(world, l, i1, j1, v1, v2);
+
+							if(movingobjectposition1 != null)
+							{
+								return movingobjectposition1;
+							}
+						}
+						else
+						{
+							movingobjectposition2 = new MovingObjectPosition(l,
+									i1, j1, b0, v1, false);
+						}
+					}
+				}
+
+				return bool3 ? movingobjectposition2 : null;
+			}
+			else
+			{
+				return null;
+			}
+		}
+		else
+		{
+			return null;
+		}
 	}
 }
diff --git a/src/api/java/thaumcraft/api/TileThaumcraft.java b/src/api/java/thaumcraft/api/TileThaumcraft.java
index 56ccae8..8bcb4c7 100644
--- a/src/api/java/thaumcraft/api/TileThaumcraft.java
+++ b/src/api/java/thaumcraft/api/TileThaumcraft.java
@@ -15,49 +15,50 @@ import net.minecraft.tileentity.TileEntity;
  * updates. Apart from all the normal TE data that gets sent that is.
  * 
  */
-public class TileThaumcraft extends TileEntity {
-		
+public class TileThaumcraft extends TileEntity
+{
+
 	//NBT stuff
-	
+
 	@Override
 	public void readFromNBT(NBTTagCompound nbttagcompound)
-    {
-        super.readFromNBT(nbttagcompound);
-        readCustomNBT(nbttagcompound);
-    }
-	
+	{
+		super.readFromNBT(nbttagcompound);
+		readCustomNBT(nbttagcompound);
+	}
+
 	public void readCustomNBT(NBTTagCompound nbttagcompound)
-    {
-        //TODO
-    }
+	{
+		//TODO
+	}
 
 	@Override
-    public void writeToNBT(NBTTagCompound nbttagcompound)
-    {
-        super.writeToNBT(nbttagcompound);
-        writeCustomNBT(nbttagcompound);
-    }
-	
+	public void writeToNBT(NBTTagCompound nbttagcompound)
+	{
+		super.writeToNBT(nbttagcompound);
+		writeCustomNBT(nbttagcompound);
+	}
+
 	public void writeCustomNBT(NBTTagCompound nbttagcompound)
-    {
+	{
 		//TODO
-    }
-	
+	}
+
 	//Client Packet stuff
 	@Override
-	public Packet getDescriptionPacket() {
-		NBTTagCompound nbttagcompound = new NBTTagCompound();
-        this.writeCustomNBT(nbttagcompound);
-        return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, -999, nbttagcompound);
+	public Packet getDescriptionPacket()
+	{
+		final NBTTagCompound nbttagcompound = new NBTTagCompound();
+		writeCustomNBT(nbttagcompound);
+		return new S35PacketUpdateTileEntity(xCoord, yCoord,
+				zCoord, -999, nbttagcompound);
 	}
 
 	@Override
-	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
-		super.onDataPacket(net, pkt);		
-		this.readCustomNBT(pkt.func_148857_g());
+	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt)
+	{
+		super.onDataPacket(net, pkt);
+		readCustomNBT(pkt.func_148857_g());
 	}
-	
-	
-	
 
 }
diff --git a/src/api/java/thaumcraft/api/WorldCoordinates.java b/src/api/java/thaumcraft/api/WorldCoordinates.java
index 6c620af..cab4082 100644
--- a/src/api/java/thaumcraft/api/WorldCoordinates.java
+++ b/src/api/java/thaumcraft/api/WorldCoordinates.java
@@ -5,113 +5,119 @@ import net.minecraft.tileentity.TileEntity;
 
 public class WorldCoordinates implements Comparable
 {
-    public int x;
-
-    /** the y coordinate */
-    public int y;
-
-    /** the z coordinate */
-    public int z;
-    
-    public int dim;
-
-    public WorldCoordinates() {}
-
-    public WorldCoordinates(int par1, int par2, int par3, int d)
-    {
-        this.x = par1;
-        this.y = par2;
-        this.z = par3;
-        this.dim = d;
-    }
-    
-    public WorldCoordinates(TileEntity tile)
-    {
-        this.x = tile.xCoord;
-        this.y = tile.yCoord;
-        this.z = tile.zCoord;
-        this.dim = tile.getWorldObj().provider.dimensionId;
-    }
-
-    public WorldCoordinates(WorldCoordinates par1ChunkCoordinates)
-    {
-        this.x = par1ChunkCoordinates.x;
-        this.y = par1ChunkCoordinates.y;
-        this.z = par1ChunkCoordinates.z;
-        this.dim = par1ChunkCoordinates.dim;
-    }
-
-    public boolean equals(Object par1Obj)
-    {
-        if (!(par1Obj instanceof WorldCoordinates))
-        {
-            return false;
-        }
-        else
-        {
-        	WorldCoordinates coordinates = (WorldCoordinates)par1Obj;
-            return this.x == coordinates.x && this.y == coordinates.y && this.z == coordinates.z && this.dim == coordinates.dim ;
-        }
-    }
-
-    public int hashCode()
-    {
-        return this.x + this.y << 8 + this.z << 16 + this.dim << 24;
-    }
-
-    /**
-     * Compare the coordinate with another coordinate
-     */
-    public int compareWorldCoordinate(WorldCoordinates par1)
-    {
-        return this.dim == par1.dim ? (
-        		this.y == par1.y ? (this.z == par1.z ? this.x - par1.x : this.z - par1.z) : this.y - par1.y) : -1;
-    }
-
-    public void set(int par1, int par2, int par3, int d)
-    {
-        this.x = par1;
-        this.y = par2;
-        this.z = par3;
-        this.dim = d;
-    }
-
-    /**
-     * Returns the squared distance between this coordinates and the coordinates given as argument.
-     */
-    public float getDistanceSquared(int par1, int par2, int par3)
-    {
-        float f = (float)(this.x - par1);
-        float f1 = (float)(this.y - par2);
-        float f2 = (float)(this.z - par3);
-        return f * f + f1 * f1 + f2 * f2;
-    }
-
-    /**
-     * Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
-     */
-    public float getDistanceSquaredToWorldCoordinates(WorldCoordinates par1ChunkCoordinates)
-    {
-        return this.getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z);
-    }
-
-    public int compareTo(Object par1Obj)
-    {
-        return this.compareWorldCoordinate((WorldCoordinates)par1Obj);
-    }
-    
-    public void readNBT(NBTTagCompound nbt) {
-    	this.x = nbt.getInteger("w_x");
-    	this.y = nbt.getInteger("w_y");
-    	this.z = nbt.getInteger("w_z");
-    	this.dim = nbt.getInteger("w_d");
-    }
-    
-    public void writeNBT(NBTTagCompound nbt) {
-    	nbt.setInteger("w_x",x);
-    	nbt.setInteger("w_y",y);
-    	nbt.setInteger("w_z",z);
-    	nbt.setInteger("w_d",dim);
-    }
-    
+	public int	x;
+
+	/** the y coordinate */
+	public int	y;
+
+	/** the z coordinate */
+	public int	z;
+
+	public int	dim;
+
+	public WorldCoordinates()
+	{
+	}
+
+	public WorldCoordinates(int par1, int par2, int par3, int d)
+	{
+		x = par1;
+		y = par2;
+		z = par3;
+		dim = d;
+	}
+
+	public WorldCoordinates(TileEntity tile)
+	{
+		x = tile.xCoord;
+		y = tile.yCoord;
+		z = tile.zCoord;
+		dim = tile.getWorldObj().provider.dimensionId;
+	}
+
+	public WorldCoordinates(WorldCoordinates par1ChunkCoordinates)
+	{
+		x = par1ChunkCoordinates.x;
+		y = par1ChunkCoordinates.y;
+		z = par1ChunkCoordinates.z;
+		dim = par1ChunkCoordinates.dim;
+	}
+
+	@Override
+	public boolean equals(Object par1Obj)
+	{
+		if(!(par1Obj instanceof WorldCoordinates))
+		{
+			return false;
+		}
+		else
+		{
+			final WorldCoordinates coordinates = (WorldCoordinates) par1Obj;
+			return x == coordinates.x && y == coordinates.y && z == coordinates.z && dim == coordinates.dim;
+		}
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return x + y << 8 + z << 16 + dim << 24;
+	}
+
+	/**
+	 * Compare the coordinate with another coordinate
+	 */
+	public int compareWorldCoordinate(WorldCoordinates par1)
+	{
+		return dim == par1.dim ? (y == par1.y ? (z == par1.z ? x - par1.x : z - par1.z) : y - par1.y) : -1;
+	}
+
+	public void set(int par1, int par2, int par3, int d)
+	{
+		x = par1;
+		y = par2;
+		z = par3;
+		dim = d;
+	}
+
+	/**
+	 * Returns the squared distance between this coordinates and the coordinates given as argument.
+	 */
+	public float getDistanceSquared(int par1, int par2, int par3)
+	{
+		final float f = x - par1;
+		final float f1 = y - par2;
+		final float f2 = z - par3;
+		return f * f + f1 * f1 + f2 * f2;
+	}
+
+	/**
+	 * Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
+	 */
+	public float getDistanceSquaredToWorldCoordinates(WorldCoordinates par1ChunkCoordinates)
+	{
+		return getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z);
+	}
+
+	@Override
+	public int compareTo(Object par1Obj)
+	{
+		return compareWorldCoordinate((WorldCoordinates) par1Obj);
+	}
+
+	public void readNBT(NBTTagCompound nbt)
+	{
+		x = nbt.getInteger("w_x");
+		y = nbt.getInteger("w_y");
+		z = nbt.getInteger("w_z");
+		dim = nbt.getInteger("w_d");
+	}
+
+	public void writeNBT(NBTTagCompound nbt)
+	{
+		nbt.setInteger("w_x", x);
+		nbt.setInteger("w_y", y);
+		nbt.setInteger("w_z", z);
+		nbt.setInteger("w_d", dim);
+	}
+
 }
diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java
index 0ea13f5..c6c548e 100644
--- a/src/api/java/thaumcraft/api/aspects/Aspect.java
+++ b/src/api/java/thaumcraft/api/aspects/Aspect.java
@@ -9,14 +9,15 @@ import net.minecraft.util.StatCollector;
 
 import org.apache.commons.lang3.text.WordUtils;
 
-public class Aspect {
-	
-	String tag;
-	Aspect[] components;
-	int color;
-	private String chatcolor;
-	ResourceLocation image;
-	int blend;
+public class Aspect
+{
+
+	String				tag;
+	Aspect[]			components;
+	int					color;
+	private String		chatcolor;
+	ResourceLocation	image;
+	int					blend;
 
 	/**
 	 * Use this constructor to register your own aspects.
@@ -26,8 +27,12 @@ public class Aspect {
 	 * @param image ResourceLocation pointing to a 32x32 icon of the aspect
 	 * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1
 	 */
-	public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) {
-		if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!");
+	public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend)
+	{
+		if(aspects.containsKey(tag))
+		{
+			throw new IllegalArgumentException(tag + " already registered!");
+		}
 		this.tag = tag;
 		this.components = components;
 		this.color = color;
@@ -35,167 +40,338 @@ public class Aspect {
 		this.blend = blend;
 		aspects.put(tag, this);
 	}
-	
+
 	/**
 	 * Shortcut constructor I use for the default aspects - you shouldn't be using this.
 	 */
-	public Aspect(String tag, int color, Aspect[] components) {
-		this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1);
+	public Aspect(String tag, int color, Aspect[] components)
+	{
+		this(tag, color, components, new ResourceLocation("thaumcraft",
+				"textures/aspects/" + tag.toLowerCase() + ".png"), 1);
 	}
-	
+
 	/**
 	 * Shortcut constructor I use for the default aspects - you shouldn't be using this.
 	 */
-	public Aspect(String tag, int color, Aspect[] components, int blend) {
-		this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend);
+	public Aspect(String tag, int color, Aspect[] components, int blend)
+	{
+		this(tag, color, components, new ResourceLocation("thaumcraft",
+				"textures/aspects/" + tag.toLowerCase() + ".png"), blend);
 	}
 
 	/**
 	 * Shortcut constructor I use for the primal aspects - 
 	 * you shouldn't use this as making your own primal aspects will break all the things.
 	 */
-	public Aspect(String tag, int color, String chatcolor, int blend) {
-		this(tag,color,(Aspect[])null, blend);
-		this.setChatcolor(chatcolor);
+	public Aspect(String tag, int color, String chatcolor, int blend)
+	{
+		this(tag, color, (Aspect[]) null, blend);
+		setChatcolor(chatcolor);
 	}
-	
-	public int getColor() {
+
+	public int getColor()
+	{
 		return color;
 	}
-	
-	public String getName() {
+
+	public String getName()
+	{
 		return WordUtils.capitalizeFully(tag);
 	}
-	
-	public String getLocalizedDescription() {
-		return StatCollector.translateToLocal("tc.aspect."+tag);
+
+	public String getLocalizedDescription()
+	{
+		return StatCollector.translateToLocal("tc.aspect." + tag);
 	}
-	
-	public String getTag() {
+
+	public String getTag()
+	{
 		return tag;
 	}
 
-	public void setTag(String tag) {
+	public void setTag(String tag)
+	{
 		this.tag = tag;
 	}
 
-	public Aspect[] getComponents() {
+	public Aspect[] getComponents()
+	{
 		return components;
 	}
 
-	public void setComponents(Aspect[] components) {
+	public void setComponents(Aspect[] components)
+	{
 		this.components = components;
 	}
-	
-	public ResourceLocation getImage() {
+
+	public ResourceLocation getImage()
+	{
 		return image;
 	}
-	
-	public static Aspect getAspect(String tag) {
+
+	public static Aspect getAspect(String tag)
+	{
 		return aspects.get(tag);
 	}
-	
-	public int getBlend() {
+
+	public int getBlend()
+	{
 		return blend;
 	}
 
-	public void setBlend(int blend) {
+	public void setBlend(int blend)
+	{
 		this.blend = blend;
 	}
-	
-	public boolean isPrimal() {
-		return getComponents()==null || getComponents().length!=2;
+
+	public boolean isPrimal()
+	{
+		return getComponents() == null || getComponents().length != 2;
 	}
-	
+
 	///////////////////////////////
-	public static ArrayList<Aspect> getPrimalAspects() {
-		ArrayList<Aspect> primals = new ArrayList<Aspect>();
-		Collection<Aspect> pa = aspects.values();
-		for (Aspect aspect:pa) {
-			if (aspect.isPrimal())  primals.add(aspect);
+	public static ArrayList<Aspect> getPrimalAspects()
+	{
+		final ArrayList<Aspect> primals = new ArrayList<Aspect>();
+		final Collection<Aspect> pa = aspects.values();
+		for(final Aspect aspect : pa)
+		{
+			if(aspect.isPrimal())
+			{
+				primals.add(aspect);
+			}
 		}
 		return primals;
 	}
-	
-	public static ArrayList<Aspect> getCompoundAspects() {
-		ArrayList<Aspect> compounds = new ArrayList<Aspect>();
-		Collection<Aspect> pa = aspects.values();
-		for (Aspect aspect:pa) {
-			if (!aspect.isPrimal())  compounds.add(aspect);
+
+	public static ArrayList<Aspect> getCompoundAspects()
+	{
+		final ArrayList<Aspect> compounds = new ArrayList<Aspect>();
+		final Collection<Aspect> pa = aspects.values();
+		for(final Aspect aspect : pa)
+		{
+			if(!aspect.isPrimal())
+			{
+				compounds.add(aspect);
+			}
 		}
 		return compounds;
 	}
 
-	public String getChatcolor() {
+	public String getChatcolor()
+	{
 		return chatcolor;
 	}
 
-	public void setChatcolor(String chatcolor) {
+	public void setChatcolor(String chatcolor)
+	{
 		this.chatcolor = chatcolor;
 	}
-	
 
 	///////////////////////////////
-	public static LinkedHashMap<String,Aspect> aspects = new LinkedHashMap<String,Aspect>();
-	
+	public static LinkedHashMap<String, Aspect>	aspects		= new LinkedHashMap<String, Aspect>();
+
 	//PRIMAL
-		public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1);
-		public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1);
-		public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1);
-		public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1);
-		public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1);
-		public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771);
-	
+	public static final Aspect					AIR			= new Aspect("aer",
+			0xffff7e,
+			"e", 1);
+	public static final Aspect					EARTH		= new Aspect(
+			"terra",
+			0x56c000,
+			"2", 1);
+	public static final Aspect					FIRE		= new Aspect(
+			"ignis",
+			0xff5a01,
+			"c", 1);
+	public static final Aspect					WATER		= new Aspect(
+			"aqua",
+			0x3cd4fc,
+			"3", 1);
+	public static final Aspect					ORDER		= new Aspect(
+			"ordo",
+			0xd5d4ec,
+			"7", 1);
+	public static final Aspect					ENTROPY		= new Aspect(
+			"perditio",
+			0x404040,
+			"8", 771);
+
 	//SECONDARY  	
-		public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771);
-		public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE});
-		public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER});
-		public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER});
-		public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY});
-		public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, ORDER});
-		public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {WATER, EARTH});
-		public static final Aspect POISON = new Aspect("venenum",0x89f000,  new Aspect[] {WATER, ENTROPY});	
-		public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE});
-		public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {AIR, EARTH});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY});
-		
+	public static final Aspect					VOID		= new Aspect(
+			"vacuos",
+			0x888888,
+			new Aspect[] {AIR, ENTROPY},
+			771);
+	public static final Aspect					LIGHT		= new Aspect(
+			"lux",
+			0xfff663,
+			new Aspect[] {AIR, FIRE});
+	public static final Aspect					WEATHER		= new Aspect(
+			"tempestas",
+			0xFFFFFF,
+			new Aspect[] {AIR, WATER});
+	public static final Aspect					MOTION		= new Aspect(
+			"motus",
+			0xcdccf4,
+			new Aspect[] {AIR, ORDER});
+	public static final Aspect					COLD		= new Aspect(
+			"gelum",
+			0xe1ffff,
+			new Aspect[] {FIRE, ENTROPY});
+	public static final Aspect					CRYSTAL		= new Aspect(
+			"vitreus",
+			0x80ffff,
+			new Aspect[] {EARTH, ORDER});
+	public static final Aspect					LIFE		= new Aspect(
+			"victus",
+			0xde0005,
+			new Aspect[] {WATER, EARTH});
+	public static final Aspect					POISON		= new Aspect(
+			"venenum",
+			0x89f000,
+			new Aspect[] {WATER, ENTROPY});
+	public static final Aspect					ENERGY		= new Aspect(
+			"potentia",
+			0xc0ffff,
+			new Aspect[] {ORDER, FIRE});
+	public static final Aspect					EXCHANGE	= new Aspect(
+			"permutatio",
+			0x578357,
+			new Aspect[] {ENTROPY, ORDER});
+	//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {AIR, EARTH});
+	//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH});
+	//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER});
+	//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER});
+	//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY});
+
 	//TERTIARY  			
-		public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, CRYSTAL});
-		public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {LIFE, ENTROPY});
-		public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION});
-		public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT});
-		public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH});
-		public static final Aspect HEAL = new Aspect("sano",0xff2f34, new Aspect[] {LIFE, ORDER});
-		public static final Aspect TRAVEL = new Aspect("iter",0xe0585b, new Aspect[] {MOTION, EARTH});
-		public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS});
-		public static final Aspect MAGIC = new Aspect("praecantatio",0x9700c0, new Aspect[] {VOID, ENERGY});
-		public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {MAGIC, AIR});
-		public static final Aspect TAINT = new Aspect("vitium",0x800080, new Aspect[] {MAGIC, ENTROPY});
-		public static final Aspect SLIME = new Aspect("limus",0x01f800, new Aspect[] {LIFE, WATER});
-		public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH});
-		public static final Aspect TREE = new Aspect("arbor",0x876531, new Aspect[] {AIR, PLANT});		
-		public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE});
-		public static final Aspect FLESH = new Aspect("corpus",0xee478d, new Aspect[] {DEATH, BEAST});
-		public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH});
-		public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {FIRE, SOUL});
-		public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL});
-		public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {BEAST, MIND});
-		public static final Aspect CROP = new Aspect("messis",0xe1b371, new Aspect[] {PLANT, MAN});		
-		public static final Aspect MINE = new Aspect("perfodio",0xdcd2d8, new Aspect[] {MAN, EARTH});
-		public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {MAN, ORDER});
-		public static final Aspect HARVEST = new Aspect("meto",0xeead82, new Aspect[] {CROP, TOOL});
-		public static final Aspect WEAPON = new Aspect("telum",0xc05050, new Aspect[] {TOOL, FIRE});
-		public static final Aspect ARMOR = new Aspect("tutamen",0x00c0c0, new Aspect[] {TOOL, EARTH});
-		public static final Aspect HUNGER = new Aspect("fames",0x9a0305, new Aspect[] {LIFE, VOID});
-		public static final Aspect GREED = new Aspect("lucrum",0xe6be44, new Aspect[] {MAN, HUNGER});
-		public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {MAN, TOOL});
-		public static final Aspect CLOTH = new Aspect("pannus",0xeaeac2, new Aspect[] {TOOL, BEAST});
-		public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL});
-		public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY});				
-		
-		
+	public static final Aspect					METAL		= new Aspect(
+			"metallum",
+			0xb5b5cd,
+			new Aspect[] {EARTH, CRYSTAL});
+	public static final Aspect					DEATH		= new Aspect(
+			"mortuus",
+			0x887788,
+			new Aspect[] {LIFE, ENTROPY});
+	public static final Aspect					FLIGHT		= new Aspect(
+			"volatus",
+			0xe7e7d7,
+			new Aspect[] {AIR, MOTION});
+	public static final Aspect					DARKNESS	= new Aspect(
+			"tenebrae",
+			0x222222,
+			new Aspect[] {VOID, LIGHT});
+	public static final Aspect					SOUL		= new Aspect(
+			"spiritus",
+			0xebebfb,
+			new Aspect[] {LIFE, DEATH});
+	public static final Aspect					HEAL		= new Aspect(
+			"sano",
+			0xff2f34,
+			new Aspect[] {LIFE, ORDER});
+	public static final Aspect					TRAVEL		= new Aspect(
+			"iter",
+			0xe0585b,
+			new Aspect[] {MOTION, EARTH});
+	public static final Aspect					ELDRITCH	= new Aspect(
+			"alienis",
+			0x805080,
+			new Aspect[] {VOID, DARKNESS});
+	public static final Aspect					MAGIC		= new Aspect(
+			"praecantatio",
+			0x9700c0,
+			new Aspect[] {VOID, ENERGY});
+	public static final Aspect					AURA		= new Aspect(
+			"auram",
+			0xffc0ff,
+			new Aspect[] {MAGIC, AIR});
+	public static final Aspect					TAINT		= new Aspect(
+			"vitium",
+			0x800080,
+			new Aspect[] {MAGIC, ENTROPY});
+	public static final Aspect					SLIME		= new Aspect(
+			"limus",
+			0x01f800,
+			new Aspect[] {LIFE, WATER});
+	public static final Aspect					PLANT		= new Aspect(
+			"herba",
+			0x01ac00,
+			new Aspect[] {LIFE, EARTH});
+	public static final Aspect					TREE		= new Aspect(
+			"arbor",
+			0x876531,
+			new Aspect[] {AIR, PLANT});
+	public static final Aspect					BEAST		= new Aspect(
+			"bestia",
+			0x9f6409,
+			new Aspect[] {MOTION, LIFE});
+	public static final Aspect					FLESH		= new Aspect(
+			"corpus",
+			0xee478d,
+			new Aspect[] {DEATH, BEAST});
+	public static final Aspect					UNDEAD		= new Aspect(
+			"exanimis",
+			0x3a4000,
+			new Aspect[] {MOTION, DEATH});
+	public static final Aspect					MIND		= new Aspect(
+			"cognitio",
+			0xffc2b3,
+			new Aspect[] {FIRE, SOUL});
+	public static final Aspect					SENSES		= new Aspect(
+			"sensus",
+			0x0fd9ff,
+			new Aspect[] {AIR, SOUL});
+	public static final Aspect					MAN			= new Aspect(
+			"humanus",
+			0xffd7c0,
+			new Aspect[] {BEAST, MIND});
+	public static final Aspect					CROP		= new Aspect(
+			"messis",
+			0xe1b371,
+			new Aspect[] {PLANT, MAN});
+	public static final Aspect					MINE		= new Aspect(
+			"perfodio",
+			0xdcd2d8,
+			new Aspect[] {MAN, EARTH});
+	public static final Aspect					TOOL		= new Aspect(
+			"instrumentum",
+			0x4040ee,
+			new Aspect[] {MAN, ORDER});
+	public static final Aspect					HARVEST		= new Aspect(
+			"meto",
+			0xeead82,
+			new Aspect[] {CROP, TOOL});
+	public static final Aspect					WEAPON		= new Aspect(
+			"telum",
+			0xc05050,
+			new Aspect[] {TOOL, FIRE});
+	public static final Aspect					ARMOR		= new Aspect(
+			"tutamen",
+			0x00c0c0,
+			new Aspect[] {TOOL, EARTH});
+	public static final Aspect					HUNGER		= new Aspect(
+			"fames",
+			0x9a0305,
+			new Aspect[] {LIFE, VOID});
+	public static final Aspect					GREED		= new Aspect(
+			"lucrum",
+			0xe6be44,
+			new Aspect[] {MAN, HUNGER});
+	public static final Aspect					CRAFT		= new Aspect(
+			"fabrico",
+			0x809d80,
+			new Aspect[] {MAN, TOOL});
+	public static final Aspect					CLOTH		= new Aspect(
+			"pannus",
+			0xeaeac2,
+			new Aspect[] {TOOL, BEAST});
+	public static final Aspect					MECHANISM	= new Aspect(
+			"machina",
+			0x8080a0,
+			new Aspect[] {MOTION, TOOL});
+	public static final Aspect					TRAP		= new Aspect(
+			"vinculum",
+			0x9a8080,
+			new Aspect[] {MOTION, ENTROPY});
+
 }
diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java
index b578141..fb80b48 100644
--- a/src/api/java/thaumcraft/api/aspects/AspectList.java
+++ b/src/api/java/thaumcraft/api/aspects/AspectList.java
@@ -8,154 +8,192 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import thaumcraft.api.ThaumcraftApiHelper;
 
-public class AspectList implements Serializable {
-	
-	public LinkedHashMap<Aspect,Integer> aspects = new LinkedHashMap<Aspect,Integer>();//aspects associated with this object
+public class AspectList implements Serializable
+{
+
+	public LinkedHashMap<Aspect, Integer>	aspects	= new LinkedHashMap<Aspect, Integer>();	//aspects associated with this object
 
-	
 	/**
 	 * this creates a new aspect list with preloaded values based off the aspects of the given item.
 	 * @param the itemstack of the given item
 	 */
-	public AspectList(ItemStack stack) {
-		try {
-			AspectList temp = ThaumcraftApiHelper.getObjectAspects(stack);
-			if (temp!=null)
-			for (Aspect tag:temp.getAspects()) {
-				add(tag,temp.getAmount(tag));
+	public AspectList(ItemStack stack)
+	{
+		try
+		{
+			final AspectList temp = ThaumcraftApiHelper.getObjectAspects(stack);
+			if(temp != null)
+			{
+				for(final Aspect tag : temp.getAspects())
+				{
+					add(tag, temp.getAmount(tag));
+				}
 			}
-		} catch (Exception e) {}
+		}
+		catch(final Exception e)
+		{
+		}
 	}
-	
-	public AspectList() {
+
+	public AspectList()
+	{
 	}
-	
-	public AspectList copy() {
-		AspectList out = new AspectList();
-		for (Aspect a:this.getAspects())
-			out.add(a, this.getAmount(a));
+
+	public AspectList copy()
+	{
+		final AspectList out = new AspectList();
+		for(final Aspect a : getAspects())
+		{
+			out.add(a, getAmount(a));
+		}
 		return out;
 	}
-	
+
 	/**
 	 * @return the amount of different aspects in this collection
 	 */
-	public int size() {
+	public int size()
+	{
 		return aspects.size();
 	}
-	
+
 	/**
 	 * @return the amount of total vis in this collection
 	 */
-	public int visSize() {
+	public int visSize()
+	{
 		int q = 0;
-		
-		for (Aspect as:aspects.keySet()) {
-			q+=this.getAmount(as);
+
+		for(final Aspect as : aspects.keySet())
+		{
+			q += getAmount(as);
 		}
-		
+
 		return q;
 	}
-	
+
 	/**
 	 * @return an array of all the aspects in this collection
 	 */
-	public Aspect[] getAspects() {
-		Aspect[] q = new Aspect[1];
+	public Aspect[] getAspects()
+	{
+		final Aspect[] q = new Aspect[1];
 		return aspects.keySet().toArray(q);
 	}
-	
+
 	/**
 	 * @return an array of all the aspects in this collection
 	 */
-	public Aspect[] getPrimalAspects() {
-		AspectList t = new AspectList();
-		for (Aspect as:aspects.keySet()) {
-			if (as.isPrimal()) {
-				t.add(as,1);
+	public Aspect[] getPrimalAspects()
+	{
+		final AspectList t = new AspectList();
+		for(final Aspect as : aspects.keySet())
+		{
+			if(as.isPrimal())
+			{
+				t.add(as, 1);
 			}
 		}
-		Aspect[] q = new Aspect[1];
+		final Aspect[] q = new Aspect[1];
 		return t.aspects.keySet().toArray(q);
 	}
-	
+
 	/**
 	 * @return an array of all the aspects in this collection sorted by name
 	 */
-	public Aspect[] getAspectsSorted() {
-		try {
-			Aspect[] out = aspects.keySet().toArray(new Aspect[]{});
-			boolean change=false;
-			do {
-				change=false;
-				for(int a=0;a<out.length-1;a++) {
-					Aspect e1 = out[a];
-					Aspect e2 = out[a+1];
-					if (e1!=null && e2!=null && e1.getTag().compareTo(e2.getTag())>0) {
+	public Aspect[] getAspectsSorted()
+	{
+		try
+		{
+			final Aspect[] out = aspects.keySet().toArray(new Aspect[] {});
+			boolean change = false;
+			do
+			{
+				change = false;
+				for(int a = 0; a < out.length - 1; a++)
+				{
+					final Aspect e1 = out[a];
+					final Aspect e2 = out[a + 1];
+					if(e1 != null && e2 != null && e1.getTag().compareTo(e2.getTag()) > 0)
+					{
 						out[a] = e2;
-						out[a+1] = e1;
+						out[a + 1] = e1;
 						change = true;
 						break;
 					}
 				}
-			} while (change==true);
+			}
+			while(change == true);
 			return out;
-		} catch (Exception e) {
-			return this.getAspects(); 
+		}
+		catch(final Exception e)
+		{
+			return getAspects();
 		}
 	}
-	
+
 	/**
 	 * @return an array of all the aspects in this collection sorted by amount
 	 */
-	public Aspect[] getAspectsSortedAmount() {
-		try {
-			Aspect[] out = aspects.keySet().toArray(new Aspect[1]);
-			boolean change=false;
-			do {
-				change=false;
-				for(int a=0;a<out.length-1;a++) {
-					int e1 = getAmount(out[a]); 
-					int e2 = getAmount(out[a+1]);
-					if (e1>0 && e2>0 && e2>e1) {
-						Aspect ea = out[a];
-						Aspect eb = out[a+1];
+	public Aspect[] getAspectsSortedAmount()
+	{
+		try
+		{
+			final Aspect[] out = aspects.keySet().toArray(new Aspect[1]);
+			boolean change = false;
+			do
+			{
+				change = false;
+				for(int a = 0; a < out.length - 1; a++)
+				{
+					final int e1 = getAmount(out[a]);
+					final int e2 = getAmount(out[a + 1]);
+					if(e1 > 0 && e2 > 0 && e2 > e1)
+					{
+						final Aspect ea = out[a];
+						final Aspect eb = out[a + 1];
 						out[a] = eb;
-						out[a+1] = ea;
+						out[a + 1] = ea;
 						change = true;
 						break;
 					}
 				}
-			} while (change==true);
+			}
+			while(change == true);
 			return out;
-		} catch (Exception e) {
-			return this.getAspects();
+		}
+		catch(final Exception e)
+		{
+			return getAspects();
 		}
 	}
-	
+
 	/**
 	 * @param key
 	 * @return the amount associated with the given aspect in this collection
 	 */
-	public int getAmount(Aspect key) {
-		return  aspects.get(key)==null?0:aspects.get(key);
+	public int getAmount(Aspect key)
+	{
+		return aspects.get(key) == null ? 0 : aspects.get(key);
 	}
-	
+
 	/**
 	 * Reduces the amount of an aspect in this collection by the given amount. 
 	 * @param key
 	 * @param amount
 	 * @return 
 	 */
-	public boolean reduce(Aspect key, int amount) {
-		if (getAmount(key)>=amount) {
-			int am = getAmount(key)-amount;
+	public boolean reduce(Aspect key, int amount)
+	{
+		if(getAmount(key) >= amount)
+		{
+			final int am = getAmount(key) - amount;
 			aspects.put(key, am);
 			return true;
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Reduces the amount of an aspect in this collection by the given amount. 
 	 * If reduced to 0 or less the aspect will be removed completely. 
@@ -163,24 +201,32 @@ public class AspectList implements Serializable {
 	 * @param amount
 	 * @return
 	 */
-	public AspectList remove(Aspect key, int amount) {
-		int am = getAmount(key)-amount;
-		if (am<=0) aspects.remove(key); else
-		this.aspects.put(key, am);
+	public AspectList remove(Aspect key, int amount)
+	{
+		final int am = getAmount(key) - amount;
+		if(am <= 0)
+		{
+			aspects.remove(key);
+		}
+		else
+		{
+			aspects.put(key, am);
+		}
 		return this;
 	}
-	
+
 	/**
 	 * Simply removes the aspect from the list
 	 * @param key
 	 * @param amount
 	 * @return
 	 */
-	public AspectList remove(Aspect key) {
-		aspects.remove(key); 
+	public AspectList remove(Aspect key)
+	{
+		aspects.remove(key);
 		return this;
 	}
-	
+
 	/**
 	 * Adds this aspect and amount to the collection. 
 	 * If the aspect exists then its value will be increased by the given amount.
@@ -188,16 +234,17 @@ public class AspectList implements Serializable {
 	 * @param amount
 	 * @return
 	 */
-	public AspectList add(Aspect aspect, int amount) {
-		if (this.aspects.containsKey(aspect)) {
-			int oldamount = this.aspects.get(aspect);
-			amount+=oldamount;
+	public AspectList add(Aspect aspect, int amount)
+	{
+		if(aspects.containsKey(aspect))
+		{
+			final int oldamount = aspects.get(aspect);
+			amount += oldamount;
 		}
-		this.aspects.put( aspect, amount );
+		aspects.put(aspect, amount);
 		return this;
 	}
 
-	
 	/**
 	 * Adds this aspect and amount to the collection. 
 	 * If the aspect exists then only the highest of the old or new amount will be used.
@@ -205,88 +252,107 @@ public class AspectList implements Serializable {
 	 * @param amount
 	 * @return
 	 */
-	public AspectList merge(Aspect aspect, int amount) {
-		if (this.aspects.containsKey(aspect)) {
-			int oldamount = this.aspects.get(aspect);
-			if (amount<oldamount) amount=oldamount;
-			
+	public AspectList merge(Aspect aspect, int amount)
+	{
+		if(aspects.containsKey(aspect))
+		{
+			final int oldamount = aspects.get(aspect);
+			if(amount < oldamount)
+			{
+				amount = oldamount;
+			}
+
 		}
-		this.aspects.put( aspect, amount );
+		aspects.put(aspect, amount);
 		return this;
 	}
-	
-	public AspectList add(AspectList in) {
-		for (Aspect a:in.getAspects()) 
+
+	public AspectList add(AspectList in)
+	{
+		for(final Aspect a : in.getAspects())
+		{
 			this.add(a, in.getAmount(a));
+		}
 		return this;
 	}
-	
-	public AspectList merge(AspectList in) {
-		for (Aspect a:in.getAspects()) 
+
+	public AspectList merge(AspectList in)
+	{
+		for(final Aspect a : in.getAspects())
+		{
 			this.merge(a, in.getAmount(a));
+		}
 		return this;
 	}
-	
+
 	/**
 	 * Reads the list of aspects from nbt
 	 * @param nbttagcompound
 	 * @return 
 	 */
 	public void readFromNBT(NBTTagCompound nbttagcompound)
-    {
-        aspects.clear();
-        NBTTagList tlist = nbttagcompound.getTagList("Aspects",(byte)10);
-		for (int j = 0; j < tlist.tagCount(); j++) {
-			NBTTagCompound rs = (NBTTagCompound) tlist.getCompoundTagAt(j);
-			if (rs.hasKey("key")) {
-				add(	Aspect.getAspect(rs.getString("key")),
-						rs.getInteger("amount"));
+	{
+		aspects.clear();
+		final NBTTagList tlist = nbttagcompound.getTagList("Aspects", (byte) 10);
+		for(int j = 0; j < tlist.tagCount(); j++)
+		{
+			final NBTTagCompound rs = tlist.getCompoundTagAt(j);
+			if(rs.hasKey("key"))
+			{
+				add(Aspect.getAspect(rs.getString("key")), rs.getInteger("amount"));
 			}
 		}
-    }
-	
+	}
+
 	public void readFromNBT(NBTTagCompound nbttagcompound, String label)
-    {
-        aspects.clear();
-        NBTTagList tlist = nbttagcompound.getTagList(label,(byte)10);
-		for (int j = 0; j < tlist.tagCount(); j++) {
-			NBTTagCompound rs = (NBTTagCompound) tlist.getCompoundTagAt(j);
-			if (rs.hasKey("key")) {
-				add(	Aspect.getAspect(rs.getString("key")),
-						rs.getInteger("amount"));
+	{
+		aspects.clear();
+		final NBTTagList tlist = nbttagcompound.getTagList(label, (byte) 10);
+		for(int j = 0; j < tlist.tagCount(); j++)
+		{
+			final NBTTagCompound rs = tlist.getCompoundTagAt(j);
+			if(rs.hasKey("key"))
+			{
+				add(Aspect.getAspect(rs.getString("key")), rs.getInteger("amount"));
 			}
 		}
-    }
-	
+	}
+
 	/**
 	 * Writes the list of aspects to nbt
 	 * @param nbttagcompound
 	 * @return 
 	 */
 	public void writeToNBT(NBTTagCompound nbttagcompound)
-    {
-        NBTTagList tlist = new NBTTagList();
+	{
+		final NBTTagList tlist = new NBTTagList();
 		nbttagcompound.setTag("Aspects", tlist);
-		for (Aspect aspect : getAspects())
-			if (aspect != null) {
-				NBTTagCompound f = new NBTTagCompound();
+		for(final Aspect aspect : getAspects())
+		{
+			if(aspect != null)
+			{
+				final NBTTagCompound f = new NBTTagCompound();
 				f.setString("key", aspect.getTag());
 				f.setInteger("amount", getAmount(aspect));
 				tlist.appendTag(f);
 			}
-    }
-	
+		}
+	}
+
 	public void writeToNBT(NBTTagCompound nbttagcompound, String label)
-    {
-        NBTTagList tlist = new NBTTagList();
+	{
+		final NBTTagList tlist = new NBTTagList();
 		nbttagcompound.setTag(label, tlist);
-		for (Aspect aspect : getAspects())
-			if (aspect != null) {
-				NBTTagCompound f = new NBTTagCompound();
+		for(final Aspect aspect : getAspects())
+		{
+			if(aspect != null)
+			{
+				final NBTTagCompound f = new NBTTagCompound();
 				f.setString("key", aspect.getTag());
 				f.setInteger("amount", getAmount(aspect));
 				tlist.appendTag(f);
 			}
-    }
-	
+		}
+	}
+
 }
diff --git a/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java
index f22d8ce..03abe6c 100644
--- a/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java
+++ b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java
@@ -6,10 +6,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLLog;
 
-public class AspectSourceHelper {
+public class AspectSourceHelper
+{
+
+	static Method	drainEssentia;
+	static Method	findEssentia;
 
-	static Method drainEssentia;
-	static Method findEssentia;
 	/**
 	 * This method is what is used to drain essentia from jars and other sources for things like 
 	 * infusion crafting or powering the arcane furnace. A record of possible sources are kept track of
@@ -21,19 +23,24 @@ public class AspectSourceHelper {
 	 * @param range how many blocks you wish to search for essentia sources. 
 	 * @return boolean returns true if essentia was found and removed from a source.
 	 */
-	public static boolean drainEssentia(TileEntity tile, Aspect aspect, ForgeDirection direction, int range) {
-	    try {
-	        if(drainEssentia == null) {
-	            Class fake = Class.forName("thaumcraft.common.lib.events.EssentiaHandler");
-	            drainEssentia = fake.getMethod("drainEssentia", TileEntity.class, Aspect.class, ForgeDirection.class, int.class);
-	        }
-	        return (Boolean) drainEssentia.invoke(null, tile, aspect, direction, range);
-	    } catch(Exception ex) { 
-	    	FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.events.EssentiaHandler method drainEssentia");
-	    }
+	public static boolean drainEssentia(TileEntity tile, Aspect aspect, ForgeDirection direction, int range)
+	{
+		try
+		{
+			if(drainEssentia == null)
+			{
+				final Class fake = Class.forName("thaumcraft.common.lib.events.EssentiaHandler");
+				drainEssentia = fake.getMethod("drainEssentia", TileEntity.class, Aspect.class, ForgeDirection.class, int.class);
+			}
+			return (Boolean) drainEssentia.invoke(null, tile, aspect, direction, range);
+		}
+		catch(final Exception ex)
+		{
+			FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.events.EssentiaHandler method drainEssentia");
+		}
 		return false;
 	}
-	
+
 	/**
 	 * This method returns if there is any essentia of the passed type that can be drained. It in no way checks how
 	 * much there is, only if an essentia container nearby contains at least 1 point worth.
@@ -43,16 +50,21 @@ public class AspectSourceHelper {
 	 * @param range how many blocks you wish to search for essentia sources. 
 	 * @return boolean returns true if essentia was found and removed from a source.
 	 */
-	public static boolean findEssentia(TileEntity tile, Aspect aspect, ForgeDirection direction, int range) {
-	    try {
-	        if(findEssentia == null) {
-	            Class fake = Class.forName("thaumcraft.common.lib.events.EssentiaHandler");
-	            findEssentia = fake.getMethod("findEssentia", TileEntity.class, Aspect.class, ForgeDirection.class, int.class);
-	        }
-	        return (Boolean) findEssentia.invoke(null, tile, aspect, direction, range);
-	    } catch(Exception ex) { 
-	    	FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.events.EssentiaHandler method findEssentia");
-	    }
+	public static boolean findEssentia(TileEntity tile, Aspect aspect, ForgeDirection direction, int range)
+	{
+		try
+		{
+			if(findEssentia == null)
+			{
+				final Class fake = Class.forName("thaumcraft.common.lib.events.EssentiaHandler");
+				findEssentia = fake.getMethod("findEssentia", TileEntity.class, Aspect.class, ForgeDirection.class, int.class);
+			}
+			return (Boolean) findEssentia.invoke(null, tile, aspect, direction, range);
+		}
+		catch(final Exception ex)
+		{
+			FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.lib.events.EssentiaHandler method findEssentia");
+		}
 		return false;
 	}
 }
diff --git a/src/api/java/thaumcraft/api/aspects/IAspectContainer.java b/src/api/java/thaumcraft/api/aspects/IAspectContainer.java
index bb34ae8..6b34db3 100644
--- a/src/api/java/thaumcraft/api/aspects/IAspectContainer.java
+++ b/src/api/java/thaumcraft/api/aspects/IAspectContainer.java
@@ -1,6 +1,5 @@
 package thaumcraft.api.aspects;
 
-
 /**
  * 
  * @author azanor
@@ -9,20 +8,19 @@ package thaumcraft.api.aspects;
  * Tiles extending this interface will have their aspects show up when viewed by goggles of revealing
  *
  */
-public interface IAspectContainer {
+public interface IAspectContainer
+{
 	public AspectList getAspects();
-	
-	
+
 	public void setAspects(AspectList aspects);
-	
-	
+
 	/**
 	 * This method is used to determine of a specific aspect can be added to this container.
 	 * @param tag 
 	 * @return true or false
 	 */
 	public boolean doesContainerAccept(Aspect tag);
-	
+
 	/**
 	 * This method is used to add a certain amount of an aspect to the tile entity.
 	 * @param tag 
@@ -38,7 +36,7 @@ public interface IAspectContainer {
 	 * @return true if that amount of aspect was available and was removed
 	 */
 	public boolean takeFromContainer(Aspect tag, int amount);
-	
+
 	/**
 	 * removes a bunch of different aspects and amounts from the tile entity.
 	 * @param ot the ObjectTags object that contains the aspects and their amounts.
@@ -48,15 +46,15 @@ public interface IAspectContainer {
 	 */
 	@Deprecated
 	public boolean takeFromContainer(AspectList ot);
-	
+
 	/**
 	 * Checks if the tile entity contains the listed amount (or more) of the aspect
 	 * @param tag
 	 * @param amount
 	 * @return
 	 */
-	public boolean doesContainerContainAmount(Aspect tag,int amount);
-	
+	public boolean doesContainerContainAmount(Aspect tag, int amount);
+
 	/**
 	 * Checks if the tile entity contains all the listed aspects and their amounts
 	 * @param ot the ObjectTags object that contains the aspects and their amounts.
@@ -66,15 +64,12 @@ public interface IAspectContainer {
 	 */
 	@Deprecated
 	public boolean doesContainerContain(AspectList ot);
-	
+
 	/**
 	 * Returns how much of the aspect this tile entity contains
 	 * @param tag
 	 * @return the amount of that aspect found
 	 */
 	public int containerContains(Aspect tag);
-	
-}
-
-
 
+}
diff --git a/src/api/java/thaumcraft/api/aspects/IAspectSource.java b/src/api/java/thaumcraft/api/aspects/IAspectSource.java
index c01f569..a24ffdd 100644
--- a/src/api/java/thaumcraft/api/aspects/IAspectSource.java
+++ b/src/api/java/thaumcraft/api/aspects/IAspectSource.java
@@ -1,7 +1,5 @@
 package thaumcraft.api.aspects;
 
-
-
 /**
  * @author Azanor
  * 
@@ -9,8 +7,7 @@ package thaumcraft.api.aspects;
  * so that they can act as an essentia source for blocks like the infusion altar.
  *
  */
-public interface IAspectSource extends IAspectContainer {
-	
-	
-	
+public interface IAspectSource extends IAspectContainer
+{
+
 }
diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
index 6a82c0e..fba289a 100644
--- a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
+++ b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
@@ -1,7 +1,6 @@
 package thaumcraft.api.aspects;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 /**
  * 
@@ -12,8 +11,10 @@ import net.minecraft.nbt.NBTTagCompound;
  * automatically picks up the aspects they contain
  *
  */
-public interface IEssentiaContainerItem {
+public interface IEssentiaContainerItem
+{
 	public AspectList getAspects(ItemStack itemstack);
+
 	public void setAspects(ItemStack itemstack, AspectList aspects);
 }
 
@@ -28,10 +29,10 @@ public interface IEssentiaContainerItem {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void setAspects(ItemStack itemstack, AspectList aspects) {
 		if (!itemstack.hasTagCompound()) itemstack.setTagCompound(new NBTTagCompound());
 		aspects.writeToNBT(itemstack.getTagCompound());
 	}
-*/
\ No newline at end of file
+ */
diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java
index fecbc16..5e69de5 100644
--- a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java
+++ b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java
@@ -2,40 +2,40 @@ package thaumcraft.api.aspects;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-
 /**
  * @author Azanor
  * This interface is used by tiles that use or transport vis. 
  * Only tiles that implement this interface will be able to connect to vis conduits or other thaumic devices
  */
-public interface IEssentiaTransport {
+public interface IEssentiaTransport
+{
 	/**
 	 * Is this tile able to connect to other vis users/sources on the specified side?
 	 * @param face
 	 * @return
 	 */
 	public boolean isConnectable(ForgeDirection face);
-	
+
 	/**
 	 * Is this side used to input essentia?
 	 * @param face
 	 * @return
 	 */
 	boolean canInputFrom(ForgeDirection face);
-	
+
 	/**
 	 * Is this side used to output essentia?
 	 * @param face
 	 * @return
 	 */
 	boolean canOutputTo(ForgeDirection face);
-			
+
 	/**
 	 * Sets the amount of suction this block will apply
 	 * @param suction
 	 */
 	public void setSuction(Aspect aspect, int amount);
-	
+
 	/**
 	 * Returns the type of suction this block is applying. 
 	 * @param loc
@@ -44,7 +44,7 @@ public interface IEssentiaTransport {
 	 * 		a return type of null indicates the suction is untyped and the first thing available will be drawn
 	 */
 	public Aspect getSuctionType(ForgeDirection face);
-	
+
 	/**
 	 * Returns the strength of suction this block is applying. 
 	 * @param loc
@@ -52,34 +52,32 @@ public interface IEssentiaTransport {
 	 * @return
 	 */
 	public int getSuctionAmount(ForgeDirection face);
-	
+
 	/**
 	 * remove the specified amount of essentia from this transport tile
 	 * @return how much was actually taken
 	 */
 	public int takeEssentia(Aspect aspect, int amount, ForgeDirection face);
-	
+
 	/**
 	 * add the specified amount of essentia to this transport tile
 	 * @return how much was actually added
 	 */
 	public int addEssentia(Aspect aspect, int amount, ForgeDirection face);
-	
+
 	/**
 	 * What type of essentia this contains
 	 * @param face
 	 * @return
 	 */
 	public Aspect getEssentiaType(ForgeDirection face);
-	
+
 	/**
 	 * How much essentia this block contains
 	 * @param face
 	 * @return
 	 */
 	public int getEssentiaAmount(ForgeDirection face);
-	
-	
 
 	/**
 	 * Essentia will not be drawn from this container unless the suction exceeds this amount.
@@ -94,7 +92,4 @@ public interface IEssentiaTransport {
 	 */
 	boolean renderExtendedTube();
 
-	
-	
 }
-
diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java
index 595b6e5..725e21a 100644
--- a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java
@@ -8,84 +8,109 @@ import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-public class CrucibleRecipe {
+public class CrucibleRecipe
+{
 
-	private ItemStack recipeOutput;
-	
-	public Object catalyst;
-	public AspectList aspects;
-	public String key;
-	
-	public int hash;
-	
-	public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags) {
+	private final ItemStack	recipeOutput;
+
+	public Object		catalyst;
+	public AspectList	aspects;
+	public String		key;
+
+	public int			hash;
+
+	public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags)
+	{
 		recipeOutput = result;
-		this.aspects = tags;
-		this.key = researchKey;
-		this.catalyst = cat;
-		if (cat instanceof String) {
-			this.catalyst = OreDictionary.getOres((String) cat);
+		aspects = tags;
+		key = researchKey;
+		catalyst = cat;
+		if(cat instanceof String)
+		{
+			catalyst = OreDictionary.getOres((String) cat);
 		}
 		String hc = researchKey + result.toString();
-		for (Aspect tag:tags.getAspects()) {
-			hc += tag.getTag()+tags.getAmount(tag);
+		for(final Aspect tag : tags.getAspects())
+		{
+			hc += tag.getTag() + tags.getAmount(tag);
 		}
-		if (cat instanceof ItemStack) {
-			hc += ((ItemStack)cat).toString();
-		} else
-		if (cat instanceof ArrayList && ((ArrayList<ItemStack>)catalyst).size()>0) {
-			for (ItemStack is :(ArrayList<ItemStack>)catalyst) {
+		if(cat instanceof ItemStack)
+		{
+			hc += ((ItemStack) cat).toString();
+		}
+		else if(cat instanceof ArrayList && ((ArrayList<ItemStack>) catalyst).size() > 0)
+		{
+			for(final ItemStack is : (ArrayList<ItemStack>) catalyst)
+			{
 				hc += is.toString();
 			}
 		}
-		
+
 		hash = hc.hashCode();
 	}
-	
-		
 
-	public boolean matches(AspectList itags, ItemStack cat) {
-		if (catalyst instanceof ItemStack &&
-				!ThaumcraftApiHelper.itemMatches((ItemStack) catalyst,cat,false)) {
+	public boolean matches(AspectList itags, ItemStack cat)
+	{
+		if(catalyst instanceof ItemStack && !ThaumcraftApiHelper.itemMatches((ItemStack) catalyst, cat, false))
+		{
 			return false;
-		} else 
-		if (catalyst instanceof ArrayList && ((ArrayList<ItemStack>)catalyst).size()>0) {
-			ItemStack[] ores = ((ArrayList<ItemStack>)catalyst).toArray(new ItemStack[]{});
-			if (!ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat},ores)) return false;
 		}
-		if (itags==null) return false;
-		for (Aspect tag:aspects.getAspects()) {
-			if (itags.getAmount(tag)<aspects.getAmount(tag)) return false;
+		else if(catalyst instanceof ArrayList && ((ArrayList<ItemStack>) catalyst).size() > 0)
+		{
+			final ItemStack[] ores = ((ArrayList<ItemStack>) catalyst).toArray(new ItemStack[] {});
+			if(!ThaumcraftApiHelper.containsMatch(false, new ItemStack[] {cat}, ores))
+			{
+				return false;
+			}
+		}
+		if(itags == null)
+		{
+			return false;
+		}
+		for(final Aspect tag : aspects.getAspects())
+		{
+			if(itags.getAmount(tag) < aspects.getAmount(tag))
+			{
+				return false;
+			}
 		}
 		return true;
 	}
-	
-	public boolean catalystMatches(ItemStack cat) {
-		if (catalyst instanceof ItemStack && ThaumcraftApiHelper.itemMatches((ItemStack) catalyst,cat,false)) {
+
+	public boolean catalystMatches(ItemStack cat)
+	{
+		if(catalyst instanceof ItemStack && ThaumcraftApiHelper.itemMatches((ItemStack) catalyst, cat, false))
+		{
 			return true;
-		} else 
-		if (catalyst instanceof ArrayList && ((ArrayList<ItemStack>)catalyst).size()>0) {
-			ItemStack[] ores = ((ArrayList<ItemStack>)catalyst).toArray(new ItemStack[]{});
-			if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat},ores)) return true;
+		}
+		else if(catalyst instanceof ArrayList && ((ArrayList<ItemStack>) catalyst).size() > 0)
+		{
+			final ItemStack[] ores = ((ArrayList<ItemStack>) catalyst).toArray(new ItemStack[] {});
+			if(ThaumcraftApiHelper.containsMatch(false, new ItemStack[] {cat}, ores))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
-	
-	public AspectList removeMatching(AspectList itags) {
-		AspectList temptags = new AspectList();
+
+	public AspectList removeMatching(AspectList itags)
+	{
+		final AspectList temptags = new AspectList();
 		temptags.aspects.putAll(itags.aspects);
-		
-		for (Aspect tag:aspects.getAspects()) {
+
+		for(final Aspect tag : aspects.getAspects())
+		{
 			temptags.remove(tag, aspects.getAmount(tag));
 		}
-		
+
 		itags = temptags;
 		return itags;
 	}
-	
-	public ItemStack getRecipeOutput() {
+
+	public ItemStack getRecipeOutput()
+	{
 		return recipeOutput;
 	}
-	
 
 }
diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java
index bb5036d..1b0a933 100644
--- a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java
@@ -8,28 +8,29 @@ import thaumcraft.api.aspects.AspectList;
 
 public interface IArcaneRecipe
 {
-	
-	
-    /**
-     * Used to check if a recipe matches current crafting inventory
-     * @param player 
-     */
-    boolean matches(IInventory var1, World world, EntityPlayer player);
-
-    /**
-     * Returns an Item that is the result of this recipe
-     */
-    ItemStack getCraftingResult(IInventory var1);
-
-    /**
-     * Returns the size of the recipe area
-     */
-    int getRecipeSize();
-
-    ItemStack getRecipeOutput();
-    AspectList getAspects();
-    AspectList getAspects(IInventory var1);
-    String getResearch();
-
-    
+
+	/**
+	 * Used to check if a recipe matches current crafting inventory
+	 * @param player 
+	 */
+	boolean matches(IInventory var1, World world, EntityPlayer player);
+
+	/**
+	 * Returns an Item that is the result of this recipe
+	 */
+	ItemStack getCraftingResult(IInventory var1);
+
+	/**
+	 * Returns the size of the recipe area
+	 */
+	int getRecipeSize();
+
+	ItemStack getRecipeOutput();
+
+	AspectList getAspects();
+
+	AspectList getAspects(IInventory var1);
+
+	String getResearch();
+
 }
diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
index d137ff2..f0a1226 100644
--- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
+++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
@@ -9,8 +9,9 @@ import net.minecraft.world.World;
  * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls 
  *
  */
-public interface IInfusionStabiliser {
-	
+public interface IInfusionStabiliser
+{
+
 	/**
 	 * returns true if the block can stabilise things
 	 */
diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
index bdc5f50..60ed52e 100644
--- a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
@@ -15,139 +15,173 @@ import thaumcraft.api.aspects.AspectList;
 
 public class InfusionEnchantmentRecipe
 {
-	
-	public AspectList aspects;
-	public String research;
-	public ItemStack[] components;
-	public Enchantment enchantment;
-	public int recipeXP;
-	public int instability;
-	
-	public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, 
-			AspectList aspects2, ItemStack[] recipe) {
+
+	public AspectList	aspects;
+	public String		research;
+	public ItemStack[]	components;
+	public Enchantment	enchantment;
+	public int			recipeXP;
+	public int			instability;
+
+	public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, AspectList aspects2, ItemStack[] recipe)
+	{
 		this.research = research;
-		this.enchantment = input;
-		this.aspects = aspects2;
-		this.components = recipe;
-		this.instability = inst;
-		this.recipeXP = Math.max(1, input.getMinEnchantability(1)/3);
+		enchantment = input;
+		aspects = aspects2;
+		components = recipe;
+		instability = inst;
+		recipeXP = Math.max(1, input.getMinEnchantability(1) / 3);
 	}
 
 	/**
-     * Used to check if a recipe matches current crafting inventory
-     * @param player 
-     */
-	public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player) {
-		if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) {
-    		return false;
-    	}
-		
-		if (!enchantment.canApply(central) || !central.getItem().isItemTool(central)) {
+	 * Used to check if a recipe matches current crafting inventory
+	 * @param player 
+	 */
+	public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player)
+	{
+		if(research.length() > 0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research))
+		{
+			return false;
+		}
+
+		if(!enchantment.canApply(central) || !central.getItem().isItemTool(central))
+		{
 			return false;
 		}
-				
-		Map map1 = EnchantmentHelper.getEnchantments(central);
-		Iterator iterator = map1.keySet().iterator();
-        while (iterator.hasNext())
-        {
-        	int j1 = ((Integer)iterator.next()).intValue();
-            Enchantment ench = Enchantment.enchantmentsList[j1];
-            if (j1 == enchantment.effectId &&
-            		EnchantmentHelper.getEnchantmentLevel(j1, central)>=ench.getMaxLevel())
-            	return false;
-            if (enchantment.effectId != ench.effectId && 
-            	(!enchantment.canApplyTogether(ench) ||
-            	!ench.canApplyTogether(enchantment))) {
-            	return false;
-            }
-        }
-		
+
+		final Map map1 = EnchantmentHelper.getEnchantments(central);
+		final Iterator iterator = map1.keySet().iterator();
+		while(iterator.hasNext())
+		{
+			final int j1 = ((Integer) iterator.next()).intValue();
+			final Enchantment ench = Enchantment.enchantmentsList[j1];
+			if(j1 == enchantment.effectId && EnchantmentHelper.getEnchantmentLevel(j1, central) >= ench.getMaxLevel())
+			{
+				return false;
+			}
+			if(enchantment.effectId != ench.effectId && (!enchantment.canApplyTogether(ench) || !ench.canApplyTogether(enchantment)))
+			{
+				return false;
+			}
+		}
+
 		ItemStack i2 = null;
-		
-		ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
-		for (ItemStack is:input) {
+
+		final ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
+		for(final ItemStack is : input)
+		{
 			ii.add(is.copy());
 		}
-		
-		for (ItemStack comp:components) {
-			boolean b=false;
-			for (int a=0;a<ii.size();a++) {
-				 i2 = ii.get(a).copy();
-				if (comp.getItemDamage()==OreDictionary.WILDCARD_VALUE) {
+
+		for(final ItemStack comp : components)
+		{
+			boolean b = false;
+			for(int a = 0; a < ii.size(); a++)
+			{
+				i2 = ii.get(a).copy();
+				if(comp.getItemDamage() == OreDictionary.WILDCARD_VALUE)
+				{
 					i2.setItemDamage(OreDictionary.WILDCARD_VALUE);
 				}
-				if (areItemStacksEqual(i2, comp,true)) {
+				if(areItemStacksEqual(i2, comp, true))
+				{
 					ii.remove(a);
-					b=true;
+					b = true;
 					break;
 				}
 			}
-			if (!b) return false;
+			if(!b)
+			{
+				return false;
+			}
 		}
-//		System.out.println(ii.size());
-		return ii.size()==0?true:false;
-    }
-	
+		//		System.out.println(ii.size());
+		return ii.size() == 0 ? true : false;
+	}
+
 	protected boolean areItemStacksEqual(ItemStack stack0, ItemStack stack1, boolean fuzzy)
-    {
-		if (stack0==null && stack1!=null) return false;
-		if (stack0!=null && stack1==null) return false;
-		if (stack0==null && stack1==null) return true;
-		boolean t1=ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(stack0, stack1);
-		if (!t1) return false;
-		if (fuzzy) {
-			Integer od = OreDictionary.getOreID(stack0);
-			if (od!=-1) {
-				ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[]{});
-				if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{stack1}, ores))
+	{
+		if(stack0 == null && stack1 != null)
+		{
+			return false;
+		}
+		if(stack0 != null && stack1 == null)
+		{
+			return false;
+		}
+		if(stack0 == null && stack1 == null)
+		{
+			return true;
+		}
+		final boolean t1 = ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(stack0, stack1);
+		if(!t1)
+		{
+			return false;
+		}
+		if(fuzzy)
+		{
+			final Integer od = OreDictionary.getOreID(stack0);
+			if(od != -1)
+			{
+				final ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[] {});
+				if(ThaumcraftApiHelper.containsMatch(false, new ItemStack[] {stack1}, ores))
+				{
 					return true;
+				}
 			}
 		}
-        return stack0.getItem() != stack1.getItem() ? false : (stack0.getItemDamage() != stack1.getItemDamage() ? false : stack0.stackSize <= stack0.getMaxStackSize() );
-    }
-	
-   
-    public Enchantment getEnchantment() {
+		return stack0.getItem() != stack1.getItem() ? false : (stack0.getItemDamage() != stack1.getItemDamage() ? false : stack0.stackSize <= stack0.getMaxStackSize());
+	}
+
+	public Enchantment getEnchantment()
+	{
 		return enchantment;
-    	
-    }
-    
-    public AspectList getAspects() {
+
+	}
+
+	public AspectList getAspects()
+	{
 		return aspects;
-    	
-    }
-    
-    public String getResearch() {
+
+	}
+
+	public String getResearch()
+	{
 		return research;
-    	
-    }
 
-	public int calcInstability(ItemStack recipeInput) {
+	}
+
+	public int calcInstability(ItemStack recipeInput)
+	{
 		int i = 0;
-		Map map1 = EnchantmentHelper.getEnchantments(recipeInput);
-		Iterator iterator = map1.keySet().iterator();
-        while (iterator.hasNext())
-        {
-        	int j1 = ((Integer)iterator.next()).intValue();
-        	i += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput);
-        }
-		return (i/2) + instability;
+		final Map map1 = EnchantmentHelper.getEnchantments(recipeInput);
+		final Iterator iterator = map1.keySet().iterator();
+		while(iterator.hasNext())
+		{
+			final int j1 = ((Integer) iterator.next()).intValue();
+			i += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput);
+		}
+		return (i / 2) + instability;
 	}
 
-	public int calcXP(ItemStack recipeInput) {
-		return recipeXP * (1+EnchantmentHelper.getEnchantmentLevel(enchantment.effectId, recipeInput));
+	public int calcXP(ItemStack recipeInput)
+	{
+		return recipeXP * (1 + EnchantmentHelper.getEnchantmentLevel(enchantment.effectId, recipeInput));
 	}
 
-	public float getEssentiaMod(ItemStack recipeInput) {
+	public float getEssentiaMod(ItemStack recipeInput)
+	{
 		float mod = EnchantmentHelper.getEnchantmentLevel(enchantment.effectId, recipeInput);
-		Map map1 = EnchantmentHelper.getEnchantments(recipeInput);
-		Iterator iterator = map1.keySet().iterator();
-        while (iterator.hasNext())
-        {
-        	int j1 = ((Integer)iterator.next()).intValue();
-        	if (j1 != enchantment.effectId)
-        		mod += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput) * .1f;
-        }
+		final Map map1 = EnchantmentHelper.getEnchantments(recipeInput);
+		final Iterator iterator = map1.keySet().iterator();
+		while(iterator.hasNext())
+		{
+			final int j1 = ((Integer) iterator.next()).intValue();
+			if(j1 != enchantment.effectId)
+			{
+				mod += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput) * .1f;
+			}
+		}
 		return mod;
 	}
 
diff --git a/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java
index d786b81..93d1121 100644
--- a/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java
@@ -11,123 +11,164 @@ import thaumcraft.api.aspects.AspectList;
 
 public class InfusionRecipe
 {
-	protected AspectList aspects;
-	protected String research;
-	private ItemStack[] components;
-	private ItemStack recipeInput;
-	protected Object recipeOutput;
-	protected int instability;
-	
-	public InfusionRecipe(String research, Object output, int inst,
-			AspectList aspects2, ItemStack input, ItemStack[] recipe) {
+	protected AspectList	aspects;
+	protected String		research;
+	private final ItemStack[]		components;
+	private final ItemStack		recipeInput;
+	protected Object		recipeOutput;
+	protected int			instability;
+
+	public InfusionRecipe(String research, Object output, int inst, AspectList aspects2, ItemStack input, ItemStack[] recipe)
+	{
 		this.research = research;
-		this.recipeOutput = output;
-		this.recipeInput = input;
-		this.aspects = aspects2;
-		this.components = recipe;
-		this.instability = inst;
+		recipeOutput = output;
+		recipeInput = input;
+		aspects = aspects2;
+		components = recipe;
+		instability = inst;
 	}
 
 	/**
-     * Used to check if a recipe matches current crafting inventory
-     * @param player 
-     */
-	public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player) {
-		if (getRecipeInput()==null) return false;
-			
-		if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) {
-    		return false;
-    	}
-		
+	 * Used to check if a recipe matches current crafting inventory
+	 * @param player 
+	 */
+	public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player)
+	{
+		if(getRecipeInput() == null)
+		{
+			return false;
+		}
+
+		if(research.length() > 0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research))
+		{
+			return false;
+		}
+
 		ItemStack i2 = central.copy();
-		if (getRecipeInput().getItemDamage()==OreDictionary.WILDCARD_VALUE) {
+		if(getRecipeInput().getItemDamage() == OreDictionary.WILDCARD_VALUE)
+		{
 			i2.setItemDamage(OreDictionary.WILDCARD_VALUE);
 		}
-		
-		if (!areItemStacksEqual(i2, getRecipeInput(), true)) return false;
-		
-		ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
-		for (ItemStack is:input) {
+
+		if(!areItemStacksEqual(i2, getRecipeInput(), true))
+		{
+			return false;
+		}
+
+		final ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
+		for(final ItemStack is : input)
+		{
 			ii.add(is.copy());
 		}
-		
-		for (ItemStack comp:getComponents()) {
-			boolean b=false;
-			for (int a=0;a<ii.size();a++) {
-				 i2 = ii.get(a).copy();
-				if (comp.getItemDamage()==OreDictionary.WILDCARD_VALUE) {
+
+		for(final ItemStack comp : getComponents())
+		{
+			boolean b = false;
+			for(int a = 0; a < ii.size(); a++)
+			{
+				i2 = ii.get(a).copy();
+				if(comp.getItemDamage() == OreDictionary.WILDCARD_VALUE)
+				{
 					i2.setItemDamage(OreDictionary.WILDCARD_VALUE);
 				}
-				if (areItemStacksEqual(i2, comp,true)) {
+				if(areItemStacksEqual(i2, comp, true))
+				{
 					ii.remove(a);
-					b=true;
+					b = true;
 					break;
 				}
 			}
-			if (!b) return false;
+			if(!b)
+			{
+				return false;
+			}
 		}
-		return ii.size()==0?true:false;
-    }
-	
+		return ii.size() == 0 ? true : false;
+	}
+
 	public static boolean areItemStacksEqual(ItemStack stack0, ItemStack stack1, boolean fuzzy)
-    {
-		if (stack0==null && stack1!=null) return false;
-		if (stack0!=null && stack1==null) return false;
-		if (stack0==null && stack1==null) return true;
-		
+	{
+		if(stack0 == null && stack1 != null)
+		{
+			return false;
+		}
+		if(stack0 != null && stack1 == null)
+		{
+			return false;
+		}
+		if(stack0 == null && stack1 == null)
+		{
+			return true;
+		}
+
 		//nbt
-		boolean t1=ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(stack0, stack1);		
-		if (!t1) return false;
-		
-		if (fuzzy) {
-			Integer od = OreDictionary.getOreID(stack0);
-			if (od!=-1) {
-				ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[]{});
-				if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{stack1}, ores))
+		final boolean t1 = ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(stack0, stack1);
+		if(!t1)
+		{
+			return false;
+		}
+
+		if(fuzzy)
+		{
+			final Integer od = OreDictionary.getOreID(stack0);
+			if(od != -1)
+			{
+				final ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[] {});
+				if(ThaumcraftApiHelper.containsMatch(false, new ItemStack[] {stack1}, ores))
+				{
 					return true;
+				}
 			}
 		}
-		
+
 		//damage
-		boolean damage = stack0.getItemDamage() == stack1.getItemDamage() ||
-				stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE;		
-		
-        return stack0.getItem() != stack1.getItem() ? false : (!damage ? false : stack0.stackSize <= stack0.getMaxStackSize() );
-    }
-	   
-    public Object getRecipeOutput() {
-		return getRecipeOutput(this.getRecipeInput());
-    }
-    
-    public AspectList getAspects() {
-		return getAspects(this.getRecipeInput());
-    }
-
-    public int getInstability() {
-		return getInstability(this.getRecipeInput());
-    }
-    
-    public String getResearch() {
+		final boolean damage = stack0.getItemDamage() == stack1.getItemDamage() || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE;
+
+		return stack0.getItem() != stack1.getItem() ? false : (!damage ? false : stack0.stackSize <= stack0.getMaxStackSize());
+	}
+
+	public Object getRecipeOutput()
+	{
+		return getRecipeOutput(getRecipeInput());
+	}
+
+	public AspectList getAspects()
+	{
+		return getAspects(getRecipeInput());
+	}
+
+	public int getInstability()
+	{
+		return getInstability(getRecipeInput());
+	}
+
+	public String getResearch()
+	{
 		return research;
-    }
-    
-	public ItemStack getRecipeInput() {
+	}
+
+	public ItemStack getRecipeInput()
+	{
 		return recipeInput;
 	}
 
-	public ItemStack[] getComponents() {
+	public ItemStack[] getComponents()
+	{
 		return components;
 	}
-	
-	public Object getRecipeOutput(ItemStack input) {
+
+	public Object getRecipeOutput(ItemStack input)
+	{
 		return recipeOutput;
-    }
-    
-    public AspectList getAspects(ItemStack input) {
+	}
+
+	public AspectList getAspects(ItemStack input)
+	{
 		return aspects;
-    }
-    
-    public int getInstability(ItemStack input) {
+	}
+
+	public int getInstability(ItemStack input)
+	{
 		return instability;
-    }
+	}
 }
diff --git a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
index 1490110..a76eed0 100644
--- a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
@@ -15,247 +15,267 @@ import thaumcraft.api.aspects.AspectList;
 
 public class ShapedArcaneRecipe implements IArcaneRecipe
 {
-    //Added in for future ease of change, but hard coded for now.
-    private static final int MAX_CRAFT_GRID_WIDTH = 3;
-    private static final int MAX_CRAFT_GRID_HEIGHT = 3;
-
-    public ItemStack output = null;
-    public  Object[] input = null;
-    public AspectList aspects = null;
-    public String research; 
-    public int width = 0;
-    public int height = 0;
-    private boolean mirrored = true;
-
-    public ShapedArcaneRecipe(String research, Block     result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); }
-    public ShapedArcaneRecipe(String research, Item      result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); }
-    public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
-    {
-        output = result.copy();
-        this.research = research;
-        this.aspects = aspects;
-        String shape = "";
-        
-        int idx = 0;
-
-        if (recipe[idx] instanceof Boolean)
-        {
-            mirrored = (Boolean)recipe[idx];
-            if (recipe[idx+1] instanceof Object[])
-            {
-                recipe = (Object[])recipe[idx+1];
-            }
-            else
-            {
-                idx = 1;
-            }
-        }
-
-        if (recipe[idx] instanceof String[])
-        {
-            String[] parts = ((String[])recipe[idx++]);
-
-            for (String s : parts)
-            {
-                width = s.length();
-                shape += s;
-            }
-
-            height = parts.length;
-        }
-        else
-        {
-            while (recipe[idx] instanceof String)
-            {
-                String s = (String)recipe[idx++];
-                shape += s;
-                width = s.length();
-                height++;
-            }
-        }
-
-        if (width * height != shape.length())
-        {
-            String ret = "Invalid shaped ore recipe: ";
-            for (Object tmp :  recipe)
-            {
-                ret += tmp + ", ";
-            }
-            ret += output;
-            throw new RuntimeException(ret);
-        }
-
-        HashMap<Character, Object> itemMap = new HashMap<Character, Object>();
-
-        for (; idx < recipe.length; idx += 2)
-        {
-            Character chr = (Character)recipe[idx];
-            Object in = recipe[idx + 1];
-
-            if (in instanceof ItemStack)
-            {
-                itemMap.put(chr, ((ItemStack)in).copy());
-            }
-            else if (in instanceof Item)
-            {
-                itemMap.put(chr, new ItemStack((Item)in));
-            }
-            else if (in instanceof Block)
-            {
-                itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE));
-            }
-            else if (in instanceof String)
-            {
-                itemMap.put(chr, OreDictionary.getOres((String)in));
-            }
-            else
-            {
-                String ret = "Invalid shaped ore recipe: ";
-                for (Object tmp :  recipe)
-                {
-                    ret += tmp + ", ";
-                }
-                ret += output;
-                throw new RuntimeException(ret);
-            }
-        }
-
-        input = new Object[width * height];
-        int x = 0;
-        for (char chr : shape.toCharArray())
-        {
-            input[x++] = itemMap.get(chr);
-        }
-    }
-
-    @Override
-    public ItemStack getCraftingResult(IInventory var1){ return output.copy(); }
-
-    @Override
-    public int getRecipeSize(){ return input.length; }
-
-    @Override
-    public ItemStack getRecipeOutput(){ return output; }
-
-    @Override
-    public boolean matches(IInventory inv, World world, EntityPlayer player)
-    {
-    	if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) {
-    		return false;
-    	}
-        for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
-        {
-            for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y)
-            {
-                if (checkMatch(inv, x, y, false))
-                {
-                    return true;
-                }
-
-                if (mirrored && checkMatch(inv, x, y, true))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private boolean checkMatch(IInventory inv, int startX, int startY, boolean mirror)
-    {
-        for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
-        {
-            for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++)
-            {
-                int subX = x - startX;
-                int subY = y - startY;
-                Object target = null;
-
-                if (subX >= 0 && subY >= 0 && subX < width && subY < height)
-                {
-                    if (mirror)
-                    {
-                        target = input[width - subX - 1 + subY * width];
-                    }
-                    else
-                    {
-                        target = input[subX + subY * width];
-                    }
-                }
-
-                ItemStack slot = ThaumcraftApiHelper.getStackInRowAndColumn(inv, x, y);
-
-                if (target instanceof ItemStack)
-                {
-                    if (!checkItemEquals((ItemStack)target, slot))
-                    {
-                        return false;
-                    }
-                }
-                else if (target instanceof ArrayList)
-                {
-                    boolean matched = false;
-
-                    for (ItemStack item : (ArrayList<ItemStack>)target)
-                    {
-                        matched = matched || checkItemEquals(item, slot);
-                    }
-
-                    if (!matched)
-                    {
-                        return false;
-                    }
-                }
-                else if (target == null && slot != null)
-                {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private boolean checkItemEquals(ItemStack target, ItemStack input)
-    {
-        if (input == null && target != null || input != null && target == null)
-        {
-            return false;
-        }
-        return (target.getItem() == input.getItem() && 
-        		(!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) &&
-        		(target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage()));
-    }
-
-    public ShapedArcaneRecipe setMirrored(boolean mirror)
-    {
-        mirrored = mirror;
-        return this;
-    }
-
-    /**
-     * Returns the input for this recipe, any mod accessing this value should never
-     * manipulate the values in this array as it will effect the recipe itself.
-     * @return The recipes input vales.
-     */
-    public Object[] getInput()
-    {
-        return this.input;
-    }
-    
-    @Override		
-	public AspectList getAspects() {
+	//Added in for future ease of change, but hard coded for now.
+	private static final int	MAX_CRAFT_GRID_WIDTH	= 3;
+	private static final int	MAX_CRAFT_GRID_HEIGHT	= 3;
+
+	public ItemStack			output					= null;
+	public Object[]				input					= null;
+	public AspectList			aspects					= null;
+	public String				research;
+	public int					width					= 0;
+	public int					height					= 0;
+	private boolean				mirrored				= true;
+
+	public ShapedArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe)
+	{
+		this(research, new ItemStack(result), aspects, recipe);
+	}
+
+	public ShapedArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe)
+	{
+		this(research, new ItemStack(result), aspects, recipe);
+	}
+
+	public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
+	{
+		output = result.copy();
+		this.research = research;
+		this.aspects = aspects;
+		String shape = "";
+
+		int idx = 0;
+
+		if(recipe[idx] instanceof Boolean)
+		{
+			mirrored = (Boolean) recipe[idx];
+			if(recipe[idx + 1] instanceof Object[])
+			{
+				recipe = (Object[]) recipe[idx + 1];
+			}
+			else
+			{
+				idx = 1;
+			}
+		}
+
+		if(recipe[idx] instanceof String[])
+		{
+			final String[] parts = ((String[]) recipe[idx++]);
+
+			for(final String s : parts)
+			{
+				width = s.length();
+				shape += s;
+			}
+
+			height = parts.length;
+		}
+		else
+		{
+			while(recipe[idx] instanceof String)
+			{
+				final String s = (String) recipe[idx++];
+				shape += s;
+				width = s.length();
+				height++;
+			}
+		}
+
+		if(width * height != shape.length())
+		{
+			String ret = "Invalid shaped ore recipe: ";
+			for(final Object tmp : recipe)
+			{
+				ret += tmp + ", ";
+			}
+			ret += output;
+			throw new RuntimeException(ret);
+		}
+
+		final HashMap<Character, Object> itemMap = new HashMap<Character, Object>();
+
+		for(; idx < recipe.length; idx += 2)
+		{
+			final Character chr = (Character) recipe[idx];
+			final Object in = recipe[idx + 1];
+
+			if(in instanceof ItemStack)
+			{
+				itemMap.put(chr, ((ItemStack) in).copy());
+			}
+			else if(in instanceof Item)
+			{
+				itemMap.put(chr, new ItemStack((Item) in));
+			}
+			else if(in instanceof Block)
+			{
+				itemMap.put(chr, new ItemStack((Block) in, 1,
+						OreDictionary.WILDCARD_VALUE));
+			}
+			else if(in instanceof String)
+			{
+				itemMap.put(chr, OreDictionary.getOres((String) in));
+			}
+			else
+			{
+				String ret = "Invalid shaped ore recipe: ";
+				for(final Object tmp : recipe)
+				{
+					ret += tmp + ", ";
+				}
+				ret += output;
+				throw new RuntimeException(ret);
+			}
+		}
+
+		input = new Object[width * height];
+		int x = 0;
+		for(final char chr : shape.toCharArray())
+		{
+			input[x++] = itemMap.get(chr);
+		}
+	}
+
+	@Override
+	public ItemStack getCraftingResult(IInventory var1)
+	{
+		return output.copy();
+	}
+
+	@Override
+	public int getRecipeSize()
+	{
+		return input.length;
+	}
+
+	@Override
+	public ItemStack getRecipeOutput()
+	{
+		return output;
+	}
+
+	@Override
+	public boolean matches(IInventory inv, World world, EntityPlayer player)
+	{
+		if(research.length() > 0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research))
+		{
+			return false;
+		}
+		for(int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
+		{
+			for(int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y)
+			{
+				if(checkMatch(inv, x, y, false))
+				{
+					return true;
+				}
+
+				if(mirrored && checkMatch(inv, x, y, true))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	private boolean checkMatch(IInventory inv, int startX, int startY, boolean mirror)
+	{
+		for(int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
+		{
+			for(int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++)
+			{
+				final int subX = x - startX;
+				final int subY = y - startY;
+				Object target = null;
+
+				if(subX >= 0 && subY >= 0 && subX < width && subY < height)
+				{
+					if(mirror)
+					{
+						target = input[width - subX - 1 + subY * width];
+					}
+					else
+					{
+						target = input[subX + subY * width];
+					}
+				}
+
+				final ItemStack slot = ThaumcraftApiHelper.getStackInRowAndColumn(inv, x, y);
+
+				if(target instanceof ItemStack)
+				{
+					if(!checkItemEquals((ItemStack) target, slot))
+					{
+						return false;
+					}
+				}
+				else if(target instanceof ArrayList)
+				{
+					boolean matched = false;
+
+					for(final ItemStack item : (ArrayList<ItemStack>) target)
+					{
+						matched = matched || checkItemEquals(item, slot);
+					}
+
+					if(!matched)
+					{
+						return false;
+					}
+				}
+				else if(target == null && slot != null)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private boolean checkItemEquals(ItemStack target, ItemStack input)
+	{
+		if(input == null && target != null || input != null && target == null)
+		{
+			return false;
+		}
+		return(target.getItem() == input.getItem() && (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input, target)) && (target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage()));
+	}
+
+	public ShapedArcaneRecipe setMirrored(boolean mirror)
+	{
+		mirrored = mirror;
+		return this;
+	}
+
+	/**
+	 * Returns the input for this recipe, any mod accessing this value should never
+	 * manipulate the values in this array as it will effect the recipe itself.
+	 * @return The recipes input vales.
+	 */
+	public Object[] getInput()
+	{
+		return input;
+	}
+
+	@Override
+	public AspectList getAspects()
+	{
 		return aspects;
 	}
-    
-    @Override		
-	public AspectList getAspects(IInventory inv) {
+
+	@Override
+	public AspectList getAspects(IInventory inv)
+	{
 		return aspects;
 	}
-	
+
 	@Override
-	public String getResearch() {
+	public String getResearch()
+	{
 		return research;
 	}
 }
diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
index 3b1eaeb..d6890c1 100644
--- a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
+++ b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
@@ -15,147 +15,165 @@ import thaumcraft.api.aspects.AspectList;
 
 public class ShapelessArcaneRecipe implements IArcaneRecipe
 {
-    private ItemStack output = null;
-    private ArrayList input = new ArrayList();
-    
-    public AspectList aspects = null;
-    public String research; 
-
-    public ShapelessArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); }
-    public ShapelessArcaneRecipe(String research, Item  result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); }
-
-    public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
-    {
-        output = result.copy();
-        this.research = research;
-        this.aspects = aspects;
-        for (Object in : recipe)
-        {
-            if (in instanceof ItemStack)
-            {
-                input.add(((ItemStack)in).copy());
-            }
-            else if (in instanceof Item)
-            {
-                input.add(new ItemStack((Item)in));
-            }
-            else if (in instanceof Block)
-            {
-                input.add(new ItemStack((Block)in));
-            }
-            else if (in instanceof String)
-            {
-                input.add(OreDictionary.getOres((String)in));
-            }
-            else
-            {
-                String ret = "Invalid shapeless ore recipe: ";
-                for (Object tmp :  recipe)
-                {
-                    ret += tmp + ", ";
-                }
-                ret += output;
-                throw new RuntimeException(ret);
-            }
-        }
-    }
-
-    @Override
-    public int getRecipeSize(){ return input.size(); }
-
-    @Override
-    public ItemStack getRecipeOutput(){ return output; }
-
-    @Override
-    public ItemStack getCraftingResult(IInventory var1){ return output.copy(); }
-
-    @Override
-    public boolean matches(IInventory var1, World world, EntityPlayer player)
-    {
-    	if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) {
-    		return false;
-    	}
-    	
-        ArrayList required = new ArrayList(input);
-        
-        for (int x = 0; x < 9; x++)
-        {
-            ItemStack slot = var1.getStackInSlot(x);
-
-            if (slot != null)
-            {
-                boolean inRecipe = false;
-                Iterator req = required.iterator();
-
-                while (req.hasNext())
-                {
-                    boolean match = false;
-
-                    Object next = req.next();
-
-                    if (next instanceof ItemStack)
-                    {
-                        match = checkItemEquals((ItemStack)next, slot);
-                    }
-                    else if (next instanceof ArrayList)
-                    {
-                        for (ItemStack item : (ArrayList<ItemStack>)next)
-                        {
-                            match = match || checkItemEquals(item, slot);
-                        }
-                    }
-
-                    if (match)
-                    {
-                        inRecipe = true;
-                        required.remove(next);
-                        break;
-                    }
-                }
-
-                if (!inRecipe)
-                {
-                    return false;
-                }
-            }
-        }
-        
-        return required.isEmpty();
-    }
-
-    private boolean checkItemEquals(ItemStack target, ItemStack input)
-    {
-        if (input == null && target != null || input != null && target == null)
-        {
-            return false;
-        }
-        return (target.getItem() == input.getItem() && 
-        		(!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) &&
-        		(target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage()));
-    }
-
-    /**
-     * Returns the input for this recipe, any mod accessing this value should never
-     * manipulate the values in this array as it will effect the recipe itself.
-     * @return The recipes input vales.
-     */
-    public ArrayList getInput()
-    {
-        return this.input;
-    }
-    
-    @Override		
-	public AspectList getAspects() {
+	private ItemStack	output	= null;
+	private final ArrayList	input	= new ArrayList();
+
+	public AspectList	aspects	= null;
+	public String		research;
+
+	public ShapelessArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe)
+	{
+		this(research, new ItemStack(result), aspects, recipe);
+	}
+
+	public ShapelessArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe)
+	{
+		this(research, new ItemStack(result), aspects, recipe);
+	}
+
+	public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe)
+	{
+		output = result.copy();
+		this.research = research;
+		this.aspects = aspects;
+		for(final Object in : recipe)
+		{
+			if(in instanceof ItemStack)
+			{
+				input.add(((ItemStack) in).copy());
+			}
+			else if(in instanceof Item)
+			{
+				input.add(new ItemStack((Item) in));
+			}
+			else if(in instanceof Block)
+			{
+				input.add(new ItemStack((Block) in));
+			}
+			else if(in instanceof String)
+			{
+				input.add(OreDictionary.getOres((String) in));
+			}
+			else
+			{
+				String ret = "Invalid shapeless ore recipe: ";
+				for(final Object tmp : recipe)
+				{
+					ret += tmp + ", ";
+				}
+				ret += output;
+				throw new RuntimeException(ret);
+			}
+		}
+	}
+
+	@Override
+	public int getRecipeSize()
+	{
+		return input.size();
+	}
+
+	@Override
+	public ItemStack getRecipeOutput()
+	{
+		return output;
+	}
+
+	@Override
+	public ItemStack getCraftingResult(IInventory var1)
+	{
+		return output.copy();
+	}
+
+	@Override
+	public boolean matches(IInventory var1, World world, EntityPlayer player)
+	{
+		if(research.length() > 0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research))
+		{
+			return false;
+		}
+
+		final ArrayList required = new ArrayList(input);
+
+		for(int x = 0; x < 9; x++)
+		{
+			final ItemStack slot = var1.getStackInSlot(x);
+
+			if(slot != null)
+			{
+				boolean inRecipe = false;
+				final Iterator req = required.iterator();
+
+				while(req.hasNext())
+				{
+					boolean match = false;
+
+					final Object next = req.next();
+
+					if(next instanceof ItemStack)
+					{
+						match = checkItemEquals((ItemStack) next, slot);
+					}
+					else if(next instanceof ArrayList)
+					{
+						for(final ItemStack item : (ArrayList<ItemStack>) next)
+						{
+							match = match || checkItemEquals(item, slot);
+						}
+					}
+
+					if(match)
+					{
+						inRecipe = true;
+						required.remove(next);
+						break;
+					}
+				}
+
+				if(!inRecipe)
+				{
+					return false;
+				}
+			}
+		}
+
+		return required.isEmpty();
+	}
+
+	private boolean checkItemEquals(ItemStack target, ItemStack input)
+	{
+		if(input == null && target != null || input != null && target == null)
+		{
+			return false;
+		}
+		return(target.getItem() == input.getItem() && (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input, target)) && (target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage()));
+	}
+
+	/**
+	 * Returns the input for this recipe, any mod accessing this value should never
+	 * manipulate the values in this array as it will effect the recipe itself.
+	 * @return The recipes input vales.
+	 */
+	public ArrayList getInput()
+	{
+		return input;
+	}
+
+	@Override
+	public AspectList getAspects()
+	{
 		return aspects;
 	}
-    
-    @Override		
-	public AspectList getAspects(IInventory inv) {
+
+	@Override
+	public AspectList getAspects(IInventory inv)
+	{
 		return aspects;
 	}
-	
+
 	@Override
-	public String getResearch() {
+	public String getResearch()
+	{
 		return research;
 	}
 }
diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
index 1562d05..52fc3c3 100644
--- a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
+++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
@@ -4,29 +4,23 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EntityDamageSourceIndirect;
 
-public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect {
+public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect
+{
 
-	private boolean fireDamage;
-	private float hungerDamage;
-	private boolean isUnblockable;
-
-
-	public DamageSourceIndirectThaumcraftEntity(String par1Str,
-			Entity par2Entity, Entity par3Entity) {
+	public DamageSourceIndirectThaumcraftEntity(String par1Str, Entity par2Entity, Entity par3Entity)
+	{
 		super(par1Str, par2Entity, par3Entity);
 	}
 
-	
+	@Override
 	public DamageSource setFireDamage()
-    {
-        this.fireDamage = true;
-        return this;
-    }
-	
+	{
+		return this;
+	}
+
+	@Override
 	public DamageSource setDamageBypassesArmor()
-    {
-        this.isUnblockable = true;
-        this.hungerDamage = 0.0F;
-        return this;
-    }
+	{
+		return this;
+	}
 }
diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
index bb55672..a05f5c5 100644
--- a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
+++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
@@ -6,42 +6,29 @@ import net.minecraft.util.EntityDamageSource;
 
 public class DamageSourceThaumcraft extends DamageSource
 {
-    
-	public static DamageSource taint = new DamageSourceThaumcraft("taint").setDamageBypassesArmor().setMagicDamage();
-	public static DamageSource tentacle = new DamageSourceThaumcraft("tentacle");
-	public static DamageSource swarm = new DamageSourceThaumcraft("swarm");
-	public static DamageSource dissolve = new DamageSourceThaumcraft("dissolve").setDamageBypassesArmor();
-	
-    protected DamageSourceThaumcraft(String par1Str) {
+
+	public static DamageSource	taint		= new DamageSourceThaumcraft(
+			"taint").setDamageBypassesArmor().setMagicDamage();
+	public static DamageSource	tentacle	= new DamageSourceThaumcraft(
+			"tentacle");
+	public static DamageSource	swarm		= new DamageSourceThaumcraft(
+			"swarm");
+	public static DamageSource	dissolve	= new DamageSourceThaumcraft(
+			"dissolve").setDamageBypassesArmor();
+
+	protected DamageSourceThaumcraft(String par1Str)
+	{
 		super(par1Str);
 	}
-    
-	/** This kind of damage can be blocked or not. */
-    private boolean isUnblockable = false;
-    private boolean isDamageAllowedInCreativeMode = false;
-    private float hungerDamage = 0.3F;
-
-    /** This kind of damage is based on fire or not. */
-    private boolean fireDamage;
 
-    /** This kind of damage is based on a projectile or not. */
-    private boolean projectile;
+	public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving)
+	{
+		return new EntityDamageSource("swarm", par0EntityLiving);
+	}
 
-    /**
-     * Whether this damage source will have its damage amount scaled based on the current difficulty.
-     */
-    private boolean difficultyScaled;
-    private boolean magicDamage = false;
-    private boolean explosion = false;
-    
-    public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving)
-    {
-        return new EntityDamageSource("swarm", par0EntityLiving);
-    }
+	public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving)
+	{
+		return new EntityDamageSource("tentacle", par0EntityLiving);
+	}
 
-    public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving)
-    {
-        return new EntityDamageSource("tentacle", par0EntityLiving);
-    }
-    
 }
diff --git a/src/api/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java
index 79fc75b..a23d228 100644
--- a/src/api/java/thaumcraft/api/entities/IEldritchMob.java
+++ b/src/api/java/thaumcraft/api/entities/IEldritchMob.java
@@ -1,5 +1,6 @@
 package thaumcraft.api.entities;
 
-public interface IEldritchMob {
+public interface IEldritchMob
+{
 
 }
diff --git a/src/api/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java
index 83fb1fc..1b1b793 100644
--- a/src/api/java/thaumcraft/api/entities/ITaintedMob.java
+++ b/src/api/java/thaumcraft/api/entities/ITaintedMob.java
@@ -1,5 +1,6 @@
 package thaumcraft.api.entities;
 
-public interface ITaintedMob {
+public interface ITaintedMob
+{
 
 }
diff --git a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
index 9af8c30..fcf31de 100644
--- a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
+++ b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
@@ -6,73 +6,83 @@ import net.minecraft.item.ItemStack;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-public class DummyInternalMethodHandler implements IInternalMethodHandler {
+public class DummyInternalMethodHandler implements IInternalMethodHandler
+{
 
 	@Override
-	public void generateVisEffect(int dim, int x, int y, int z, int x2, int y2,	int z2, int color) {
-		
+	public void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color)
+	{
+
 	}
 
 	@Override
-	public boolean isResearchComplete(String username, String researchkey) {
+	public boolean isResearchComplete(String username, String researchkey)
+	{
 		return false;
 	}
-	
+
 	@Override
-	public boolean hasDiscoveredAspect(String username, Aspect aspect) {
+	public boolean hasDiscoveredAspect(String username, Aspect aspect)
+	{
 		return false;
 	}
-	
+
 	@Override
-	public AspectList getDiscoveredAspects(String username) {
+	public AspectList getDiscoveredAspects(String username)
+	{
 		return null;
 	}
 
 	@Override
-	public ItemStack getStackInRowAndColumn(Object instance, int row, int column) {
+	public ItemStack getStackInRowAndColumn(Object instance, int row, int column)
+	{
 		return null;
 	}
 
 	@Override
-	public AspectList getObjectAspects(ItemStack is) {
+	public AspectList getObjectAspects(ItemStack is)
+	{
 		return null;
 	}
 
 	@Override
-	public AspectList getBonusObjectTags(ItemStack is, AspectList ot) {
+	public AspectList getBonusObjectTags(ItemStack is, AspectList ot)
+	{
 		return null;
 	}
 
 	@Override
-	public AspectList generateTags(Item item, int meta) {
+	public AspectList generateTags(Item item, int meta)
+	{
 		return null;
 	}
 
 	@Override
-	public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player,
-			AspectList cost, boolean doit, boolean crafting) {
+	public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting)
+	{
 		return false;
 	}
 
 	@Override
-	public boolean consumeVisFromWandCrafting(ItemStack wand,
-			EntityPlayer player, AspectList cost, boolean doit) {
+	public boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit)
+	{
 		return false;
 	}
 
 	@Override
-	public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) {
+	public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost)
+	{
 		return false;
 	}
 
 	@Override
-	public void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary) {
+	public void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary)
+	{
 	}
 
 	@Override
-	public void addStickyWarpToPlayer(EntityPlayer player, int amount) {
+	public void addStickyWarpToPlayer(EntityPlayer player, int amount)
+	{
 	}
 
-	
-	
 }
diff --git a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java
index 73fce66..749c954 100644
--- a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java
+++ b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java
@@ -6,20 +6,33 @@ import net.minecraft.item.ItemStack;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-public interface IInternalMethodHandler {
+public interface IInternalMethodHandler
+{
 
 	public void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color);
+
 	public boolean isResearchComplete(String username, String researchkey);
+
 	public ItemStack getStackInRowAndColumn(Object instance, int row, int column);
+
 	public AspectList getObjectAspects(ItemStack is);
-	public AspectList getBonusObjectTags(ItemStack is,AspectList ot);
+
+	public AspectList getBonusObjectTags(ItemStack is, AspectList ot);
+
 	public AspectList generateTags(Item item, int meta);
+
 	public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting);
-	public boolean consumeVisFromWandCrafting(ItemStack wand,EntityPlayer player, AspectList cost, boolean doit);
+
+	public boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit);
+
 	public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost);
-	public void addWarpToPlayer(EntityPlayer player, int amount,boolean temporary);
+
+	public void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary);
+
 	public void addStickyWarpToPlayer(EntityPlayer player, int amount);
+
 	public boolean hasDiscoveredAspect(String username, Aspect aspect);
+
 	public AspectList getDiscoveredAspects(String username);
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java
index 4ac6ee7..9ea95dd 100644
--- a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java
+++ b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java
@@ -5,20 +5,20 @@ import java.util.ArrayList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandom;
 
+public class WeightedRandomLoot extends WeightedRandom.Item
+{
 
-public class WeightedRandomLoot extends WeightedRandom.Item {
-	
 	/** The Item/Block ID to generate in the bag. */
-    public ItemStack item;
+	public ItemStack	item;
+
+	public WeightedRandomLoot(ItemStack stack, int weight)
+	{
+		super(weight);
+		item = stack;
+	}
+
+	public static ArrayList<WeightedRandomLoot>	lootBagCommon	= new ArrayList<WeightedRandomLoot>();
+	public static ArrayList<WeightedRandomLoot>	lootBagUncommon	= new ArrayList<WeightedRandomLoot>();
+	public static ArrayList<WeightedRandomLoot>	lootBagRare		= new ArrayList<WeightedRandomLoot>();
 
-    public WeightedRandomLoot(ItemStack stack, int weight)
-    {
-        super(weight);
-        this.item = stack;
-    }
-    
-    public static ArrayList<WeightedRandomLoot> lootBagCommon = new ArrayList<WeightedRandomLoot>();
-    public static ArrayList<WeightedRandomLoot> lootBagUncommon = new ArrayList<WeightedRandomLoot>();
-    public static ArrayList<WeightedRandomLoot> lootBagRare = new ArrayList<WeightedRandomLoot>();
-    
 }
diff --git a/src/api/java/thaumcraft/api/nodes/INode.java b/src/api/java/thaumcraft/api/nodes/INode.java
index 61da1f7..4ef8fee 100644
--- a/src/api/java/thaumcraft/api/nodes/INode.java
+++ b/src/api/java/thaumcraft/api/nodes/INode.java
@@ -4,16 +4,17 @@ import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.aspects.IAspectContainer;
 
-public interface INode extends IAspectContainer {
+public interface INode extends IAspectContainer
+{
 
 	/**
 	 * Unique identifier to distinguish nodes. Normal node id's are based on world id and coordinates
 	 * @return
 	 */
 	public String getId();
-	
+
 	public AspectList getAspectsBase();
-	
+
 	/**
 	 * Return the type of node
 	 * @return
@@ -31,13 +32,13 @@ public interface INode extends IAspectContainer {
 	 * @return
 	 */
 	public void setNodeModifier(NodeModifier nodeModifier);
-	
+
 	/**
 	 * Return the node modifier
 	 * @return
 	 */
 	public NodeModifier getNodeModifier();
-		
+
 	/**
 	 * Return the maximum capacity of each aspect the node can hold
 	 * @return
@@ -49,5 +50,5 @@ public interface INode extends IAspectContainer {
 	 * @return
 	 */
 	public void setNodeVisBase(Aspect aspect, short nodeVisBase);
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java
index 14a19b5..0f241e1 100644
--- a/src/api/java/thaumcraft/api/nodes/IRevealer.java
+++ b/src/api/java/thaumcraft/api/nodes/IRevealer.java
@@ -11,12 +11,12 @@ import net.minecraft.item.ItemStack;
  *
  */
 
-public interface IRevealer {
-	
+public interface IRevealer
+{
+
 	/*
 	 * If this method returns true the nodes will be visible.
 	 */
 	public boolean showNodes(ItemStack itemstack, EntityLivingBase player);
-	
 
 }
diff --git a/src/api/java/thaumcraft/api/nodes/NodeModifier.java b/src/api/java/thaumcraft/api/nodes/NodeModifier.java
index 885b867..2e0e95e 100644
--- a/src/api/java/thaumcraft/api/nodes/NodeModifier.java
+++ b/src/api/java/thaumcraft/api/nodes/NodeModifier.java
@@ -2,5 +2,5 @@ package thaumcraft.api.nodes;
 
 public enum NodeModifier
 {
-    BRIGHT, PALE, FADING
-}
\ No newline at end of file
+	BRIGHT, PALE, FADING
+}
diff --git a/src/api/java/thaumcraft/api/nodes/NodeType.java b/src/api/java/thaumcraft/api/nodes/NodeType.java
index 355324b..4fc26c3 100644
--- a/src/api/java/thaumcraft/api/nodes/NodeType.java
+++ b/src/api/java/thaumcraft/api/nodes/NodeType.java
@@ -2,5 +2,5 @@ package thaumcraft.api.nodes;
 
 public enum NodeType
 {
-    NORMAL, UNSTABLE, DARK, TAINTED, HUNGRY, PURE
-}
\ No newline at end of file
+	NORMAL, UNSTABLE, DARK, TAINTED, HUNGRY, PURE
+}
diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java
index cceaf89..4de2404 100644
--- a/src/api/java/thaumcraft/api/package-info.java
+++ b/src/api/java/thaumcraft/api/package-info.java
@@ -2,3 +2,4 @@
 package thaumcraft.api;
 
 import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java
index b950de0..facc2cc 100644
--- a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java
+++ b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java
@@ -12,56 +12,59 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class PotionFluxTaint extends Potion
 {
-    public static PotionFluxTaint instance = null; // will be instantiated at runtime
-    private int statusIconIndex = -1;
-    
-    public PotionFluxTaint(int par1, boolean par2, int par3)
-    {
-    	super(par1,par2,par3);
-    	setIconIndex(0, 0);
-    }
-    
-    public static void init()
-    {
-    	instance.setPotionName("potion.fluxtaint");
-    	instance.setIconIndex(3, 1);
-    	instance.setEffectiveness(0.25D);
-    }
-    
+	public static PotionFluxTaint	instance		= null; // will be instantiated at runtime
+	public PotionFluxTaint(int par1, boolean par2, int par3)
+	{
+		super(par1, par2, par3);
+		setIconIndex(0, 0);
+	}
+
+	public static void init()
+	{
+		instance.setPotionName("potion.fluxtaint");
+		instance.setIconIndex(3, 1);
+		instance.setEffectiveness(0.25D);
+	}
+
 	@Override
-	public boolean isBadEffect() {
+	public boolean isBadEffect()
+	{
 		return true;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getStatusIconIndex() {
+	public int getStatusIconIndex()
+	{
 		Minecraft.getMinecraft().renderEngine.bindTexture(rl);
 		return super.getStatusIconIndex();
 	}
-	
-	static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png");
-	
+
+	static final ResourceLocation	rl	= new ResourceLocation("thaumcraft",
+			"textures/misc/potions.png");
+
 	@Override
-	public void performEffect(EntityLivingBase target, int par2) {
-		if (target instanceof ITaintedMob) {
+	public void performEffect(EntityLivingBase target, int par2)
+	{
+		if(target instanceof ITaintedMob)
+		{
 			target.heal(1);
-		} else
-		if (!target.isEntityUndead() && !(target instanceof EntityPlayer))
-        {
+		}
+		else if(!target.isEntityUndead() && !(target instanceof EntityPlayer))
+		{
 			target.attackEntityFrom(DamageSourceThaumcraft.taint, 1);
-        } 
-		else
-		if (!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer)))
-        {
+		}
+		else if(!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer)))
+		{
 			target.attackEntityFrom(DamageSourceThaumcraft.taint, 1);
-        } 
+		}
 	}
-    
+
+	@Override
 	public boolean isReady(int par1, int par2)
-    {
-		int k = 40 >> par2;
-        return k > 0 ? par1 % k == 0 : true;
-    }
-    
+	{
+		final int k = 40 >> par2;
+		return k > 0 ? par1 % k == 0 : true;
+	}
+
 }
diff --git a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java
index cd7fc18..baa0f9c 100644
--- a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java
+++ b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java
@@ -9,40 +9,41 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class PotionVisExhaust extends Potion
 {
-    public static PotionVisExhaust instance = null; // will be instantiated at runtime
-    private int statusIconIndex = -1;
-    
-    public PotionVisExhaust(int par1, boolean par2, int par3)
-    {
-    	super(par1,par2,par3);
-    	setIconIndex(0, 0);
-    }
-    
-    public static void init()
-    {
-    	instance.setPotionName("potion.visexhaust");
-    	instance.setIconIndex(5, 1);
-    	instance.setEffectiveness(0.25D);
-    }
-    
+	public static PotionVisExhaust	instance		= null; // will be instantiated at runtime
+	public PotionVisExhaust(int par1, boolean par2, int par3)
+	{
+		super(par1, par2, par3);
+		setIconIndex(0, 0);
+	}
+
+	public static void init()
+	{
+		instance.setPotionName("potion.visexhaust");
+		instance.setIconIndex(5, 1);
+		instance.setEffectiveness(0.25D);
+	}
+
 	@Override
-	public boolean isBadEffect() {
+	public boolean isBadEffect()
+	{
 		return true;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getStatusIconIndex() {
+	public int getStatusIconIndex()
+	{
 		Minecraft.getMinecraft().renderEngine.bindTexture(rl);
 		return super.getStatusIconIndex();
 	}
-	
-	static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png");
-	
+
+	static final ResourceLocation	rl	= new ResourceLocation("thaumcraft",
+			"textures/misc/potions.png");
+
 	@Override
-	public void performEffect(EntityLivingBase target, int par2) {
-		
+	public void performEffect(EntityLivingBase target, int par2)
+	{
+
 	}
-    
-    
+
 }
diff --git a/src/api/java/thaumcraft/api/research/IScanEventHandler.java b/src/api/java/thaumcraft/api/research/IScanEventHandler.java
index d0efac5..219cb5d 100644
--- a/src/api/java/thaumcraft/api/research/IScanEventHandler.java
+++ b/src/api/java/thaumcraft/api/research/IScanEventHandler.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public interface IScanEventHandler {
+public interface IScanEventHandler
+{
 	ScanResult scanPhenomena(ItemStack stack, World world, EntityPlayer player);
 }
diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java
index 82309b3..01c648b 100644
--- a/src/api/java/thaumcraft/api/research/ResearchCategories.java
+++ b/src/api/java/thaumcraft/api/research/ResearchCategories.java
@@ -10,43 +10,52 @@ import org.apache.logging.log4j.Level;
 
 import cpw.mods.fml.common.FMLLog;
 
-public class ResearchCategories {
-	
+public class ResearchCategories
+{
+
 	//Research
-	public static LinkedHashMap <String, ResearchCategoryList> researchCategories = new LinkedHashMap <String,ResearchCategoryList>();
-	
+	public static LinkedHashMap<String, ResearchCategoryList>	researchCategories	= new LinkedHashMap<String, ResearchCategoryList>();
+
 	/**
 	 * @param key
 	 * @return the research item linked to this key
 	 */
-	public static ResearchCategoryList getResearchList(String key) {
+	public static ResearchCategoryList getResearchList(String key)
+	{
 		return researchCategories.get(key);
 	}
-	
+
 	/**
 	 * @param key
 	 * @return the name of the research category linked to this key. 
 	 * Must be stored as localization information in the LanguageRegistry.
 	 */
-	public static String getCategoryName(String key) {
-		return StatCollector.translateToLocal("tc.research_category."+key);
+	public static String getCategoryName(String key)
+	{
+		return StatCollector.translateToLocal("tc.research_category." + key);
 	}
-	
+
 	/**
 	 * @param key the research key
 	 * @return the ResearchItem object. 
 	 */
-	public static ResearchItem getResearch(String key) {
-		Collection rc = researchCategories.values();
-		for (Object cat:rc) {
-			Collection rl = ((ResearchCategoryList)cat).research.values();
-			for (Object ri:rl) {
-				if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri;
+	public static ResearchItem getResearch(String key)
+	{
+		final Collection rc = researchCategories.values();
+		for(final Object cat : rc)
+		{
+			final Collection rl = ((ResearchCategoryList) cat).research.values();
+			for(final Object ri : rl)
+			{
+				if((((ResearchItem) ri).key).equals(key))
+				{
+					return (ResearchItem) ri;
+				}
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * This should only be done at the PostInit stage
 	 * @param key the key used for this category
@@ -54,48 +63,54 @@ public class ResearchCategories {
 	 * @param background the resource location of the background image to use for this category
 	 * @return the name of the research linked to this key
 	 */
-	public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background) {
-		if (getResearchList(key)==null) {
-			ResearchCategoryList rl = new ResearchCategoryList(icon, background);
+	public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background)
+	{
+		if(getResearchList(key) == null)
+		{
+			final ResearchCategoryList rl = new ResearchCategoryList(icon, background);
 			researchCategories.put(key, rl);
 		}
 	}
-	
-	public static void addResearch(ResearchItem ri) {
-		ResearchCategoryList rl = getResearchList(ri.category);
-		if (rl!=null && !rl.research.containsKey(ri.key)) {
-			
-			if (!ri.isVirtual()) {
-				for (ResearchItem rr:rl.research.values()) {
-					if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) {
-						FMLLog.log(Level.FATAL, "[Thaumcraft] Research ["+ri.getName()+"] not added as it overlaps with existing research ["+rr.getName()+"]");
+
+	public static void addResearch(ResearchItem ri)
+	{
+		final ResearchCategoryList rl = getResearchList(ri.category);
+		if(rl != null && !rl.research.containsKey(ri.key))
+		{
+
+			if(!ri.isVirtual())
+			{
+				for(final ResearchItem rr : rl.research.values())
+				{
+					if(rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow)
+					{
+						FMLLog.log(Level.FATAL, "[Thaumcraft] Research [" + ri.getName() + "] not added as it overlaps with existing research [" + rr.getName() + "]");
 						return;
 					}
 				}
 			}
-			
-			
+
 			rl.research.put(ri.key, ri);
-			
-			if (ri.displayColumn < rl.minDisplayColumn) 
-	        {
-	            rl.minDisplayColumn = ri.displayColumn;
-	        }
-
-	        if (ri.displayRow < rl.minDisplayRow)
-	        {
-	            rl.minDisplayRow = ri.displayRow;
-	        }
-
-	        if (ri.displayColumn > rl.maxDisplayColumn)
-	        {
-	            rl.maxDisplayColumn = ri.displayColumn;
-	        }
-
-	        if (ri.displayRow > rl.maxDisplayRow)
-	        {
-	            rl.maxDisplayRow = ri.displayRow;
-	        }
-	        		}
+
+			if(ri.displayColumn < rl.minDisplayColumn)
+			{
+				rl.minDisplayColumn = ri.displayColumn;
+			}
+
+			if(ri.displayRow < rl.minDisplayRow)
+			{
+				rl.minDisplayRow = ri.displayRow;
+			}
+
+			if(ri.displayColumn > rl.maxDisplayColumn)
+			{
+				rl.maxDisplayColumn = ri.displayColumn;
+			}
+
+			if(ri.displayRow > rl.maxDisplayRow)
+			{
+				rl.maxDisplayRow = ri.displayRow;
+			}
+		}
 	}
 }
diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java
index 7eed010..289604d 100644
--- a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java
+++ b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java
@@ -5,33 +5,32 @@ import java.util.Map;
 
 import net.minecraft.util.ResourceLocation;
 
-public class ResearchCategoryList {
-	
+public class ResearchCategoryList
+{
+
 	/** Is the smallest column used on the GUI. */
-    public int minDisplayColumn;
-
-    /** Is the smallest row used on the GUI. */
-    public int minDisplayRow;
-
-    /** Is the biggest column used on the GUI. */
-    public int maxDisplayColumn;
-
-    /** Is the biggest row used on the GUI. */
-    public int maxDisplayRow;
-    
-    /** display variables **/
-    public ResourceLocation icon;
-    public ResourceLocation background;
-	
-	public ResearchCategoryList(ResourceLocation icon, ResourceLocation background) {
+	public int				minDisplayColumn;
+
+	/** Is the smallest row used on the GUI. */
+	public int				minDisplayRow;
+
+	/** Is the biggest column used on the GUI. */
+	public int				maxDisplayColumn;
+
+	/** Is the biggest row used on the GUI. */
+	public int				maxDisplayRow;
+
+	/** display variables **/
+	public ResourceLocation	icon;
+	public ResourceLocation	background;
+
+	public ResearchCategoryList(ResourceLocation icon, ResourceLocation background)
+	{
 		this.icon = icon;
 		this.background = background;
 	}
 
 	//Research
-	public Map<String, ResearchItem> research = new HashMap<String,ResearchItem>();
-		
-		
-	
-	
+	public Map<String, ResearchItem>	research	= new HashMap<String, ResearchItem>();
+
 }
diff --git a/src/api/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java
index 1d5fd8b..b8b9e88 100644
--- a/src/api/java/thaumcraft/api/research/ResearchItem.java
+++ b/src/api/java/thaumcraft/api/research/ResearchItem.java
@@ -6,346 +6,365 @@ import net.minecraft.util.StatCollector;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-public class ResearchItem 
+public class ResearchItem
 {
 	/**
 	 * A short string used as a key for this research. Must be unique
 	 */
-	public final String key;
-	
+	public final String				key;
+
 	/**
 	 * A short string used as a reference to the research category to which this must be added.
 	 */
-	public final String category;
+	public final String				category;
 
 	/**
 	 * The aspect tags and their values required to complete this research
 	 */
-	public final AspectList tags;
-	
-    /**
-     * This links to any research that needs to be completed before this research can be discovered or learnt.
-     */
-    public String[] parents = null;
-    
-    /**
-     * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter.
-     */
-    public String[] parentsHidden = null;
-    /**
-     * any research linked to this that will be unlocked automatically when this research is complete
-     */
-    public String[] siblings = null;
-	
-    /**
-     * the horizontal position of the research icon
-     */
-    public final int displayColumn;
-
-    /**
-     * the vertical position of the research icon
-     */
-    public final int displayRow;
-    
-    /**
-     * the icon to be used for this research 
-     */
-    public final ItemStack icon_item;
-    
-    /**
-     * the icon to be used for this research 
-     */
-    public final ResourceLocation icon_resource;
-    
-    /**
-     * How large the research grid is. Valid values are 1 to 3.
-     */
-    private int complexity;
-
-    /**
-     * Special research has a spiky border. Used for important research milestones.
-     */
-    private boolean isSpecial;
-    
-    /**
-     * Research that can be directly purchased with RP in normal research difficulty.
-     */
-    private boolean isSecondary;
-    
+	public final AspectList			tags;
+
+	/**
+	 * This links to any research that needs to be completed before this research can be discovered or learnt.
+	 */
+	public String[]					parents			= null;
+
+	/**
+	 * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter.
+	 */
+	public String[]					parentsHidden	= null;
+	/**
+	 * any research linked to this that will be unlocked automatically when this research is complete
+	 */
+	public String[]					siblings		= null;
+
 	/**
-     * This indicates if the research should use a circular icon border. Usually used for "passive" research 
-     * that doesn't have recipes and grants passive effects, or that unlock automatically.
-     */
-    private boolean isRound;
-    
-    /**
-     * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system.
-     */
-    private boolean isStub;
-    
-    /**
-     * This indicated that the research is completely hidden and cannot be discovered by any 
-     * player-controlled means. The recipes will never show up in the thaumonomicon.
-     * Usually used to unlock "hidden" recipes via sibling unlocking, like 
-     * the various cap and rod combos for wands.
-     */
-    private boolean isVirtual;    
-    
-    
-    
-    /**
-     * Concealed research does not display in the thaumonomicon until parent researches are discovered.
-     */
-    private boolean isConcealed;
-    
-    /**
-     * Hidden research can only be discovered via scanning or knowledge fragments 
-     */
-    private boolean isHidden;
-    
-    /**
-     * This is the same as isHidden, except it cannot be discovered with knowledge fragments, only scanning.  
-     */
-    private boolean isLost;
-    
-    /**
-     * These research items will automatically unlock for all players on game start
-     */
-    private boolean isAutoUnlock;
-    
-    /**
-     * Scanning these items will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private ItemStack[] itemTriggers;
-    
-    /**
-     * Scanning these entities will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private String[] entityTriggers;
-    
-    /**
-     * Scanning things with these aspects will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private Aspect[] aspectTriggers;
-
-	private ResearchPage[] pages = null;
-	
+	 * the horizontal position of the research icon
+	 */
+	public final int				displayColumn;
+
+	/**
+	 * the vertical position of the research icon
+	 */
+	public final int				displayRow;
+
+	/**
+	 * the icon to be used for this research 
+	 */
+	public final ItemStack			icon_item;
+
+	/**
+	 * the icon to be used for this research 
+	 */
+	public final ResourceLocation	icon_resource;
+
+	/**
+	 * How large the research grid is. Valid values are 1 to 3.
+	 */
+	private int						complexity;
+
+	/**
+	 * Special research has a spiky border. Used for important research milestones.
+	 */
+	private boolean					isSpecial;
+
+	/**
+	 * Research that can be directly purchased with RP in normal research difficulty.
+	 */
+	private boolean					isSecondary;
+
+	/**
+	 * This indicates if the research should use a circular icon border. Usually used for "passive" research 
+	 * that doesn't have recipes and grants passive effects, or that unlock automatically.
+	 */
+	private boolean					isRound;
+
+	/**
+	 * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system.
+	 */
+	private boolean					isStub;
+
+	/**
+	 * This indicated that the research is completely hidden and cannot be discovered by any 
+	 * player-controlled means. The recipes will never show up in the thaumonomicon.
+	 * Usually used to unlock "hidden" recipes via sibling unlocking, like 
+	 * the various cap and rod combos for wands.
+	 */
+	private boolean					isVirtual;
+
+	/**
+	 * Concealed research does not display in the thaumonomicon until parent researches are discovered.
+	 */
+	private boolean					isConcealed;
+
+	/**
+	 * Hidden research can only be discovered via scanning or knowledge fragments 
+	 */
+	private boolean					isHidden;
+
+	/**
+	 * This is the same as isHidden, except it cannot be discovered with knowledge fragments, only scanning.  
+	 */
+	private boolean					isLost;
+
+	/**
+	 * These research items will automatically unlock for all players on game start
+	 */
+	private boolean					isAutoUnlock;
+
+	/**
+	 * Scanning these items will have a chance of revealing hidden knowledge in the thaumonomicon
+	 */
+	private ItemStack[]				itemTriggers;
+
+	/**
+	 * Scanning these entities will have a chance of revealing hidden knowledge in the thaumonomicon
+	 */
+	private String[]				entityTriggers;
+
+	/**
+	 * Scanning things with these aspects will have a chance of revealing hidden knowledge in the thaumonomicon
+	 */
+	private Aspect[]				aspectTriggers;
+
+	private ResearchPage[]			pages			= null;
+
 	public ResearchItem(String key, String category)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = new AspectList();    	
-        this.icon_resource = null;
-        this.icon_item = null;
-        this.displayColumn = 0;
-        this.displayRow = 0;
-        this.setVirtual();
-        
-    }
-    
-    public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = tags;    	
-        this.icon_resource = icon;
-        this.icon_item = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (complexity < 1) this.complexity = 1;
-        if (complexity > 3) this.complexity = 3;
-    }
-    
-    public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = tags;    	
-        this.icon_item = icon;
-        this.icon_resource = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (complexity < 1) this.complexity = 1;
-        if (complexity > 3) this.complexity = 3;
-    }
-
-    public ResearchItem setSpecial()
-    {
-        this.isSpecial = true;
-        return this;
-    }
-    
-    public ResearchItem setStub()
-    {
-        this.isStub = true;
-        return this;
-    }
-    
-    public ResearchItem setLost()
-    {
-        this.isLost = true;
-        return this;
-    }
-    
-    public ResearchItem setConcealed()
-    {
-        this.isConcealed = true;
-        return this;
-    }
-    
-    public ResearchItem setHidden()
-    {
-        this.isHidden = true;
-        return this;
-    }
-    
-    public ResearchItem setVirtual()
-    {
-        this.isVirtual = true;
-        return this;
-    }
-    
-    public ResearchItem setParents(String... par)
-    {
-        this.parents = par;
-        return this;
-    }
-    
-    
+	{
+		this.key = key;
+		this.category = category;
+		tags = new AspectList();
+		icon_resource = null;
+		icon_item = null;
+		displayColumn = 0;
+		displayRow = 0;
+		setVirtual();
+
+	}
+
+	public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon)
+	{
+		this.key = key;
+		this.category = category;
+		this.tags = tags;
+		icon_resource = icon;
+		icon_item = null;
+		displayColumn = col;
+		displayRow = row;
+		complexity = complex;
+		if(complexity < 1)
+		{
+			complexity = 1;
+		}
+		if(complexity > 3)
+		{
+			complexity = 3;
+		}
+	}
+
+	public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon)
+	{
+		this.key = key;
+		this.category = category;
+		this.tags = tags;
+		icon_item = icon;
+		icon_resource = null;
+		displayColumn = col;
+		displayRow = row;
+		complexity = complex;
+		if(complexity < 1)
+		{
+			complexity = 1;
+		}
+		if(complexity > 3)
+		{
+			complexity = 3;
+		}
+	}
+
+	public ResearchItem setSpecial()
+	{
+		isSpecial = true;
+		return this;
+	}
+
+	public ResearchItem setStub()
+	{
+		isStub = true;
+		return this;
+	}
+
+	public ResearchItem setLost()
+	{
+		isLost = true;
+		return this;
+	}
+
+	public ResearchItem setConcealed()
+	{
+		isConcealed = true;
+		return this;
+	}
+
+	public ResearchItem setHidden()
+	{
+		isHidden = true;
+		return this;
+	}
+
+	public ResearchItem setVirtual()
+	{
+		isVirtual = true;
+		return this;
+	}
+
+	public ResearchItem setParents(String... par)
+	{
+		parents = par;
+		return this;
+	}
 
 	public ResearchItem setParentsHidden(String... par)
-    {
-        this.parentsHidden = par;
-        return this;
-    }
-    
-    public ResearchItem setSiblings(String... sib)
-    {
-        this.siblings = sib;
-        return this;
-    }
-    
-    public ResearchItem setPages(ResearchPage... par)
-    {
-        this.pages = par;
-        return this;
-    }
-    
-    public ResearchPage[] getPages() {
+	{
+		parentsHidden = par;
+		return this;
+	}
+
+	public ResearchItem setSiblings(String... sib)
+	{
+		siblings = sib;
+		return this;
+	}
+
+	public ResearchItem setPages(ResearchPage... par)
+	{
+		pages = par;
+		return this;
+	}
+
+	public ResearchPage[] getPages()
+	{
 		return pages;
 	}
-    
-    public ResearchItem setItemTriggers(ItemStack... par)
-    {
-        this.itemTriggers = par;
-        return this;
-    }
-    
-    public ResearchItem setEntityTriggers(String... par)
-    {
-        this.entityTriggers = par;
-        return this;
-    }
-    
-    public ResearchItem setAspectTriggers(Aspect... par)
-    {
-        this.aspectTriggers = par;
-        return this;
-    }
-
-    public ItemStack[] getItemTriggers() {
+
+	public ResearchItem setItemTriggers(ItemStack... par)
+	{
+		itemTriggers = par;
+		return this;
+	}
+
+	public ResearchItem setEntityTriggers(String... par)
+	{
+		entityTriggers = par;
+		return this;
+	}
+
+	public ResearchItem setAspectTriggers(Aspect... par)
+	{
+		aspectTriggers = par;
+		return this;
+	}
+
+	public ItemStack[] getItemTriggers()
+	{
 		return itemTriggers;
 	}
 
-	public String[] getEntityTriggers() {
+	public String[] getEntityTriggers()
+	{
 		return entityTriggers;
 	}
-	
-	public Aspect[] getAspectTriggers() {
+
+	public Aspect[] getAspectTriggers()
+	{
 		return aspectTriggers;
 	}
 
 	public ResearchItem registerResearchItem()
-    {
-        ResearchCategories.addResearch(this);
-        return this;
-    }
-
-    public String getName()
-    {
-    	return StatCollector.translateToLocal("tc.research_name."+key);
-    }
-    
-    public String getText()
-    {
-    	return StatCollector.translateToLocal("tc.research_text."+key);
-    }
-
-    public boolean isSpecial()
-    {
-        return this.isSpecial;
-    }
-    
-    public boolean isStub()
-    {
-        return this.isStub;
-    }
-        
-    public boolean isLost()
-    {
-        return this.isLost;
-    }
-    
-    public boolean isConcealed()
-    {
-        return this.isConcealed;
-    }
-    
-    public boolean isHidden()
-    {
-        return this.isHidden;
-    }
-    
-    public boolean isVirtual()
-    {
-        return this.isVirtual;
-    }
-    
-    public boolean isAutoUnlock() {
+	{
+		ResearchCategories.addResearch(this);
+		return this;
+	}
+
+	public String getName()
+	{
+		return StatCollector.translateToLocal("tc.research_name." + key);
+	}
+
+	public String getText()
+	{
+		return StatCollector.translateToLocal("tc.research_text." + key);
+	}
+
+	public boolean isSpecial()
+	{
+		return isSpecial;
+	}
+
+	public boolean isStub()
+	{
+		return isStub;
+	}
+
+	public boolean isLost()
+	{
+		return isLost;
+	}
+
+	public boolean isConcealed()
+	{
+		return isConcealed;
+	}
+
+	public boolean isHidden()
+	{
+		return isHidden;
+	}
+
+	public boolean isVirtual()
+	{
+		return isVirtual;
+	}
+
+	public boolean isAutoUnlock()
+	{
 		return isAutoUnlock;
 	}
-	
+
 	public ResearchItem setAutoUnlock()
-    {
-        this.isAutoUnlock = true;
-        return this;
-    }
-	
-	public boolean isRound() {
+	{
+		isAutoUnlock = true;
+		return this;
+	}
+
+	public boolean isRound()
+	{
 		return isRound;
 	}
 
-	public ResearchItem setRound() {
-		this.isRound = true;
+	public ResearchItem setRound()
+	{
+		isRound = true;
 		return this;
 	}
-	
-	public boolean isSecondary() {
+
+	public boolean isSecondary()
+	{
 		return isSecondary;
 	}
 
-	public ResearchItem setSecondary() {
-		this.isSecondary = true;
+	public ResearchItem setSecondary()
+	{
+		isSecondary = true;
 		return this;
 	}
 
-	public int getComplexity() {
+	public int getComplexity()
+	{
 		return complexity;
 	}
 
-	public ResearchItem setComplexity(int complexity) {
+	public ResearchItem setComplexity(int complexity)
+	{
 		this.complexity = complexity;
 		return this;
 	}
@@ -353,17 +372,23 @@ public class ResearchItem
 	/**
 	 * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things
 	 */
-	public Aspect getResearchPrimaryTag() {
-		Aspect aspect=null;
-		int highest=0;
-		if (tags!=null)
-		for (Aspect tag:tags.getAspects()) {
-			if (tags.getAmount(tag)>highest) {
-				aspect=tag;
-				highest=tags.getAmount(tag);
-			};
+	public Aspect getResearchPrimaryTag()
+	{
+		Aspect aspect = null;
+		int highest = 0;
+		if(tags != null)
+		{
+			for(final Aspect tag : tags.getAspects())
+			{
+				if(tags.getAmount(tag) > highest)
+				{
+					aspect = tag;
+					highest = tags.getAmount(tag);
+				}
+				;
+			}
 		}
 		return aspect;
 	}
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java
index fdada84..415350a 100644
--- a/src/api/java/thaumcraft/api/research/ResearchPage.java
+++ b/src/api/java/thaumcraft/api/research/ResearchPage.java
@@ -13,181 +13,194 @@ import thaumcraft.api.crafting.IArcaneRecipe;
 import thaumcraft.api.crafting.InfusionEnchantmentRecipe;
 import thaumcraft.api.crafting.InfusionRecipe;
 
-public class ResearchPage {
+public class ResearchPage
+{
 	public static enum PageType
-    {
-        TEXT,
-        TEXT_CONCEALED,
-        IMAGE,
-        CRUCIBLE_CRAFTING,
-        ARCANE_CRAFTING,
-        ASPECTS,
-        NORMAL_CRAFTING,
-        INFUSION_CRAFTING,
-        COMPOUND_CRAFTING,
-        INFUSION_ENCHANTMENT,
-        SMELTING
-    }
-	
-	public PageType type = PageType.TEXT;
-	
-	public String text=null;
-	public String research=null;
-	public ResourceLocation image=null;
-	public AspectList aspects=null;
-	public Object recipe=null;
-	public ItemStack recipeOutput=null;
-	
+	{
+		TEXT, TEXT_CONCEALED, IMAGE, CRUCIBLE_CRAFTING, ARCANE_CRAFTING, ASPECTS, NORMAL_CRAFTING, INFUSION_CRAFTING, COMPOUND_CRAFTING, INFUSION_ENCHANTMENT, SMELTING
+	}
+
+	public PageType			type			= PageType.TEXT;
+
+	public String			text			= null;
+	public String			research		= null;
+	public ResourceLocation	image			= null;
+	public AspectList		aspects			= null;
+	public Object			recipe			= null;
+	public ItemStack		recipeOutput	= null;
+
 	/**
 	 * @param text this can (but does not have to) be a reference to a localization variable, not the actual text.
 	 */
-	public ResearchPage(String text) {
-		this.type = PageType.TEXT;
+	public ResearchPage(String text)
+	{
+		type = PageType.TEXT;
 		this.text = text;
 	}
-	
+
 	/**
 	 * @param research this page will only be displayed if the player has discovered this research
 	 * @param text this can (but does not have to) be a reference to a localization variable, not the actual text.
 	 */
-	public ResearchPage(String research, String text) {
-		this.type = PageType.TEXT_CONCEALED;
+	public ResearchPage(String research, String text)
+	{
+		type = PageType.TEXT_CONCEALED;
 		this.research = research;
 		this.text = text;
 	}
-	
+
 	/**
 	 * @param recipe a vanilla crafting recipe.
 	 */
-	public ResearchPage(IRecipe recipe) {
-		this.type = PageType.NORMAL_CRAFTING;
+	public ResearchPage(IRecipe recipe)
+	{
+		type = PageType.NORMAL_CRAFTING;
 		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
+		recipeOutput = recipe.getRecipeOutput();
 	}
-	
+
 	/**
 	 * @param recipe a collection of vanilla crafting recipes.
 	 */
-	public ResearchPage(IRecipe[] recipe) {
-		this.type = PageType.NORMAL_CRAFTING;
+	public ResearchPage(IRecipe[] recipe)
+	{
+		type = PageType.NORMAL_CRAFTING;
 		this.recipe = recipe;
 	}
-	
+
 	/**
 	 * @param recipe a collection of arcane crafting recipes.
 	 */
-	public ResearchPage(IArcaneRecipe[] recipe) {
-		this.type = PageType.ARCANE_CRAFTING;
+	public ResearchPage(IArcaneRecipe[] recipe)
+	{
+		type = PageType.ARCANE_CRAFTING;
 		this.recipe = recipe;
 	}
-	
+
 	/**
 	 * @param recipe a collection of arcane crafting recipes.
 	 */
-	public ResearchPage(CrucibleRecipe[] recipe) {
-		this.type = PageType.CRUCIBLE_CRAFTING;
+	public ResearchPage(CrucibleRecipe[] recipe)
+	{
+		type = PageType.CRUCIBLE_CRAFTING;
 		this.recipe = recipe;
 	}
-	
+
 	/**
 	 * @param recipe a collection of infusion crafting recipes.
 	 */
-	public ResearchPage(InfusionRecipe[] recipe) {
-		this.type = PageType.INFUSION_CRAFTING;
+	public ResearchPage(InfusionRecipe[] recipe)
+	{
+		type = PageType.INFUSION_CRAFTING;
 		this.recipe = recipe;
 	}
-	
+
 	/**
 	 * @param recipe a compound crafting recipe.
 	 */
-	public ResearchPage(List recipe) {
-		this.type = PageType.COMPOUND_CRAFTING;
+	public ResearchPage(List recipe)
+	{
+		type = PageType.COMPOUND_CRAFTING;
 		this.recipe = recipe;
 	}
-	
+
 	/**
 	 * @param recipe an arcane worktable crafting recipe.
 	 */
-	public ResearchPage(IArcaneRecipe recipe) {
-		this.type = PageType.ARCANE_CRAFTING;
+	public ResearchPage(IArcaneRecipe recipe)
+	{
+		type = PageType.ARCANE_CRAFTING;
 		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
+		recipeOutput = recipe.getRecipeOutput();
 	}
-	
+
 	/**
 	 * @param recipe an alchemy crafting recipe.
 	 */
-	public ResearchPage(CrucibleRecipe recipe) {
-		this.type = PageType.CRUCIBLE_CRAFTING;
+	public ResearchPage(CrucibleRecipe recipe)
+	{
+		type = PageType.CRUCIBLE_CRAFTING;
 		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
+		recipeOutput = recipe.getRecipeOutput();
 	}
-	
+
 	/**
 	 * @param recipe a furnace smelting crafting recipe.
 	 */
-	public ResearchPage(ItemStack input) {
-		this.type = PageType.SMELTING;
-		this.recipe = input;
-		this.recipeOutput = FurnaceRecipes.smelting().getSmeltingResult(input);
+	public ResearchPage(ItemStack input)
+	{
+		type = PageType.SMELTING;
+		recipe = input;
+		recipeOutput = FurnaceRecipes.smelting().getSmeltingResult(input);
 	}
-	
+
 	/**
 	 * @param recipe an infusion crafting recipe.
 	 */
-	public ResearchPage(InfusionRecipe recipe) {
-		this.type = PageType.INFUSION_CRAFTING;
+	public ResearchPage(InfusionRecipe recipe)
+	{
+		type = PageType.INFUSION_CRAFTING;
 		this.recipe = recipe;
-		if (recipe.getRecipeOutput() instanceof ItemStack) {
-			this.recipeOutput = (ItemStack) recipe.getRecipeOutput();
-		} else {
-			this.recipeOutput = recipe.getRecipeInput();
+		if(recipe.getRecipeOutput() instanceof ItemStack)
+		{
+			recipeOutput = (ItemStack) recipe.getRecipeOutput();
+		}
+		else
+		{
+			recipeOutput = recipe.getRecipeInput();
 		}
 	}
-	
+
 	/**
 	 * @param recipe an infusion crafting recipe.
 	 */
-	public ResearchPage(InfusionEnchantmentRecipe recipe) {
-		this.type = PageType.INFUSION_ENCHANTMENT;
+	public ResearchPage(InfusionEnchantmentRecipe recipe)
+	{
+		type = PageType.INFUSION_ENCHANTMENT;
 		this.recipe = recipe;
-//		if (recipe.recipeOutput instanceof ItemStack) {
-//			this.recipeOutput = (ItemStack) recipe.recipeOutput;
-//		} else {
-//			this.recipeOutput = recipe.recipeInput;
-//		}
+		//		if (recipe.recipeOutput instanceof ItemStack) {
+		//			this.recipeOutput = (ItemStack) recipe.recipeOutput;
+		//		} else {
+		//			this.recipeOutput = recipe.recipeInput;
+		//		}
 	}
-	
+
 	/**
 	 * @param image
 	 * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text.
 	 */
-	public ResearchPage(ResourceLocation image, String caption) {
-		this.type = PageType.IMAGE;
+	public ResearchPage(ResourceLocation image, String caption)
+	{
+		type = PageType.IMAGE;
 		this.image = image;
-		this.text = caption;
+		text = caption;
 	}
-	
+
 	/**
 	 * This function should really not be called directly - used internally
 	 */
-	public ResearchPage(AspectList as) {
-		this.type = PageType.ASPECTS;
-		this.aspects = as;
+	public ResearchPage(AspectList as)
+	{
+		type = PageType.ASPECTS;
+		aspects = as;
 	}
-	
+
 	/**
 	 * returns a localized text of the text field (if one exists). Returns the text field itself otherwise.
 	 * @return
 	 */
-	public String getTranslatedText() {
-		String ret="";
-		if (text != null) {
+	public String getTranslatedText()
+	{
+		String ret = "";
+		if(text != null)
+		{
 			ret = StatCollector.translateToLocal(text);
-			if (ret.isEmpty()) ret = text;
+			if(ret.isEmpty())
+			{
+				ret = text;
+			}
 		}
 		return ret;
 	}
-	
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/research/ScanResult.java b/src/api/java/thaumcraft/api/research/ScanResult.java
index e1498f3..8c04c69 100644
--- a/src/api/java/thaumcraft/api/research/ScanResult.java
+++ b/src/api/java/thaumcraft/api/research/ScanResult.java
@@ -2,36 +2,46 @@ package thaumcraft.api.research;
 
 import net.minecraft.entity.Entity;
 
-public class ScanResult {
-	public byte type = 0;   //1=blocks,2=entities,3=phenomena
-	public int id;
-	public int meta;
-	public Entity entity;
-	public String phenomena;
+public class ScanResult
+{
+	public byte		type	= 0;	//1=blocks,2=entities,3=phenomena
+	public int		id;
+	public int		meta;
+	public Entity	entity;
+	public String	phenomena;
 
-	public ScanResult(byte type, int blockId, int blockMeta, Entity entity,
-			String phenomena) {
+	public ScanResult(byte type, int blockId, int blockMeta, Entity entity, String phenomena)
+	{
 		super();
 		this.type = type;
-		this.id = blockId;
-		this.meta = blockMeta;		
+		id = blockId;
+		meta = blockMeta;
 		this.entity = entity;
 		this.phenomena = phenomena;
 	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof ScanResult) {
-			ScanResult sr = (ScanResult) obj;
-			if (type != sr.type)
+	public boolean equals(Object obj)
+	{
+		if(obj instanceof ScanResult)
+		{
+			final ScanResult sr = (ScanResult) obj;
+			if(type != sr.type)
+			{
 				return false;
-			if (type == 1
-					&& (id != sr.id || meta != sr.meta))
+			}
+			if(type == 1 && (id != sr.id || meta != sr.meta))
+			{
 				return false;
-			if (type == 2 && entity.getEntityId() != sr.entity.getEntityId())
+			}
+			if(type == 2 && entity.getEntityId() != sr.entity.getEntityId())
+			{
 				return false;
-			if (type == 3 && !phenomena.equals(sr.phenomena))
+			}
+			if(type == 3 && !phenomena.equals(sr.phenomena))
+			{
 				return false;
+			}
 		}
 		return true;
 	}
diff --git a/src/api/java/thaumcraft/api/visnet/TileVisNode.java b/src/api/java/thaumcraft/api/visnet/TileVisNode.java
index 204879e..56dbafe 100644
--- a/src/api/java/thaumcraft/api/visnet/TileVisNode.java
+++ b/src/api/java/thaumcraft/api/visnet/TileVisNode.java
@@ -15,174 +15,203 @@ import thaumcraft.api.aspects.Aspect;
  * a transport relay or vis receiver (like the infernal furnace).
  *
  */
-public abstract class TileVisNode extends TileThaumcraft {
-	
-	WeakReference<TileVisNode> parent = null;
-	ArrayList<WeakReference<TileVisNode>> children = new ArrayList<WeakReference<TileVisNode>>();
-	
+public abstract class TileVisNode extends TileThaumcraft
+{
+
+	WeakReference<TileVisNode>				parent		= null;
+	ArrayList<WeakReference<TileVisNode>>	children	= new ArrayList<WeakReference<TileVisNode>>();
+
 	/**
 	 * @return the WorldCoordinates location of where this node is located
 	 */
-	public WorldCoordinates getLocation() {
+	public WorldCoordinates getLocation()
+	{
 		return new WorldCoordinates(this);
 	}
-	
+
 	/**
 	 * @return the number of blocks away this node will check for parent nodes to connect to. 
 	 */
 	public abstract int getRange();
-	
+
 	/**
 	 * @return true if this is the source or root node of the vis network. 
 	 */
 	public abstract boolean isSource();
-		
+
 	/**
 	 * This method should never be called directly. Use VisNetHandler.drainVis() instead
 	 * @param aspect what aspect to drain
 	 * @param vis how much to drain
 	 * @return how much was actually drained
 	 */
-	public int consumeVis(Aspect aspect, int vis) {
-		if (VisNetHandler.isNodeValid(getParent())) {
-			int out = getParent().get().consumeVis(aspect, vis);
-			if (out>0) {
+	public int consumeVis(Aspect aspect, int vis)
+	{
+		if(VisNetHandler.isNodeValid(getParent()))
+		{
+			final int out = getParent().get().consumeVis(aspect, vis);
+			if(out > 0)
+			{
 				triggerConsumeEffect(aspect);
 			}
 			return out;
 		}
 		return 0;
 	}
-	
-	public void removeThisNode() {
-		for (WeakReference<TileVisNode> n:getChildren()) {
-			if (n!=null && n.get()!=null) {
+
+	public void removeThisNode()
+	{
+		for(final WeakReference<TileVisNode> n : getChildren())
+		{
+			if(n != null && n.get() != null)
+			{
 				n.get().removeThisNode();
 			}
-		}	
-		
+		}
+
 		children = new ArrayList<WeakReference<TileVisNode>>();
-		if (VisNetHandler.isNodeValid(this.getParent())) {
-			this.getParent().get().nodeRefresh=true;
+		if(VisNetHandler.isNodeValid(getParent()))
+		{
+			getParent().get().nodeRefresh = true;
 		}
-		this.setParent(null);
-		this.parentChanged();
-		
-		if (this.isSource()) {
+		setParent(null);
+		parentChanged();
+
+		if(isSource())
+		{
 			HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = VisNetHandler.sources.get(worldObj.provider.dimensionId);
-			if (sourcelist==null) {
+			if(sourcelist == null)
+			{
 				sourcelist = new HashMap<WorldCoordinates, WeakReference<TileVisNode>>();
 			}
 			sourcelist.remove(getLocation());
-			VisNetHandler.sources.put( worldObj.provider.dimensionId, sourcelist );
+			VisNetHandler.sources.put(worldObj.provider.dimensionId, sourcelist);
 		}
-		
+
 		worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
 	}
-	
-	
 
 	@Override
-	public void invalidate() {
+	public void invalidate()
+	{
 		removeThisNode();
 		super.invalidate();
 	}
 
-	public void triggerConsumeEffect(Aspect aspect) {	}
+	public void triggerConsumeEffect(Aspect aspect)
+	{
+	}
 
 	/**
 	 * @return
 	 */
-	public WeakReference<TileVisNode> getParent() {
+	public WeakReference<TileVisNode> getParent()
+	{
 		return parent;
 	}
-	
+
 	/**
 	 * @return
 	 */
-	public WeakReference<TileVisNode> getRootSource() {
-		return VisNetHandler.isNodeValid(getParent()) ? 
-				getParent().get().getRootSource() : this.isSource() ?
-						new WeakReference(this) : null;
+	public WeakReference<TileVisNode> getRootSource()
+	{
+		return VisNetHandler.isNodeValid(getParent()) ? getParent().get().getRootSource() : isSource() ? new WeakReference(
+				this) : null;
 	}
-	
+
 	/**
 	 * @param parent
 	 */
-	public void setParent(WeakReference<TileVisNode> parent) {
+	public void setParent(WeakReference<TileVisNode> parent)
+	{
 		this.parent = parent;
 	}
-	
+
 	/**
 	 * @return
 	 */
-	public ArrayList<WeakReference<TileVisNode>> getChildren() {
+	public ArrayList<WeakReference<TileVisNode>> getChildren()
+	{
 		return children;
 	}
-	
+
 	@Override
-	public boolean canUpdate() {
+	public boolean canUpdate()
+	{
 		return true;
 	}
-	
-	protected int nodeCounter = 0;
-	private boolean nodeRegged = false;
-	public boolean nodeRefresh = false;
+
+	protected int	nodeCounter	= 0;
+	private boolean	nodeRegged	= false;
+	public boolean	nodeRefresh	= false;
 
 	@Override
-	public void updateEntity() {
-				
-		if (!worldObj.isRemote && ((nodeCounter++) % 40==0 || nodeRefresh)) {
+	public void updateEntity()
+	{
+
+		if(!worldObj.isRemote && ((nodeCounter++) % 40 == 0 || nodeRefresh))
+		{
 			//check for changes
-			if (!nodeRefresh && children.size()>0) {
-				for (WeakReference<TileVisNode> n:children) {
-					if (n==null || n.get()==null || !VisNetHandler.canNodeBeSeen(this, n.get())) {
-						nodeRefresh=true;
+			if(!nodeRefresh && children.size() > 0)
+			{
+				for(final WeakReference<TileVisNode> n : children)
+				{
+					if(n == null || n.get() == null || !VisNetHandler.canNodeBeSeen(this, n.get()))
+					{
+						nodeRefresh = true;
 						break;
 					}
-				}			
+				}
 			}
-			
+
 			//refresh linked nodes
-			if (nodeRefresh) {
-				for (WeakReference<TileVisNode> n:children) {
-					if (n.get()!=null) {
-						n.get().nodeRefresh=true;
+			if(nodeRefresh)
+			{
+				for(final WeakReference<TileVisNode> n : children)
+				{
+					if(n.get() != null)
+					{
+						n.get().nodeRefresh = true;
 					}
 				}
 				children.clear();
-				parent=null;
+				parent = null;
 			}
-			
+
 			//redo stuff
-			if (isSource() && !nodeRegged) {
+			if(isSource() && !nodeRegged)
+			{
 				VisNetHandler.addSource(getWorldObj(), this);
 				nodeRegged = true;
-			} else 
-			if (!isSource() && !VisNetHandler.isNodeValid(getParent())) {
-				setParent(VisNetHandler.addNode(getWorldObj(), this));				
-				nodeRefresh=true;
 			}
-			
-			if (nodeRefresh) {
+			else if(!isSource() && !VisNetHandler.isNodeValid(getParent()))
+			{
+				setParent(VisNetHandler.addNode(getWorldObj(), this));
+				nodeRefresh = true;
+			}
+
+			if(nodeRefresh)
+			{
 				worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
 				parentChanged();
 			}
-			nodeRefresh=false;
+			nodeRefresh = false;
 		}
-		
+
+	}
+
+	public void parentChanged()
+	{
 	}
-	
-	public void parentChanged() { }
-	
+
 	/**
 	 * @return the type of shard this is attuned to:
 	 * none -1, air 0, fire 1, water 2, earth 3, order 4, entropy 5
 	 * Should return -1 for most implementations
 	 */
-	public byte getAttunement() {
+	public byte getAttunement()
+	{
 		return -1;
 	}
-		
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java
index 7ac4c69..c8a4826 100644
--- a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java
+++ b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java
@@ -13,7 +13,8 @@ import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.WorldCoordinates;
 import thaumcraft.api.aspects.Aspect;
 
-public class VisNetHandler {
+public class VisNetHandler
+{
 
 	// NODE DRAINING
 	/**
@@ -29,49 +30,61 @@ public class VisNetHandler {
 	 * @param amount how much to drain
 	 * @return how much was actually drained
 	 */
-	public static int drainVis(World world, int x, int y, int z, Aspect aspect, int amount) {
+	public static int drainVis(World world, int x, int y, int z, Aspect aspect, int amount)
+	{
 
 		int drainedAmount = 0;
 
-		WorldCoordinates drainer = new WorldCoordinates(x, y, z,
+		final WorldCoordinates drainer = new WorldCoordinates(x, y, z,
 				world.provider.dimensionId);
-		if (!nearbyNodes.containsKey(drainer)) {
+		if(!nearbyNodes.containsKey(drainer))
+		{
 			calculateNearbyNodes(world, x, y, z);
 		}
 
-		ArrayList<WeakReference<TileVisNode>> nodes = nearbyNodes.get(drainer);
-		if (nodes!=null && nodes.size()>0)
-		for (WeakReference<TileVisNode> noderef : nodes) {
-			
-			TileVisNode node = noderef.get();
-			
-			if (node == null) continue;
-
-			int a = node.consumeVis(aspect, amount);
-			drainedAmount += a;
-			amount -= a;
-			if (a>0) {
-				int color = Aspect.getPrimalAspects().indexOf(aspect);
-				generateVisEffect(world.provider.dimensionId, x, y, z, node.xCoord, node.yCoord, node.zCoord, color);				
-			}
-			if (amount <= 0) {
-				break;
+		final ArrayList<WeakReference<TileVisNode>> nodes = nearbyNodes.get(drainer);
+		if(nodes != null && nodes.size() > 0)
+		{
+			for(final WeakReference<TileVisNode> noderef : nodes)
+			{
+
+				final TileVisNode node = noderef.get();
+
+				if(node == null)
+				{
+					continue;
+				}
+
+				final int a = node.consumeVis(aspect, amount);
+				drainedAmount += a;
+				amount -= a;
+				if(a > 0)
+				{
+					final int color = Aspect.getPrimalAspects().indexOf(aspect);
+					generateVisEffect(world.provider.dimensionId, x, y, z, node.xCoord, node.yCoord, node.zCoord, color);
+				}
+				if(amount <= 0)
+				{
+					break;
+				}
 			}
 		}
-		
+
 		return drainedAmount;
 	}
-	
-	public static void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color) {
+
+	public static void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color)
+	{
 		ThaumcraftApi.internalMethods.generateVisEffect(dim, x, y, z, x2, y2, z2, color);
 	}
 
-	public static HashMap<Integer, HashMap<WorldCoordinates, WeakReference<TileVisNode>>> sources = new HashMap<Integer, HashMap<WorldCoordinates, WeakReference<TileVisNode>>>();
+	public static HashMap<Integer, HashMap<WorldCoordinates, WeakReference<TileVisNode>>>	sources	= new HashMap<Integer, HashMap<WorldCoordinates, WeakReference<TileVisNode>>>();
 
-	public static void addSource(World world, TileVisNode vs) {
-		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources
-				.get(world.provider.dimensionId);
-		if (sourcelist == null) {
+	public static void addSource(World world, TileVisNode vs)
+	{
+		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources.get(world.provider.dimensionId);
+		if(sourcelist == null)
+		{
 			sourcelist = new HashMap<WorldCoordinates, WeakReference<TileVisNode>>();
 		}
 		sourcelist.put(vs.getLocation(), new WeakReference(vs));
@@ -79,54 +92,63 @@ public class VisNetHandler {
 		nearbyNodes.clear();
 	}
 
-	public static boolean isNodeValid(WeakReference<TileVisNode> node) {
-		if (node == null || node.get() == null || node.get().isInvalid())
+	public static boolean isNodeValid(WeakReference<TileVisNode> node)
+	{
+		if(node == null || node.get() == null || node.get().isInvalid())
+		{
 			return false;
+		}
 		return true;
 	}
 
-	public static WeakReference<TileVisNode> addNode(World world, TileVisNode vn) {
-		WeakReference ref = new WeakReference(vn);
+	public static WeakReference<TileVisNode> addNode(World world, TileVisNode vn)
+	{
+		final WeakReference ref = new WeakReference(vn);
 
-		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources
-				.get(world.provider.dimensionId);
-		if (sourcelist == null) {
+		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources.get(world.provider.dimensionId);
+		if(sourcelist == null)
+		{
 			sourcelist = new HashMap<WorldCoordinates, WeakReference<TileVisNode>>();
 			return null;
 		}
 
 		ArrayList<Object[]> nearby = new ArrayList<Object[]>();
 
-		for (WeakReference<TileVisNode> root : sourcelist.values()) {
-			if (!isNodeValid(root))
+		for(final WeakReference<TileVisNode> root : sourcelist.values())
+		{
+			if(!isNodeValid(root))
+			{
 				continue;
+			}
 
-			TileVisNode source = root.get();
+			final TileVisNode source = root.get();
 
-			float r = inRange(world, vn.getLocation(), source.getLocation(),
-					vn.getRange());
-			if (r > 0) {
-				nearby.add(new Object[] { source, r - vn.getRange() * 2 });
+			final float r = inRange(world, vn.getLocation(), source.getLocation(), vn.getRange());
+			if(r > 0)
+			{
+				nearby.add(new Object[] {source, r - vn.getRange() * 2});
 			}
-			
+
 			nearby = findClosestNodes(vn, source, nearby);
 			cache.clear();
 		}
 
 		float dist = Float.MAX_VALUE;
 		TileVisNode closest = null;
-		if (nearby.size() > 0) {
-			for (Object[] o : nearby) {
-				if ((Float) o[1] < dist &&
-					(vn.getAttunement() == -1 || ((TileVisNode) o[0]).getAttunement() == -1 || 
-						vn.getAttunement() == ((TileVisNode) o[0]).getAttunement())//) {
-					 && canNodeBeSeen(vn,(TileVisNode)o[0])) {
+		if(nearby.size() > 0)
+		{
+			for(final Object[] o : nearby)
+			{
+				if((Float) o[1] < dist && (vn.getAttunement() == -1 || ((TileVisNode) o[0]).getAttunement() == -1 || vn.getAttunement() == ((TileVisNode) o[0]).getAttunement())//) {
+						&& canNodeBeSeen(vn, (TileVisNode) o[0]))
+				{
 					dist = (Float) o[1];
-					closest = (TileVisNode) o[0];					
+					closest = (TileVisNode) o[0];
 				}
 			}
 		}
-		if (closest != null) {
+		if(closest != null)
+		{
 			closest.getChildren().add(ref);
 			nearbyNodes.clear();
 			return new WeakReference(closest);
@@ -135,121 +157,134 @@ public class VisNetHandler {
 		return null;
 	}
 
-	static ArrayList<WorldCoordinates> cache = new ArrayList<WorldCoordinates>();
-	public static ArrayList<Object[]> findClosestNodes(TileVisNode target,
-			TileVisNode parent, ArrayList<Object[]> in) {
-		
-		if (cache.size() > 512 || cache.contains(new WorldCoordinates(parent))) return in;
+	static ArrayList<WorldCoordinates>	cache	= new ArrayList<WorldCoordinates>();
+
+	public static ArrayList<Object[]> findClosestNodes(TileVisNode target, TileVisNode parent, ArrayList<Object[]> in)
+	{
+
+		if(cache.size() > 512 || cache.contains(new WorldCoordinates(parent)))
+		{
+			return in;
+		}
 		cache.add(new WorldCoordinates(parent));
-		
-		for (WeakReference<TileVisNode> childWR : parent.getChildren()) {
-			TileVisNode child = childWR.get();
-
-			if (child != null && !child.equals(target) && !child.equals(parent)) {
-				float r2 = inRange(child.getWorldObj(), child.getLocation(),
-						target.getLocation(), target.getRange());
-				if (r2 > 0) {
-					in.add(new Object[] { child, r2 });
+
+		for(final WeakReference<TileVisNode> childWR : parent.getChildren())
+		{
+			final TileVisNode child = childWR.get();
+
+			if(child != null && !child.equals(target) && !child.equals(parent))
+			{
+				final float r2 = inRange(child.getWorldObj(), child.getLocation(), target.getLocation(), target.getRange());
+				if(r2 > 0)
+				{
+					in.add(new Object[] {child, r2});
 				}
-				
+
 				in = findClosestNodes(target, child, in);
 			}
 		}
 		return in;
 	}
 
-	private static float inRange(World world, WorldCoordinates cc1,
-			WorldCoordinates cc2, int range) {
-		float distance = cc1.getDistanceSquaredToWorldCoordinates(cc2);
+	private static float inRange(World world, WorldCoordinates cc1, WorldCoordinates cc2, int range)
+	{
+		final float distance = cc1.getDistanceSquaredToWorldCoordinates(cc2);
 		return distance > range * range ? -1 : distance;
 	}
 
-	private static HashMap<WorldCoordinates, ArrayList<WeakReference<TileVisNode>>> nearbyNodes = new HashMap<WorldCoordinates, ArrayList<WeakReference<TileVisNode>>>();
+	private static HashMap<WorldCoordinates, ArrayList<WeakReference<TileVisNode>>>	nearbyNodes	= new HashMap<WorldCoordinates, ArrayList<WeakReference<TileVisNode>>>();
 
-	private static void calculateNearbyNodes(World world, int x, int y, int z) {
+	private static void calculateNearbyNodes(World world, int x, int y, int z)
+	{
 
-		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources
-				.get(world.provider.dimensionId);
-		if (sourcelist == null) {
+		HashMap<WorldCoordinates, WeakReference<TileVisNode>> sourcelist = sources.get(world.provider.dimensionId);
+		if(sourcelist == null)
+		{
 			sourcelist = new HashMap<WorldCoordinates, WeakReference<TileVisNode>>();
 			return;
 		}
 
-		ArrayList<WeakReference<TileVisNode>> cn = new ArrayList<WeakReference<TileVisNode>>();
-		WorldCoordinates drainer = new WorldCoordinates(x, y, z,
+		final ArrayList<WeakReference<TileVisNode>> cn = new ArrayList<WeakReference<TileVisNode>>();
+		final WorldCoordinates drainer = new WorldCoordinates(x, y, z,
 				world.provider.dimensionId);
 
-		ArrayList<Object[]> nearby = new ArrayList<Object[]>();
+		new ArrayList<Object[]>();
 
-		for (WeakReference<TileVisNode> root : sourcelist.values()) {
-			
-			if (!isNodeValid(root))
+		for(final WeakReference<TileVisNode> root : sourcelist.values())
+		{
+
+			if(!isNodeValid(root))
+			{
 				continue;
+			}
+
+			final TileVisNode source = root.get();
 
-			TileVisNode source = root.get();
-			
 			TileVisNode closest = null;
 			float range = Float.MAX_VALUE;
 
-			float r = inRange(world, drainer, source.getLocation(),
-					source.getRange());
-			if (r > 0) {
+			final float r = inRange(world, drainer, source.getLocation(), source.getRange());
+			if(r > 0)
+			{
 				range = r;
 				closest = source;
 			}
-			
+
 			ArrayList<WeakReference<TileVisNode>> children = new ArrayList<WeakReference<TileVisNode>>();
-			children = getAllChildren(source,children);
-			
-			for (WeakReference<TileVisNode> child : children) {
-				TileVisNode n = child.get();
-				if (n != null && !n.equals(root)) {
-					
-					float r2 = inRange(n.getWorldObj(), n.getLocation(),
-							drainer, n.getRange());
-					if (r2 > 0 && r2 < range) {
+			children = getAllChildren(source, children);
+
+			for(final WeakReference<TileVisNode> child : children)
+			{
+				final TileVisNode n = child.get();
+				if(n != null && !n.equals(root))
+				{
+
+					final float r2 = inRange(n.getWorldObj(), n.getLocation(), drainer, n.getRange());
+					if(r2 > 0 && r2 < range)
+					{
 						range = r2;
 						closest = n;
 					}
 				}
 			}
 
-			if (closest != null) {
-				
+			if(closest != null)
+			{
+
 				cn.add(new WeakReference(closest));
 			}
 		}
 
 		nearbyNodes.put(drainer, cn);
 	}
-	
-	private static ArrayList<WeakReference<TileVisNode>> getAllChildren(TileVisNode source, ArrayList<WeakReference<TileVisNode>> list) {
-		for (WeakReference<TileVisNode> child : source.getChildren()) {
-			TileVisNode n = child.get();
-			
-			if (n != null && n.getWorldObj()!=null && isChunkLoaded(n.getWorldObj(), n.xCoord, n.zCoord)) {
+
+	private static ArrayList<WeakReference<TileVisNode>> getAllChildren(TileVisNode source, ArrayList<WeakReference<TileVisNode>> list)
+	{
+		for(final WeakReference<TileVisNode> child : source.getChildren())
+		{
+			final TileVisNode n = child.get();
+
+			if(n != null && n.getWorldObj() != null && isChunkLoaded(n.getWorldObj(), n.xCoord, n.zCoord))
+			{
 				list.add(child);
-				list = getAllChildren(n,list);
+				list = getAllChildren(n, list);
 			}
 		}
 		return list;
 	}
-	
-	public static boolean isChunkLoaded(World world, int x, int z) {
-		int xx = x >> 4;
-		int zz = z >> 4;
-		return world.getChunkProvider().chunkExists(xx, zz);
+
+	public static boolean isChunkLoaded(World world, int x, int z)
+	{
+		final int xx = x >> 4;
+					final int zz = z >> 4;
+					return world.getChunkProvider().chunkExists(xx, zz);
 	}
 
-	 public static boolean canNodeBeSeen(TileVisNode source,TileVisNode target)
-	 {		 
-		 MovingObjectPosition mop = ThaumcraftApiHelper.rayTraceIgnoringSource(source.getWorldObj(), 
-				 Vec3.createVectorHelper(source.xCoord+.5, source.yCoord+.5,source.zCoord+.5),
-				 Vec3.createVectorHelper(target.xCoord+.5, target.yCoord+.5,target.zCoord+.5),
-				 false, true, false);
-		 return  mop == null || (mop.typeOfHit==MovingObjectType.BLOCK &&
-				 mop.blockX==target.xCoord && mop.blockY==target.yCoord && mop.blockZ==target.zCoord);
-	 }
+	public static boolean canNodeBeSeen(TileVisNode source, TileVisNode target)
+	{
+		final MovingObjectPosition mop = ThaumcraftApiHelper.rayTraceIgnoringSource(source.getWorldObj(), Vec3.createVectorHelper(source.xCoord + .5, source.yCoord + .5, source.zCoord + .5), Vec3.createVectorHelper(target.xCoord + .5, target.yCoord + .5, target.zCoord + .5), false, true, false);
+		return mop == null || (mop.typeOfHit == MovingObjectType.BLOCK && mop.blockX == target.xCoord && mop.blockY == target.yCoord && mop.blockZ == target.zCoord);
+	}
 
 	// public static HashMap<WorldCoordinates,WeakReference<TileVisNode>>
 	// noderef = new HashMap<WorldCoordinates,WeakReference<TileVisNode>>();
diff --git a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java
index 5c4269e..32ee1ef 100644
--- a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java
+++ b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java
@@ -8,107 +8,152 @@ import org.apache.logging.log4j.LogManager;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-public class FocusUpgradeType {
-
-	public static FocusUpgradeType[] types = new FocusUpgradeType[20];
-	
-	public short id;
-	
-	public ResourceLocation icon;
-	
-	public String name;
-	
-	public String text;
-	
+public class FocusUpgradeType
+{
+
+	public static FocusUpgradeType[]	types	= new FocusUpgradeType[20];
+
+	public short						id;
+
+	public ResourceLocation				icon;
+
+	public String						name;
+
+	public String						text;
+
 	/**
 	 * What aspects are used to calculate the cost of this upgrade. The amounts given is ignored, just the type is used for the calculation.
 	 */
-	public AspectList aspects;
-
-	
+	public AspectList					aspects;
 
-	public FocusUpgradeType(int id, ResourceLocation icon, String name, String text, AspectList aspects) {
-		this.id = (short) id;	
+	public FocusUpgradeType(int id, ResourceLocation icon, String name, String text, AspectList aspects)
+	{
+		this.id = (short) id;
 		this.icon = icon;
 		this.name = name;
 		this.text = text;
 		this.aspects = aspects;
-		
-		if (id<types.length && types[id]!=null) {
-			LogManager.getLogger("THAUMCRAFT").fatal("Focus Upgrade id "+id+" already occupied. Ignoring.");
+
+		if(id < types.length && types[id] != null)
+		{
+			LogManager.getLogger("THAUMCRAFT").fatal("Focus Upgrade id " + id + " already occupied. Ignoring.");
 			return;
 		}
-		
+
 		// allocate space
-		if (id>=types.length) {
-			FocusUpgradeType[] temp = new FocusUpgradeType[id+1];
+		if(id >= types.length)
+		{
+			final FocusUpgradeType[] temp = new FocusUpgradeType[id + 1];
 			System.arraycopy(types, 0, temp, 0, types.length);
 			types = temp;
 		}
-		
+
 		types[id] = this;
-	}	
-	
-	public String getLocalizedName() {
+	}
+
+	public String getLocalizedName()
+	{
 		return StatCollector.translateToLocal(name);
 	}
-	
-	public String getLocalizedText() {
+
+	public String getLocalizedText()
+	{
 		return StatCollector.translateToLocal(text);
 	}
-	
+
 	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof FocusUpgradeType) {
-			return this.id == ((FocusUpgradeType)obj).id;
-		} else return false;
+	public boolean equals(Object obj)
+	{
+		if(obj instanceof FocusUpgradeType)
+		{
+			return id == ((FocusUpgradeType) obj).id;
+		}
+		else
+		{
+			return false;
+		}
 	}
 
 	// basic upgrade types
-	public static FocusUpgradeType potency = new FocusUpgradeType( 0,
-			new ResourceLocation("thaumcraft", "textures/foci/potency.png"),
-			"focus.upgrade.potency.name","focus.upgrade.potency.text",
-			new AspectList().add(Aspect.WEAPON,1));
-	
-	public static FocusUpgradeType frugal = new FocusUpgradeType( 1,
-			new ResourceLocation("thaumcraft", "textures/foci/frugal.png"),
-			"focus.upgrade.frugal.name","focus.upgrade.frugal.text",
-			new AspectList().add(Aspect.HUNGER,1));
-	
-	public static FocusUpgradeType treasure = new FocusUpgradeType( 2,
-			new ResourceLocation("thaumcraft", "textures/foci/treasure.png"),
-			"focus.upgrade.treasure.name","focus.upgrade.treasure.text",
-			new AspectList().add(Aspect.GREED,1));
-	
-	public static FocusUpgradeType enlarge = new FocusUpgradeType( 3,
-			new ResourceLocation("thaumcraft", "textures/foci/enlarge.png"),
-			"focus.upgrade.enlarge.name","focus.upgrade.enlarge.text",
-			new AspectList().add(Aspect.TRAVEL,1));
-
-	public static FocusUpgradeType alchemistsfire = new FocusUpgradeType( 4,
-			new ResourceLocation("thaumcraft", "textures/foci/alchemistsfire.png"),
-			"focus.upgrade.alchemistsfire.name","focus.upgrade.alchemistsfire.text",
-			new AspectList().add(Aspect.ENERGY,1).add(Aspect.SLIME,1));
-	
-	public static FocusUpgradeType alchemistsfrost = new FocusUpgradeType( 5,
-			new ResourceLocation("thaumcraft", "textures/foci/alchemistsfrost.png"),
-			"focus.upgrade.alchemistsfrost.name","focus.upgrade.alchemistsfrost.text",
-			new AspectList().add(Aspect.COLD,1).add(Aspect.TRAP,1));
-	
-	public static FocusUpgradeType architect = new FocusUpgradeType( 6,
-			new ResourceLocation("thaumcraft", "textures/foci/architect.png"),
-			"focus.upgrade.architect.name","focus.upgrade.architect.text",
-			new AspectList().add(Aspect.CRAFT,1));
-	
-	public static FocusUpgradeType extend = new FocusUpgradeType( 7,
-			new ResourceLocation("thaumcraft", "textures/foci/extend.png"),
-			"focus.upgrade.extend.name","focus.upgrade.extend.text",
-			new AspectList().add(Aspect.EXCHANGE,1));
-	
-	public static FocusUpgradeType silktouch = new FocusUpgradeType( 8,
-			new ResourceLocation("thaumcraft", "textures/foci/silktouch.png"),
-			"focus.upgrade.silktouch.name","focus.upgrade.silktouch.text",
-			new AspectList().add(Aspect.GREED,1));
-	
-	
+	public static FocusUpgradeType	potency			= new FocusUpgradeType(
+			0,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/potency.png"),
+					"focus.upgrade.potency.name",
+					"focus.upgrade.potency.text",
+					new AspectList().add(Aspect.WEAPON, 1));
+
+	public static FocusUpgradeType	frugal			= new FocusUpgradeType(
+			1,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/frugal.png"),
+					"focus.upgrade.frugal.name",
+					"focus.upgrade.frugal.text",
+					new AspectList().add(Aspect.HUNGER, 1));
+
+	public static FocusUpgradeType	treasure		= new FocusUpgradeType(
+			2,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/treasure.png"),
+					"focus.upgrade.treasure.name",
+					"focus.upgrade.treasure.text",
+					new AspectList().add(Aspect.GREED, 1));
+
+	public static FocusUpgradeType	enlarge			= new FocusUpgradeType(
+			3,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/enlarge.png"),
+					"focus.upgrade.enlarge.name",
+					"focus.upgrade.enlarge.text",
+					new AspectList().add(Aspect.TRAVEL, 1));
+
+	public static FocusUpgradeType	alchemistsfire	= new FocusUpgradeType(
+			4,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/alchemistsfire.png"),
+					"focus.upgrade.alchemistsfire.name",
+					"focus.upgrade.alchemistsfire.text",
+					new AspectList().add(Aspect.ENERGY, 1).add(Aspect.SLIME, 1));
+
+	public static FocusUpgradeType	alchemistsfrost	= new FocusUpgradeType(
+			5,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/alchemistsfrost.png"),
+					"focus.upgrade.alchemistsfrost.name",
+					"focus.upgrade.alchemistsfrost.text",
+					new AspectList().add(Aspect.COLD, 1).add(Aspect.TRAP, 1));
+
+	public static FocusUpgradeType	architect		= new FocusUpgradeType(
+			6,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/architect.png"),
+					"focus.upgrade.architect.name",
+					"focus.upgrade.architect.text",
+					new AspectList().add(Aspect.CRAFT, 1));
+
+	public static FocusUpgradeType	extend			= new FocusUpgradeType(
+			7,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/extend.png"),
+					"focus.upgrade.extend.name",
+					"focus.upgrade.extend.text",
+					new AspectList().add(Aspect.EXCHANGE, 1));
+
+	public static FocusUpgradeType	silktouch		= new FocusUpgradeType(
+			8,
+			new ResourceLocation(
+					"thaumcraft",
+					"textures/foci/silktouch.png"),
+					"focus.upgrade.silktouch.name",
+					"focus.upgrade.silktouch.text",
+					new AspectList().add(Aspect.GREED, 1));
+
 }
diff --git a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java
index 4ef8c84..dbceaa5 100644
--- a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java
+++ b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
  * update tick. 
  *
  */
-public interface IWandRodOnUpdate {
+public interface IWandRodOnUpdate
+{
 	void onUpdate(ItemStack itemstack, EntityPlayer player);
 }
diff --git a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java
index 7c299de..ae47992 100644
--- a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java
+++ b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java
@@ -4,12 +4,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public interface IWandTriggerManager {
+public interface IWandTriggerManager
+{
 
 	/**
 	 * This class will be called by wands with the proper parameters. It is up to you to decide what to do with them.
 	 */
-	public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, 
-			int x, int y, int z, int side, int event);
-	
+	public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side, int event);
+
 }
diff --git a/src/api/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java
index aeb9bac..7cc0362 100644
--- a/src/api/java/thaumcraft/api/wands/IWandable.java
+++ b/src/api/java/thaumcraft/api/wands/IWandable.java
@@ -12,14 +12,15 @@ import net.minecraft.world.World;
  *
  */
 
-public interface IWandable {
+public interface IWandable
+{
 
 	public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, int md);
-	
+
 	public ItemStack onWandRightClick(World world, ItemStack wandstack, EntityPlayer player);
-	
+
 	public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count);
-	
+
 	public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count);
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java
index e8938e9..70d0dba 100644
--- a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java
+++ b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java
@@ -21,256 +21,294 @@ import thaumcraft.api.aspects.AspectList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemFocusBasic extends Item {
-	
-	public ItemFocusBasic ()
-    {
-        super();
-        maxStackSize = 1;
-        canRepair=false;
-        this.setMaxDamage(0);
-    }
-	
-	public IIcon icon;
-	
+public class ItemFocusBasic extends Item
+{
+
+	public ItemFocusBasic()
+	{
+		super();
+		maxStackSize = 1;
+		canRepair = false;
+		setMaxDamage(0);
+	}
+
+	public IIcon	icon;
+
 	@SideOnly(Side.CLIENT)
 	@Override
-	public IIcon getIconFromDamage(int par1) {
+	public IIcon getIconFromDamage(int par1)
+	{
 		return icon;
 	}
-	
+
 	@Override
-	public boolean isDamageable() {
+	public boolean isDamageable()
+	{
 		return false;
 	}
 
 	@Override
-	public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) {
-		AspectList al = this.getVisCost(stack);
-		if (al!=null && al.size()>0) {
-			list.add(StatCollector.translateToLocal(isVisCostPerTick(stack)?"item.Focus.cost2":"item.Focus.cost1"));
-			for (Aspect aspect:al.getAspectsSorted()) {
-				DecimalFormat myFormatter = new DecimalFormat("#####.##");
-				String amount = myFormatter.format(al.getAmount(aspect)/100f);
-				list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount);				
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
+	{
+		final AspectList al = getVisCost(stack);
+		if(al != null && al.size() > 0)
+		{
+			list.add(StatCollector.translateToLocal(isVisCostPerTick(stack) ? "item.Focus.cost2" : "item.Focus.cost1"));
+			for(final Aspect aspect : al.getAspectsSorted())
+			{
+				final DecimalFormat myFormatter = new DecimalFormat("#####.##");
+				final String amount = myFormatter.format(al.getAmount(aspect) / 100f);
+				list.add(" \u00A7" + aspect.getChatcolor() + aspect.getName() + "\u00A7r x " + amount);
 			}
 		}
-		addFocusInformation(stack,player,list,par4);
+		addFocusInformation(stack, player, list, par4);
 	}
-	
-	public void addFocusInformation(ItemStack focusstack,EntityPlayer player, List list, boolean par4) {
-		LinkedHashMap<Short, Integer> map = new LinkedHashMap<Short, Integer>();
-		for (short id:this.getAppliedUpgrades(focusstack)) {
-			if (id>=0) {
+
+	public void addFocusInformation(ItemStack focusstack, EntityPlayer player, List list, boolean par4)
+	{
+		final LinkedHashMap<Short, Integer> map = new LinkedHashMap<Short, Integer>();
+		for(final short id : getAppliedUpgrades(focusstack))
+		{
+			if(id >= 0)
+			{
 				int amt = 1;
-				if (map.containsKey(id)) {
-					amt = map.get(id) + 1;				
+				if(map.containsKey(id))
+				{
+					amt = map.get(id) + 1;
 				}
 				map.put(id, amt);
 			}
 		}
-		for (Short id:map.keySet()) {	
-			list.add(EnumChatFormatting.DARK_PURPLE +FocusUpgradeType.types[id].getLocalizedName()+
-					(map.get(id)>1?" "+StatCollector.translateToLocal("enchantment.level." + map.get(id)):""));
+		for(final Short id : map.keySet())
+		{
+			list.add(EnumChatFormatting.DARK_PURPLE + FocusUpgradeType.types[id].getLocalizedName() + (map.get(id) > 1 ? " " + StatCollector.translateToLocal("enchantment.level." + map.get(id)) : ""));
 		}
 	}
-	
+
 	/**
 	 * Purely for display on the focus tooltip (see addInformation method above)
 	 */
-	public boolean isVisCostPerTick(ItemStack focusstack) {
+	public boolean isVisCostPerTick(ItemStack focusstack)
+	{
 		return false;
 	}
-	
+
 	@Override
 	public EnumRarity getRarity(ItemStack focusstack)
-    {
-        return EnumRarity.rare;
-    }	
-	
+	{
+		return EnumRarity.rare;
+	}
+
 	/**
 	 * What color will the focus orb be rendered on the held wand
 	 */
-	public int getFocusColor(ItemStack focusstack) {
+	public int getFocusColor(ItemStack focusstack)
+	{
 		return 0;
 	}
 
-	
 	/**
 	 * Does the focus have ornamentation like the focus of the nine hells. Ornamentation is a standard icon rendered in a cross around the focus
-	 */	
-	public IIcon getOrnament(ItemStack focusstack) {
+	 */
+	public IIcon getOrnament(ItemStack focusstack)
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
 	/**
 	 * An icon to be rendered inside the focus itself
 	 */
-	public IIcon getFocusDepthLayerIcon(ItemStack focusstack) {
+	public IIcon getFocusDepthLayerIcon(ItemStack focusstack)
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
-	public enum WandFocusAnimation {
+
+	public enum WandFocusAnimation
+	{
 		WAVE, CHARGE;
 	}
 
-	public WandFocusAnimation getAnimation(ItemStack focusstack) {
+	public WandFocusAnimation getAnimation(ItemStack focusstack)
+	{
 		return WandFocusAnimation.WAVE;
 	}
-	
+
 	/**
 	 * Just insert two alphanumeric characters before this string in your focus item class
 	 */
-	public String getSortingHelper(ItemStack focusstack) {		
-		String out="";
-		for (short id:this.getAppliedUpgrades(focusstack)) {
+	public String getSortingHelper(ItemStack focusstack)
+	{
+		String out = "";
+		for(final short id : getAppliedUpgrades(focusstack))
+		{
 			out = out + id;
 		}
 		return out;
 	}
-	
-	
+
 	/**
 	 * How much vis does this focus consume per activation. 
 	 */
-	public AspectList getVisCost(ItemStack focusstack) {
+	public AspectList getVisCost(ItemStack focusstack)
+	{
 		return null;
 	}
-	
+
 	/**
 	 * This returns how many milliseconds must pass before the focus can be activated again.
-	 */	
-	public int getActivationCooldown(ItemStack focusstack) {
+	 */
+	public int getActivationCooldown(ItemStack focusstack)
+	{
 		return 0;
-	}	
-	
+	}
+
 	/**
 	 * Used by foci like equal trade to determine their area in artchitect mode 
 	 */
-	public int getMaxAreaSize(ItemStack focusstack) {
+	public int getMaxAreaSize(ItemStack focusstack)
+	{
 		return 1;
 	}
-	
+
 	/**
 	 * What upgrades can be applied to this focus for ranks 1 to 5
 	 */
-	public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) {
+	public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank)
+	{
 		return null;
 	}
-	
+
 	/**
 	 * What upgrades does the focus currently have
 	 */
-	public short[] getAppliedUpgrades(ItemStack focusstack) {
-		short[] l = new short[] {-1,-1,-1,-1,-1};
-		NBTTagList nbttaglist = getFocusUpgradeTagList(focusstack);
-        if (nbttaglist == null)
-        {
-            return l;
-        }
-        else
-        {        	
-            for (int j = 0; j < nbttaglist.tagCount(); ++j)
-            {
-            	if (j>=5) break;
-            	l[j] = nbttaglist.getCompoundTagAt(j).getShort("id");
-            }
-
-            return l;
-        }
+	public short[] getAppliedUpgrades(ItemStack focusstack)
+	{
+		final short[] l = new short[] {-1, -1, -1, -1, -1};
+		final NBTTagList nbttaglist = getFocusUpgradeTagList(focusstack);
+		if(nbttaglist == null)
+		{
+			return l;
+		}
+		else
+		{
+			for(int j = 0; j < nbttaglist.tagCount(); ++j)
+			{
+				if(j >= 5)
+				{
+					break;
+				}
+				l[j] = nbttaglist.getCompoundTagAt(j).getShort("id");
+			}
+
+			return l;
+		}
 	}
-	
-	public boolean applyUpgrade(ItemStack focusstack, FocusUpgradeType type, int rank) {
-		short[] upgrades = getAppliedUpgrades(focusstack);
-		if (upgrades[rank-1]!=-1 || rank<1 || rank>5) {
+
+	public boolean applyUpgrade(ItemStack focusstack, FocusUpgradeType type, int rank)
+	{
+		final short[] upgrades = getAppliedUpgrades(focusstack);
+		if(upgrades[rank - 1] != -1 || rank < 1 || rank > 5)
+		{
 			return false;
 		}
-		upgrades[rank-1] = type.id;
+		upgrades[rank - 1] = type.id;
 		setFocusUpgradeTagList(focusstack, upgrades);
 		return true;
 	}
-	
+
 	/**
 	 * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" 
 	 * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic.
 	 * 
 	 */
-	public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) {
+	public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank)
+	{
 		return true;
 	}
 
 	/**
 	 * Does this focus have the passed upgrade type
 	 */
-	public boolean isUpgradedWith(ItemStack focusstack, FocusUpgradeType focusUpgradetype) {
-		return getUpgradeLevel(focusstack,focusUpgradetype)>0;
+	public boolean isUpgradedWith(ItemStack focusstack, FocusUpgradeType focusUpgradetype)
+	{
+		return getUpgradeLevel(focusstack, focusUpgradetype) > 0;
 	}
 
 	/**
 	 * What level is the passed upgrade type on the focus. If it is not present it returns 0
 	 */
-	public int getUpgradeLevel(ItemStack focusstack, FocusUpgradeType focusUpgradetype) {
-		short[] list = getAppliedUpgrades(focusstack);
-		int level=0;
-		for (short id:list) {
-			if (id == focusUpgradetype.id)
-            {
-                level++;
-            }
+	public int getUpgradeLevel(ItemStack focusstack, FocusUpgradeType focusUpgradetype)
+	{
+		final short[] list = getAppliedUpgrades(focusstack);
+		int level = 0;
+		for(final short id : list)
+		{
+			if(id == focusUpgradetype.id)
+			{
+				level++;
+			}
 		}
-        return level;
-	}	
-	
-	public ItemStack onFocusRightClick(ItemStack wandstack, World world,EntityPlayer player, MovingObjectPosition movingobjectposition) {
+		return level;
+	}
+
+	public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition)
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
-	public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player,int count) {
+
+	public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count)
+	{
 		// TODO Auto-generated method stub		
 	}
-	
-	public void onPlayerStoppedUsingFocus(ItemStack wandstack, World world,	EntityPlayer player, int count) {
+
+	public void onPlayerStoppedUsingFocus(ItemStack wandstack, World world, EntityPlayer player, int count)
+	{
 		// TODO Auto-generated method stub
-		
+
 	}
-	
-	public boolean onFocusBlockStartBreak(ItemStack wandstack, int x, int y,int z, EntityPlayer player) {
+
+	public boolean onFocusBlockStartBreak(ItemStack wandstack, int x, int y, int z, EntityPlayer player)
+	{
 		// TODO Auto-generated method stub
 		return false;
 	}
-	
+
 	/**
 	 * Internal helper methods
 	 */
 	private NBTTagList getFocusUpgradeTagList(ItemStack focusstack)
-    {
-        return focusstack.stackTagCompound == null ? null : focusstack.stackTagCompound.getTagList("upgrade", 10);
-    }
-	
-	private void setFocusUpgradeTagList(ItemStack focusstack, short[] upgrades) {
-		if (!focusstack.hasTagCompound()) 
+	{
+		return focusstack.stackTagCompound == null ? null : focusstack.stackTagCompound.getTagList("upgrade", 10);
+	}
+
+	private void setFocusUpgradeTagList(ItemStack focusstack, short[] upgrades)
+	{
+		if(!focusstack.hasTagCompound())
+		{
 			focusstack.setTagCompound(new NBTTagCompound());
-		NBTTagCompound nbttagcompound = focusstack.getTagCompound();
-		NBTTagList tlist = new NBTTagList();
+		}
+		final NBTTagCompound nbttagcompound = focusstack.getTagCompound();
+		final NBTTagList tlist = new NBTTagList();
 		nbttagcompound.setTag("upgrade", tlist);
-		for (short id : upgrades) {		
-			NBTTagCompound f = new NBTTagCompound();
+		for(final short id : upgrades)
+		{
+			final NBTTagCompound f = new NBTTagCompound();
 			f.setShort("id", id);
 			tlist.appendTag(f);
 		}
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) {
-		if (stack.stackTagCompound !=null && stack.stackTagCompound.hasKey("ench")) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_)
+	{
+		if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("ench"))
+		{
 			stack.stackTagCompound.removeTag("ench");
 		}
 		super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_);
 	}
 
-	
-	
 }
diff --git a/src/api/java/thaumcraft/api/wands/StaffRod.java b/src/api/java/thaumcraft/api/wands/StaffRod.java
index e7ae90f..1dc474c 100644
--- a/src/api/java/thaumcraft/api/wands/StaffRod.java
+++ b/src/api/java/thaumcraft/api/wands/StaffRod.java
@@ -11,38 +11,43 @@ import net.minecraft.util.ResourceLocation;
  * It is also used to generate the wand recipes ingame.
  *
  */
-public class StaffRod extends WandRod {
-	
-	boolean runes=false;
+public class StaffRod extends WandRod
+{
 
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost) {
-		super(tag+"_staff", capacity, item, craftCost);
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png");
+	boolean	runes	= false;
+
+	public StaffRod(String tag, int capacity, ItemStack item, int craftCost)
+	{
+		super(tag + "_staff", capacity, item, craftCost);
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_rod_" + tag + ".png");
 	}
 
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			IWandRodOnUpdate onUpdate, ResourceLocation texture) {
-		super(tag+"_staff", capacity, item, craftCost, onUpdate, texture);
+	public StaffRod(String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture)
+	{
+		super(tag + "_staff", capacity, item, craftCost, onUpdate, texture);
 	}
 
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			IWandRodOnUpdate onUpdate) {
-		super(tag+"_staff", capacity, item, craftCost, onUpdate);
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png");
+	public StaffRod(String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate)
+	{
+		super(tag + "_staff", capacity, item, craftCost, onUpdate);
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_rod_" + tag + ".png");
 	}
 
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			ResourceLocation texture) {
-		super(tag+"_staff", capacity, item, craftCost, texture);
+	public StaffRod(String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture)
+	{
+		super(tag + "_staff", capacity, item, craftCost, texture);
 	}
 
-	public boolean hasRunes() {
+	public boolean hasRunes()
+	{
 		return runes;
 	}
 
-	public void setRunes(boolean hasRunes) {
-		this.runes = hasRunes;
+	public void setRunes(boolean hasRunes)
+	{
+		runes = hasRunes;
 	}
 
-	
 }
diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java
index 17b4581..e5726ef 100644
--- a/src/api/java/thaumcraft/api/wands/WandCap.java
+++ b/src/api/java/thaumcraft/api/wands/WandCap.java
@@ -13,117 +13,133 @@ import thaumcraft.api.aspects.Aspect;
  * @author Azanor
  *
  */
-public class WandCap {
+public class WandCap
+{
+
+	private String									tag;
 
-	private String tag;
-	
 	/**
 	 * Cost to craft this wand. Combined with the rod cost.
 	 */
-	private int craftCost;
-	
+	private int										craftCost;
+
 	/**
 	 * the amount by which all aspect costs are multiplied
 	 */
-	float baseCostModifier; 
-	
+	float											baseCostModifier;
+
 	/**
 	 * specifies a list of primal aspects that use the special discount figure instead of the normal discount.
 	 */
-	List<Aspect> specialCostModifierAspects;
-	
+	List<Aspect>									specialCostModifierAspects;
+
 	/**
 	 * the amount by which the specified aspect costs are multiplied
 	 */
-	float specialCostModifier;
-	
+	float											specialCostModifier;
+
 	/**
 	 * The texture that will be used for the ingame wand cap
 	 */
-	ResourceLocation texture;
-	
+	ResourceLocation								texture;
+
 	/**
 	 * the actual item that makes up this cap and will be used to generate the wand recipes
 	 */
-	ItemStack item;
-	
-	public static LinkedHashMap<String,WandCap> caps = new LinkedHashMap<String,WandCap>();
-
-	public WandCap (String tag, float discount, ItemStack item, int craftCost) {
-		this.setTag(tag);
-		this.baseCostModifier = discount;
-		this.specialCostModifierAspects = null;
-		texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
+	ItemStack										item;
+
+	public static LinkedHashMap<String, WandCap>	caps	= new LinkedHashMap<String, WandCap>();
+
+	public WandCap(String tag, float discount, ItemStack item, int craftCost)
+	{
+		setTag(tag);
+		baseCostModifier = discount;
+		specialCostModifierAspects = null;
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_cap_" + getTag() + ".png");
+		this.item = item;
+		setCraftCost(craftCost);
 		caps.put(tag, this);
 	}
-	
-	public WandCap (String tag, float discount, List<Aspect> specialAspects, float discountSpecial, ItemStack item, int craftCost) {
-		this.setTag(tag);
-		this.baseCostModifier = discount;
-		this.specialCostModifierAspects = specialAspects;
-		this.specialCostModifier = discountSpecial;
-		texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
+
+	public WandCap(String tag, float discount, List<Aspect> specialAspects, float discountSpecial, ItemStack item, int craftCost)
+	{
+		setTag(tag);
+		baseCostModifier = discount;
+		specialCostModifierAspects = specialAspects;
+		specialCostModifier = discountSpecial;
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_cap_" + getTag() + ".png");
+		this.item = item;
+		setCraftCost(craftCost);
 		caps.put(tag, this);
 	}
-	
-	public float getBaseCostModifier() {
+
+	public float getBaseCostModifier()
+	{
 		return baseCostModifier;
 	}
 
-	public List<Aspect> getSpecialCostModifierAspects() {
+	public List<Aspect> getSpecialCostModifierAspects()
+	{
 		return specialCostModifierAspects;
 	}
 
-	public float getSpecialCostModifier() {
+	public float getSpecialCostModifier()
+	{
 		return specialCostModifier;
 	}
 
-	public ResourceLocation getTexture() {
+	public ResourceLocation getTexture()
+	{
 		return texture;
 	}
 
-	public void setTexture(ResourceLocation texture) {
+	public void setTexture(ResourceLocation texture)
+	{
 		this.texture = texture;
 	}
 
-	public String getTag() {
+	public String getTag()
+	{
 		return tag;
 	}
 
-	public void setTag(String tag) {
+	public void setTag(String tag)
+	{
 		this.tag = tag;
 	}
-	
 
-	public ItemStack getItem() {
+	public ItemStack getItem()
+	{
 		return item;
 	}
 
-	public void setItem(ItemStack item) {
+	public void setItem(ItemStack item)
+	{
 		this.item = item;
 	}
 
-	public int getCraftCost() {
+	public int getCraftCost()
+	{
 		return craftCost;
 	}
 
-	public void setCraftCost(int craftCost) {
+	public void setCraftCost(int craftCost)
+	{
 		this.craftCost = craftCost;
 	}
-	
+
 	/**
 	 * The research a player needs to have finished to be able to craft a wand with this cap. 
 	 */
-	public String getResearch() {
-		return "CAP_"+getTag();
+	public String getResearch()
+	{
+		return "CAP_" + getTag();
 	}
-	
+
 	//  Some examples:
 	//  WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1);
 	//  WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3);
-	
+
 }
diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java
index 85954e4..9b6907d 100644
--- a/src/api/java/thaumcraft/api/wands/WandRod.java
+++ b/src/api/java/thaumcraft/api/wands/WandRod.java
@@ -13,143 +13,164 @@ import net.minecraft.util.ResourceLocation;
  * It is also used to generate the wand recipes ingame.
  *
  */
-public class WandRod {
+public class WandRod
+{
+
+	private String									tag;
 
-	
-	private String tag;
-	
 	/**
 	 * Cost to craft this wand. Combined with the rod cost.
 	 */
-	private int craftCost;
-	
+	private int										craftCost;
+
 	/** 
 	 * The amount of vis that can be stored - this number is actually multiplied 
 	 * by 100 for use by the wands internals
 	 */
-	int capacity;   
+	int												capacity;
 
 	/**
 	 * The texture that will be used for the ingame wand rod
 	 */
-	protected ResourceLocation texture;
-	
+	protected ResourceLocation						texture;
+
 	/**
 	 * the actual item that makes up this rod and will be used to generate the wand recipes
 	 */
-	ItemStack item;
-	
+	ItemStack										item;
+
 	/**
 	 * A class that will be called whenever the wand onUpdate tick is run
 	 */
-	IWandRodOnUpdate onUpdate;
-	
+	IWandRodOnUpdate								onUpdate;
+
 	/**
 	 * Does the rod glow in the dark?
 	 */
-	boolean glow;
+	boolean											glow;
+
+	public static LinkedHashMap<String, WandRod>	rods	= new LinkedHashMap<String, WandRod>();
 
-	public static LinkedHashMap<String,WandRod> rods = new LinkedHashMap<String,WandRod>();
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) {
-		this.setTag(tag);
+	public WandRod(String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture)
+	{
+		setTag(tag);
 		this.capacity = capacity;
 		this.texture = texture;
-		this.item=item;
-		this.setCraftCost(craftCost);
+		this.item = item;
+		setCraftCost(craftCost);
 		rods.put(tag, this);
 	}
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) {
-		this.setTag(tag);
+
+	public WandRod(String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture)
+	{
+		setTag(tag);
 		this.capacity = capacity;
 		this.texture = texture;
-		this.item=item;
-		this.setCraftCost(craftCost);
+		this.item = item;
+		setCraftCost(craftCost);
 		rods.put(tag, this);
 		this.onUpdate = onUpdate;
 	}
 
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost) {
-		this.setTag(tag);
+	public WandRod(String tag, int capacity, ItemStack item, int craftCost)
+	{
+		setTag(tag);
 		this.capacity = capacity;
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_rod_" + getTag() + ".png");
+		this.item = item;
+		setCraftCost(craftCost);
 		rods.put(tag, this);
 	}
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate) {
-		this.setTag(tag);
+
+	public WandRod(String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate)
+	{
+		setTag(tag);
 		this.capacity = capacity;
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
+		texture = new ResourceLocation("thaumcraft",
+				"textures/models/wand_rod_" + getTag() + ".png");
+		this.item = item;
+		setCraftCost(craftCost);
 		rods.put(tag, this);
 		this.onUpdate = onUpdate;
 	}
-	
-	public String getTag() {
+
+	public String getTag()
+	{
 		return tag;
 	}
-	
-	public void setTag(String tag) {
+
+	public void setTag(String tag)
+	{
 		this.tag = tag;
 	}
 
-	public int getCapacity() {
+	public int getCapacity()
+	{
 		return capacity;
 	}
 
-	public void setCapacity(int capacity) {
+	public void setCapacity(int capacity)
+	{
 		this.capacity = capacity;
 	}
 
-	public ResourceLocation getTexture() {
+	public ResourceLocation getTexture()
+	{
 		return texture;
 	}
 
-	public void setTexture(ResourceLocation texture) {
+	public void setTexture(ResourceLocation texture)
+	{
 		this.texture = texture;
 	}
 
-	public ItemStack getItem() {
+	public ItemStack getItem()
+	{
 		return item;
 	}
 
-	public void setItem(ItemStack item) {
+	public void setItem(ItemStack item)
+	{
 		this.item = item;
 	}
-	
-	public int getCraftCost() {
+
+	public int getCraftCost()
+	{
 		return craftCost;
 	}
 
-	public void setCraftCost(int craftCost) {
+	public void setCraftCost(int craftCost)
+	{
 		this.craftCost = craftCost;
 	}
 
-	public IWandRodOnUpdate getOnUpdate() {
+	public IWandRodOnUpdate getOnUpdate()
+	{
 		return onUpdate;
 	}
 
-	public void setOnUpdate(IWandRodOnUpdate onUpdate) {
+	public void setOnUpdate(IWandRodOnUpdate onUpdate)
+	{
 		this.onUpdate = onUpdate;
 	}
 
-	public boolean isGlowing() {
+	public boolean isGlowing()
+	{
 		return glow;
 	}
 
-	public void setGlowing(boolean hasGlow) {
-		this.glow = hasGlow;
+	public void setGlowing(boolean hasGlow)
+	{
+		glow = hasGlow;
 	}
-	
+
 	/**
 	 * The research a player needs to have finished to be able to craft a wand with this rod. 
 	 */
-	public String getResearch() {
-		return "ROD_"+getTag();
+	public String getResearch()
+	{
+		return "ROD_" + getTag();
 	}
 
 	//  Some examples:
diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java
index 7224e12..c9c24f2 100644
--- a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java
+++ b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java
@@ -19,10 +19,11 @@ import net.minecraft.world.World;
  * @author azanor
  *
  */
-public class WandTriggerRegistry {
-	
-	private static HashMap<String,HashMap<List,List>> triggers = new HashMap<String,HashMap<List,List>>();
-	private static final String DEFAULT = "default";
+public class WandTriggerRegistry
+{
+
+	private static HashMap<String, HashMap<List, List>>	triggers	= new HashMap<String, HashMap<List, List>>();
+	private static final String							DEFAULT		= "default";
 
 	/**
 	 * Registers an action to perform when a casting wand right clicks on a specific block. 
@@ -33,49 +34,61 @@ public class WandTriggerRegistry {
 	 * @param meta send -1 as a wildcard value for all possible meta values
 	 * @param modid a unique identifier. It is best to register your own triggers using your mod id to avoid conflicts with mods that register triggers for the same block
 	 */
-	public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta, String modid) {
-		if (!triggers.containsKey(modid)) {
-			triggers.put(modid, new HashMap<List,List>());
+	public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta, String modid)
+	{
+		if(!triggers.containsKey(modid))
+		{
+			triggers.put(modid, new HashMap<List, List>());
 		}
-		HashMap<List,List> temp = triggers.get(modid);
-		temp.put(Arrays.asList(block,meta),Arrays.asList(manager,event));
+		final HashMap<List, List> temp = triggers.get(modid);
+		temp.put(Arrays.asList(block, meta), Arrays.asList(manager, event));
 		triggers.put(modid, temp);
 	}
-	
+
 	/**
 	 * for legacy support
 	 */
-	public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta) {
+	public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta)
+	{
 		registerWandBlockTrigger(manager, event, block, meta, DEFAULT);
 	}
-	
+
 	/**
 	 * Checks all trigger registries if one exists for the given block and meta
 	 * @param block
 	 * @param meta
 	 * @return
 	 */
-	public static boolean hasTrigger(Block block, int meta) {
-		for (String modid:triggers.keySet()) {
-			HashMap<List,List> temp = triggers.get(modid);
-			if (temp.containsKey(Arrays.asList(block,meta)) ||
-					temp.containsKey(Arrays.asList(block,-1))) return true;
+	public static boolean hasTrigger(Block block, int meta)
+	{
+		for(final String modid : triggers.keySet())
+		{
+			final HashMap<List, List> temp = triggers.get(modid);
+			if(temp.containsKey(Arrays.asList(block, meta)) || temp.containsKey(Arrays.asList(block, -1)))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
-	
+
 	/**
 	 * modid sensitive version
 	 */
-	public static boolean hasTrigger(Block block, int meta, String modid) {
-		if (!triggers.containsKey(modid)) return false;
-		HashMap<List,List> temp = triggers.get(modid);
-		if (temp.containsKey(Arrays.asList(block,meta)) ||
-				temp.containsKey(Arrays.asList(block,-1))) return true;
+	public static boolean hasTrigger(Block block, int meta, String modid)
+	{
+		if(!triggers.containsKey(modid))
+		{
+			return false;
+		}
+		final HashMap<List, List> temp = triggers.get(modid);
+		if(temp.containsKey(Arrays.asList(block, meta)) || temp.containsKey(Arrays.asList(block, -1)))
+		{
+			return true;
+		}
 		return false;
 	}
-	
-	
+
 	/**
 	 * This is called by the onItemUseFirst function in wands. 
 	 * Parameters and return value functions like you would expect for that function.
@@ -90,37 +103,56 @@ public class WandTriggerRegistry {
 	 * @param meta
 	 * @return
 	 */
-	public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, 
-			int x, int y, int z, int side, Block block, int meta) {
-		
-		for (String modid:triggers.keySet()) {
-			HashMap<List,List> temp = triggers.get(modid);
-			List l = temp.get(Arrays.asList(block,meta));
-			if (l==null) l = temp.get(Arrays.asList(block,-1));
-			if (l==null) continue;
-			
-			IWandTriggerManager manager = (IWandTriggerManager) l.get(0);
-			int event = (Integer) l.get(1);
-			boolean result = manager.performTrigger(world, wand, player, x, y, z, side, event);
-			if (result) return true;
+	public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side, Block block, int meta)
+	{
+
+		for(final String modid : triggers.keySet())
+		{
+			final HashMap<List, List> temp = triggers.get(modid);
+			List l = temp.get(Arrays.asList(block, meta));
+			if(l == null)
+			{
+				l = temp.get(Arrays.asList(block, -1));
+			}
+			if(l == null)
+			{
+				continue;
+			}
+
+			final IWandTriggerManager manager = (IWandTriggerManager) l.get(0);
+			final int event = (Integer) l.get(1);
+			final boolean result = manager.performTrigger(world, wand, player, x, y, z, side, event);
+			if(result)
+			{
+				return true;
+			}
 		}
 		return false;
 	}
-	
+
 	/**
 	 * modid sensitive version
 	 */
-	public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, 
-			int x, int y, int z, int side, Block block, int meta, String modid) {
-		if (!triggers.containsKey(modid)) return false;
-		HashMap<List,List> temp = triggers.get(modid);
-		List l = temp.get(Arrays.asList(block,meta));
-		if (l==null) l = temp.get(Arrays.asList(block,-1));
-		if (l==null) return false;
-		
-		IWandTriggerManager manager = (IWandTriggerManager) l.get(0);
-		int event = (Integer) l.get(1);
+	public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side, Block block, int meta, String modid)
+	{
+		if(!triggers.containsKey(modid))
+		{
+			return false;
+		}
+		final HashMap<List, List> temp = triggers.get(modid);
+		List l = temp.get(Arrays.asList(block, meta));
+		if(l == null)
+		{
+			l = temp.get(Arrays.asList(block, -1));
+		}
+		if(l == null)
+		{
+			return false;
+		}
+
+		final IWandTriggerManager manager = (IWandTriggerManager) l.get(0);
+		final int event = (Integer) l.get(1);
 		return manager.performTrigger(world, wand, player, x, y, z, side, event);
 	}
-		
+
 }
diff --git a/src/api/java/zeldaswordskills/api/item/ISword.java b/src/api/java/zeldaswordskills/api/item/ISword.java
index 793c97d..5a996fe 100644
--- a/src/api/java/zeldaswordskills/api/item/ISword.java
+++ b/src/api/java/zeldaswordskills/api/item/ISword.java
@@ -25,6 +25,7 @@ package zeldaswordskills.api.item;
  * {@link LeapingBlow}, {@link MortalDraw}, {@link RisingCut}, and {@link SwordBeam}
  *
  */
-public interface ISword {
+public interface ISword
+{
 
 }
diff --git a/src/api/java/zeldaswordskills/api/item/package-info.java b/src/api/java/zeldaswordskills/api/item/package-info.java
index ee7ca09..3719df9 100644
--- a/src/api/java/zeldaswordskills/api/item/package-info.java
+++ b/src/api/java/zeldaswordskills/api/item/package-info.java
@@ -2,3 +2,4 @@
 package zeldaswordskills.api.item;
 
 import cpw.mods.fml.common.API;
+
diff --git a/src/api/java/zeldaswordskills/api/package-info.java b/src/api/java/zeldaswordskills/api/package-info.java
index c253cb4..89fe947 100644
--- a/src/api/java/zeldaswordskills/api/package-info.java
+++ b/src/api/java/zeldaswordskills/api/package-info.java
@@ -2,3 +2,4 @@
 package zeldaswordskills.api;
 
 import cpw.mods.fml.common.API;
+
diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index d0546ca..585e944 100644
--- a/src/main/java/lance5057/tDefense/Reference.java
+++ b/src/main/java/lance5057/tDefense/Reference.java
@@ -4,7 +4,7 @@ public class Reference
 {
 
 	public static final String	MOD_ID		= "tinkersdefense";
-	public static final String	VERSION		= "1.3a";
+	public static final String	VERSION		= "1.3.6";
 	public static final String	MOD_NAME	= "Tinkers' Defense";
 
 }
diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java
index 46f301d..5544b05 100644
--- a/src/main/java/lance5057/tDefense/TD_Config.java
+++ b/src/main/java/lance5057/tDefense/TD_Config.java
@@ -38,7 +38,7 @@ public class TD_Config
 	public int[]	CrestLightID;
 
 	//public int		JokeInsultID;
-	public int		JokePyrotechID;
+	//public int		JokePyrotechID;
 	//public int		JokeCompensateID;
 
 	public int		SoulSteveID;
@@ -171,7 +171,7 @@ public class TD_Config
 		ScabbingModID = config.getInt("Scabbing Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
 
 		//JokeInsultID = config.getInt("Insult ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
-		JokePyrotechID = config.getInt("Pyrotech ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
+		//JokePyrotechID = config.getInt("Pyrotech ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
 
 		config.save();
 	}
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index 36d4241..5a79ef1 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -23,7 +23,7 @@ import lance5057.tDefense.core.blocks.RedMintBlock;
 import lance5057.tDefense.core.blocks.crestMount.CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
 import lance5057.tDefense.core.events.TDEventHandler;
-import lance5057.tDefense.core.items.GuideBook;
+//import lance5057.tDefense.core.items.GuideBook;
 import lance5057.tDefense.core.liquids.MoltenFluid;
 import lance5057.tDefense.core.network.PacketHandler;
 import lance5057.tDefense.core.tools.HeaterShield;
@@ -104,35 +104,35 @@ public class TinkersDefense
 
 	public static Modifiers						mods;
 
-	public static Item							item_Guidebook;
+	//public static Item							item_Guidebook;
 
-	public static Item							item_AeonSteelIngot;
-	public static Block							block_AeonSteelBlock;
-	public static Fluid							moltenAeonsteel;
-	public static Block							moltenAeonsteelBlock;
+	public static Item							item_aeonsteelIngot;
+	public static Block							block_aeonsteelBlock;
+	public static Fluid							moltenaeonsteel;
+	public static Block							moltenaeonsteelBlock;
 
-	public static Item							item_QueensGoldIngot;
-	public static Block							block_QueensGoldBlock;
-	public static Fluid							moltenQueensGold;
-	public static Block							moltenQueensGoldBlock;
+	public static Item							item_queensgoldIngot;
+	public static Block							block_queensgoldBlock;
+	public static Fluid							moltenqueensgold;
+	public static Block							moltenqueensgoldBlock;
 
-	public static Item							item_DogbeariumIngot;
-	public static Block							block_DogbeariumBlock;
-	public static Fluid							moltenDogbearium;
-	public static Block							moltenDogbeariumBlock;
+	public static Item							item_dogbeariumIngot;
+	public static Block							block_dogbeariumBlock;
+	public static Fluid							moltendogbearium;
+	public static Block							moltendogbeariumBlock;
 
-	public static Item							item_RedMintcane;
-	public static Item							item_GreenMintcane;
+	public static Item							item_redmintcane;
+	public static Item							item_greenmintcane;
 
-	public static Item							item_RedMintIngot;
-	public static Block							block_RedMintBlock;
-	public static Fluid							moltenRedMint;
-	public static Block							moltenRedMintBlock;
+	public static Item							item_redmintIngot;
+	public static Block							block_redmintBlock;
+	public static Fluid							moltenredmint;
+	public static Block							moltenredmintBlock;
 
-	public static Item							item_GreenMintIngot;
-	public static Block							block_GreenMintBlock;
-	public static Fluid							moltenGreenMint;
-	public static Block							moltenGreenMintBlock;
+	public static Item							item_greenmintIngot;
+	public static Block							block_greenmintBlock;
+	public static Fluid							moltengreenmint;
+	public static Block							moltengreenmintBlock;
 
 	//	public static Item							item_RawSapphire;
 	//	public static Item							item_RawRuby;
@@ -210,32 +210,32 @@ public class TinkersDefense
 		mods = new Modifiers();
 
 		//Blocks
-		block_CrestMount = new CrestMount().setHardness(4.0F).setStepSound(Block.soundTypeStone).setBlockName("CrestMount").setCreativeTab(tabName);
-		block_ArmorAnvil = new FinishingAnvil().setHardness(4.0F).setStepSound(Block.soundTypeAnvil).setBlockName("ArmorAnvil").setCreativeTab(tabName);
-		block_JewelersBench = new JewelersBench().setHardness(4.0F).setStepSound(Block.soundTypeWood).setBlockName("JewelersBench").setCreativeTab(tabName);
+		block_CrestMount = new CrestMount().setHardness(4.0F).setStepSound(Block.soundTypeStone).setBlockName("crestmount").setCreativeTab(tabName);
+		block_ArmorAnvil = new FinishingAnvil().setHardness(4.0F).setStepSound(Block.soundTypeAnvil).setBlockName("armoranvil").setCreativeTab(tabName);
+		block_JewelersBench = new JewelersBench().setHardness(4.0F).setStepSound(Block.soundTypeWood).setBlockName("jewelersbench").setCreativeTab(tabName);
 
-		block_AeonSteelBlock = new AeonSteelBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("AeonsteelBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":AeonsteelBlock");
-		block_QueensGoldBlock = new QueensGoldBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("QueensGoldBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":QueensGoldBlock");
-		block_DogbeariumBlock = new DogbeariumBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("DogbeariumBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":DogbeariumBlock");
-		block_RedMintBlock = new RedMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("RedMintBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":redmintblock");
-		block_GreenMintBlock = new GreenMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("GreenMintBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":greenmintblock");
+		block_aeonsteelBlock = new AeonSteelBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("aeonsteelblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":aeonsteelblock");
+		block_queensgoldBlock = new QueensGoldBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("queensgoldblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":queensgoldblock");
+		block_dogbeariumBlock = new DogbeariumBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("dogbeariumblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":dogbeariumblock");
+		block_redmintBlock = new RedMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("redmintblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":redmintblock");
+		block_greenmintBlock = new GreenMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("greenmintblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":greenmintblock");
 
 		//Items
-		item_Guidebook = new GuideBook();
-		item_AeonSteelIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("AeonsteelIngot").setTextureName(Reference.MOD_ID + ":AeonsteelIngot");
-		item_QueensGoldIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("QueensGoldIngot").setTextureName(Reference.MOD_ID + ":QueensGoldIngot");
-		item_DogbeariumIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("DogbeariumIngot").setTextureName(Reference.MOD_ID + ":DogbeariumIngot");
-		item_RedMintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("RedMintcane").setTextureName(Reference.MOD_ID + ":redmintcane");
-		item_RedMintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("RedMintIngot").setTextureName(Reference.MOD_ID + ":redmintingot");
-		item_GreenMintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("GreenMintcane").setTextureName(Reference.MOD_ID + ":greenmintcane");
-		item_GreenMintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("GreenMintIngot").setTextureName(Reference.MOD_ID + ":greenmintingot");
+		//item_Guidebook = new GuideBook();
+		item_aeonsteelIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("aeonsteelingot").setTextureName(Reference.MOD_ID + ":aeonsteelingot");
+		item_queensgoldIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("queensgoldingot").setTextureName(Reference.MOD_ID + ":queensgoldingot");
+		item_dogbeariumIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("dogbeariumingot").setTextureName(Reference.MOD_ID + ":dogbeariumingot");
+		item_redmintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("redmintcane").setTextureName(Reference.MOD_ID + ":redmintcane");
+		item_redmintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("redmintIngot").setTextureName(Reference.MOD_ID + ":redmintingot");
+		item_greenmintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("greenmintcane").setTextureName(Reference.MOD_ID + ":greenmintcane");
+		item_greenmintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("greenmintIngot").setTextureName(Reference.MOD_ID + ":greenmintingot");
 
 		//Fluids
-		moltenAeonsteel = new Fluid("moltenAeonsteel").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenQueensGold = new Fluid("moltenQueensGold").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenDogbearium = new Fluid("moltenDogbearium").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenRedMint = new Fluid("moltenRedMint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenGreenMint = new Fluid("moltenGreenMint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenaeonsteel = new Fluid("moltenaeonsteel").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenqueensgold = new Fluid("moltenqueensgold").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltendogbearium = new Fluid("moltendogbearium").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenredmint = new Fluid("moltenredmint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltengreenmint = new Fluid("moltengreenmint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
 
 		//Tools
 		tool_roundShield = new RoundShield();
@@ -251,26 +251,26 @@ public class TinkersDefense
 
 		//Minecraft Registrations
 		//Blocks
-		GameRegistry.registerBlock(block_CrestMount, "Block_CrestMount");
-		GameRegistry.registerBlock(block_ArmorAnvil, "Block_ArmorAnvil");
-		GameRegistry.registerBlock(block_JewelersBench, "Block_JewelersBench");
-		GameRegistry.registerBlock(block_AeonSteelBlock, "Aeonsteelblock");
-		GameRegistry.registerBlock(block_QueensGoldBlock, "QueensGoldblock");
-		GameRegistry.registerBlock(block_DogbeariumBlock, "Dogbeariumblock");
-		GameRegistry.registerBlock(block_RedMintBlock, "redmintblock");
-		GameRegistry.registerBlock(block_GreenMintBlock, "GreenMintblock");
+		GameRegistry.registerBlock(block_CrestMount, "block_crestmount");
+		GameRegistry.registerBlock(block_ArmorAnvil, "block_armoranvil");
+		GameRegistry.registerBlock(block_JewelersBench, "block_jewelersbench");
+		GameRegistry.registerBlock(block_aeonsteelBlock, "aeonsteelblock");
+		GameRegistry.registerBlock(block_queensgoldBlock, "queensgoldblock");
+		GameRegistry.registerBlock(block_dogbeariumBlock, "dogbeariumblock");
+		GameRegistry.registerBlock(block_redmintBlock, "redmintblock");
+		GameRegistry.registerBlock(block_greenmintBlock, "greenmintblock");
 
 		//Items
-		GameRegistry.registerItem(item_Guidebook, "guidebook");
+		//GameRegistry.registerItem(item_Guidebook, "guidebook");
 
-		GameRegistry.registerItem(item_AeonSteelIngot, "AeonsteelIngot");
-		GameRegistry.registerItem(item_QueensGoldIngot, "QueensGoldIngot");
-		GameRegistry.registerItem(item_DogbeariumIngot, "DogbeariumIngot");
+		GameRegistry.registerItem(item_aeonsteelIngot, "aeonsteelingot");
+		GameRegistry.registerItem(item_queensgoldIngot, "queensgoldingot");
+		GameRegistry.registerItem(item_dogbeariumIngot, "dogbeariumingot");
 
-		GameRegistry.registerItem(item_RedMintcane, "RedMintCane");
-		GameRegistry.registerItem(item_RedMintIngot, "RedMintIngot");
-		GameRegistry.registerItem(item_GreenMintcane, "GreenMintCane");
-		GameRegistry.registerItem(item_GreenMintIngot, "GreenMintIngot");
+		GameRegistry.registerItem(item_redmintcane, "redmintcane");
+		GameRegistry.registerItem(item_redmintIngot, "redmintingot");
+		GameRegistry.registerItem(item_greenmintcane, "greenmintcane");
+		GameRegistry.registerItem(item_greenmintIngot, "greenmintingot");
 
 		//Tools
 		GameRegistry.registerItem(tool_roundShield, "Round Shield");
@@ -286,29 +286,29 @@ public class TinkersDefense
 		GameRegistry.registerItem(metalPattern, "Cast");
 
 		//TileEntities
-		GameRegistry.registerTileEntity(TileEntity_CrestMount.class, "Tile_CrestMount");
-		GameRegistry.registerTileEntity(TileEntity_FinishingAnvil.class, "Tile_ArmorAnvil");
-		GameRegistry.registerTileEntity(TileEntity_JewelersBench.class, "Tile_JewelersBench");
+		GameRegistry.registerTileEntity(TileEntity_CrestMount.class, "tile_crestmount");
+		GameRegistry.registerTileEntity(TileEntity_FinishingAnvil.class, "tile_armoranvil");
+		GameRegistry.registerTileEntity(TileEntity_JewelersBench.class, "tile_jewelersbench");
 
 		//Fluids
-		FluidRegistry.registerFluid(moltenAeonsteel);
-		FluidRegistry.registerFluid(moltenQueensGold);
-		FluidRegistry.registerFluid(moltenDogbearium);
-		FluidRegistry.registerFluid(moltenRedMint);
-		FluidRegistry.registerFluid(moltenGreenMint);
+		FluidRegistry.registerFluid(moltenaeonsteel);
+		FluidRegistry.registerFluid(moltenqueensgold);
+		FluidRegistry.registerFluid(moltendogbearium);
+		FluidRegistry.registerFluid(moltenredmint);
+		FluidRegistry.registerFluid(moltengreenmint);
 
 		//FluidBlocks
-		moltenAeonsteelBlock = new MoltenFluid(moltenAeonsteel, "Aeonsteel");
-		moltenQueensGoldBlock = new MoltenFluid(moltenQueensGold, "QueensGold");
-		moltenDogbeariumBlock = new MoltenFluid(moltenDogbearium, "dogbearium");
-		moltenRedMintBlock = new MoltenFluid(moltenRedMint, "RedMint");
-		moltenGreenMintBlock = new MoltenFluid(moltenGreenMint, "GreenMint");
-
-		GameRegistry.registerBlock(moltenAeonsteelBlock, "moltenAeonsteel");
-		GameRegistry.registerBlock(moltenQueensGoldBlock, "moltenQueensGold");
-		GameRegistry.registerBlock(moltenDogbeariumBlock, "moltenDogbearium");
-		GameRegistry.registerBlock(moltenRedMintBlock, "moltenRedMint");
-		GameRegistry.registerBlock(moltenGreenMintBlock, "moltenGreenMint");
+		moltenaeonsteelBlock = new MoltenFluid(moltenaeonsteel, "aeonsteel");
+		moltenqueensgoldBlock = new MoltenFluid(moltenqueensgold, "queensgold");
+		moltendogbeariumBlock = new MoltenFluid(moltendogbearium, "dogbearium");
+		moltenredmintBlock = new MoltenFluid(moltenredmint, "redmint");
+		moltengreenmintBlock = new MoltenFluid(moltengreenmint, "greenmint");
+
+		GameRegistry.registerBlock(moltenaeonsteelBlock, "moltenaeonsteel");
+		GameRegistry.registerBlock(moltenqueensgoldBlock, "moltenqueensgold");
+		GameRegistry.registerBlock(moltendogbeariumBlock, "moltendogbearium");
+		GameRegistry.registerBlock(moltenredmintBlock, "moltenredmint");
+		GameRegistry.registerBlock(moltengreenmintBlock, "moltengreenmint");
 
 		//Recipes
 		GameRegistry.addShapedRecipe(new ItemStack(block_CrestMount), new Object[] {"xxx", "-i-", "---", 'x', new ItemStack(
@@ -316,23 +316,23 @@ public class TinkersDefense
 						TinkerTools.toolRod, 1, 1)});
 		GameRegistry.addShapedRecipe(new ItemStack(block_ArmorAnvil), new Object[] {"ai-", "lr-", "---", 'r', new ItemStack(
 				TinkerTools.toughRod, 1, 0), 'a', Blocks.anvil, 'i', Items.iron_ingot, 'l', Blocks.log});
-		GameRegistry.addShapedRecipe(new ItemStack(block_AeonSteelBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_AeonSteelIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_AeonSteelIngot, 9), new Object[] {new ItemStack(
-				block_AeonSteelBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_QueensGoldBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_QueensGoldIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_QueensGoldIngot, 9), new Object[] {new ItemStack(
-				block_QueensGoldBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_DogbeariumBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_DogbeariumIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_DogbeariumIngot, 9), new Object[] {new ItemStack(
-				block_DogbeariumBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_RedMintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
-				item_RedMintcane, 1, 2)});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_RedMintcane, 9, 2), new Object[] {new ItemStack(
-				block_RedMintBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_GreenMintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
-				item_GreenMintcane, 1, 3)});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_GreenMintcane, 9, 3), new Object[] {new ItemStack(
-				block_GreenMintBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_aeonsteelBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_aeonsteelIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_aeonsteelIngot, 9), new Object[] {new ItemStack(
+				block_aeonsteelBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_queensgoldBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_queensgoldIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_queensgoldIngot, 9), new Object[] {new ItemStack(
+				block_queensgoldBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_dogbeariumBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_dogbeariumIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_dogbeariumIngot, 9), new Object[] {new ItemStack(
+				block_dogbeariumBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_redmintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
+				item_redmintcane, 1, 2)});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_redmintcane, 9, 2), new Object[] {new ItemStack(
+				block_redmintBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_greenmintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
+				item_greenmintcane, 1, 3)});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_greenmintcane, 9, 3), new Object[] {new ItemStack(
+				block_greenmintBlock)});
 
 		//TinkersConstruct Registrations
 		//Tools
@@ -423,25 +423,159 @@ public class TinkersDefense
 
 		final PatternBuilder pb = PatternBuilder.instance;
 
+		//Shields
 		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
-				1,
 				0,
 				0,
-				new int[] {9, 0, 4, 0},
-				new int[] {2, 3, 2, 0},
+				6,
+				new int[] {0, 0, 4, 0},
+				new int[] {7, 3, 2, 0},
 				StatCollector.translateToLocal("gui.toolstation.roundshield.name"),
 				StatCollector.translateToLocal("gui.toolstation.roundshield.desc"),
-				"tinkersdefense", "textures/gui/icons2.png"));
+				"tinkersdefense", "textures/gui/icons.png"));
 
 		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
 				5,
-				0,
-				0,
-				new int[] {0, 0, 0, 0},
-				new int[] {2, 3, 2, 3},
+				1,
+				6,
+				new int[] {0, 8, 0, 2},
+				new int[] {7, 3, 7, 7},
 				StatCollector.translateToLocal("gui.toolstation.heatershield.name"),
 				StatCollector.translateToLocal("gui.toolstation.heatershield.desc"),
-				"tinkersdefense:", "textures/gui/icons2.png"));
+				"tinkersdefense:", "textures/gui/icons.png"));
+
+		//Cloth
+		//Hood
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 2, 6,
+				new int[] {4, 0, 4, 0}, new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.hood.name"),
+				StatCollector.translateToLocal("gui.toolstation.hood.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Shawl
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 3, 6,
+				new int[] {4, 0, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.shawl.name"),
+				StatCollector.translateToLocal("gui.toolstation.shawl.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Robe
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 4, 6,
+				new int[] {4, 3, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.robe.name"),
+				StatCollector.translateToLocal("gui.toolstation.robe.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Shoes
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 5, 6,
+				new int[] {4, 2, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.shoes.name"),
+				StatCollector.translateToLocal("gui.toolstation.shoes.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Chain
+		//Coif
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 6, 6,
+				new int[] {1, 8, 4, 0}, new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.coif.name"),
+				StatCollector.translateToLocal("gui.toolstation.coif.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Hauberk
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 7, 6,
+				new int[] {1, 9, 4, 0}, new int[] {7, 2, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.hauberk.name"),
+				StatCollector.translateToLocal("gui.toolstation.hauberk.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Chausses
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
+				0,
+				8,
+				6,
+				new int[] {1, 0, 4, 0},
+				new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.chausses.name"),
+				StatCollector.translateToLocal("gui.toolstation.chausses.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Boots
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 9, 6,
+				new int[] {1, 4, 2, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.boots.name"),
+				StatCollector.translateToLocal("gui.toolstation.boots.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Plate
+		//Helm
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(0, 10,
+				6,
+				new int[] {4, 8, 0, 1}, new int[] {2, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.helm.name"),
+				StatCollector.translateToLocal("gui.toolstation.helm.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Breastplate
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				11,
+				6,
+				new int[] {9, 8, 0, 1},
+				new int[] {2, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.breastplate.name"),
+				StatCollector.translateToLocal("gui.toolstation.breastplate.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Grieves
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				12,
+				6,
+				new int[] {0, 8, 1, 4},
+				new int[] {7, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.chausses.name"),
+				StatCollector.translateToLocal("gui.toolstation.chausses.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Sabatons
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				13,
+				6,
+				new int[] {0, 8, 0, 4},
+				new int[] {7, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.sabatons.name"),
+				StatCollector.translateToLocal("gui.toolstation.sabatons.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Gauntlets
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
+				0,
+				0,
+				8,
+				new int[] {0, 8, 2, 0},
+				new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.gauntlets.name"),
+				StatCollector.translateToLocal("gui.toolstation.gauntlets.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Zweihander
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				3,
+				8,
+				new int[] {6, 8, 2, 1},
+				new int[] {3, 3, 3, 2},
+				StatCollector.translateToLocal("gui.toolstation.zweihander.name"),
+				StatCollector.translateToLocal("gui.toolstation.zweihander.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Wrench
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 1, 8,
+				new int[] {3, 0, 1, 0},
+				new int[] {3, 3, 3, 0},
+				StatCollector.translateToLocal("gui.toolstation.wrench.name"),
+				StatCollector.translateToLocal("gui.toolstation.wrench.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Shears
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 2, 8,
+				new int[] {7, 1, 7, 0},
+				new int[] {2, 3, 2, 0},
+				StatCollector.translateToLocal("gui.toolstation.shears.name"),
+				StatCollector.translateToLocal("gui.toolstation.shears.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
 
 		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
 				0, 50, "tinkersdefense", "textures/gui/icons.png"));
@@ -454,7 +588,7 @@ public class TinkersDefense
 		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
 				0, 54, "tinkersdefense", "textures/gui/icons.png"));
 
-		// Aeonsteel
+		// aeonsteel
 		pb.registerMaterialSet("aeonsteel", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.AeonsteelMatID);
@@ -464,31 +598,31 @@ public class TinkersDefense
 		// Tool Materials: id, name, harvestlevel, durability, speed, damage,
 		// handlemodifier, reinforced, shoddy, style color, primary color for
 		// block use
-		TConstructRegistry.addToolMaterial(config.AeonsteelMatID, "AeonSteel", 4, 822, 1100, 3, 1.6F, 2, 0f, LIGHT_PURPLE.toString(), 0xb565e6);
-		TinkerTools.registerPatternMaterial("AeonSteelIngot", 2, "AeonSteel");
+		TConstructRegistry.addToolMaterial(config.AeonsteelMatID, "aeonsteel", 4, 822, 1100, 3, 1.6F, 2, 0f, LIGHT_PURPLE.toString(), 0xb565e6);
+		TinkerTools.registerPatternMaterial("aeonsteelIngot", 2, "aeonsteel");
 		TConstructRegistry.addDefaultToolPartMaterial(config.AeonsteelMatID);
 
-		Smeltery.addMelting(new ItemStack(item_AeonSteelIngot, 1, 0), block_AeonSteelBlock, 0, 500, new FluidStack(
-				moltenAeonsteel, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_AeonSteelBlock, 0, 500, new FluidStack(
-				moltenAeonsteel, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_aeonsteelIngot, 1, 0), block_aeonsteelBlock, 0, 500, new FluidStack(
+				moltenaeonsteel, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_aeonsteelBlock, 0, 500, new FluidStack(
+				moltenaeonsteel, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_AeonSteelIngot, 1, 0), new FluidStack(moltenAeonsteel,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_aeonsteelIngot, 1, 0), new FluidStack(moltenaeonsteel,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_AeonSteelBlock, 1, 0), new FluidStack(moltenAeonsteel,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_aeonsteelBlock, 1, 0), new FluidStack(moltenaeonsteel,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenAeonsteel, config.AeonsteelMatID);
+		castmolten(moltenaeonsteel, config.AeonsteelMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_AeonSteelIngot, 1, 0), 2, "Aeonsteel", new ItemStack(
+				item_aeonsteelIngot, 1, 0), 2, "aeonsteel", new ItemStack(
 						TinkerTools.toolShard, 1, config.AeonsteelMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.AeonsteelMatID), config.AeonsteelMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenAeonsteel, 144), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltenaeonsteel, 144), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenAlumiteFluid, 144), new FluidStack(
 						TinkerSmeltery.moltenCobaltFluid, 144)});
 
@@ -498,129 +632,129 @@ public class TinkersDefense
 						TinkerTools.toolRod, 1, 10), config.QueensGoldMatID);
 
 		TConstructClientRegistry.addMaterialRenderMapping(config.QueensGoldMatID, "tinker", "queensgold", true);
-		TConstructRegistry.addToolMaterial(config.QueensGoldMatID, "QueensGold", 3, 100, 500, 2, 1.0F, 0, 0f, GOLD.toString(), 0xeaee57);
-		TinkerTools.registerPatternMaterial("QueensGoldIngot", 2, "QueensGold");
+		TConstructRegistry.addToolMaterial(config.QueensGoldMatID, "queensgold", 3, 100, 500, 2, 1.0F, 0, 0f, GOLD.toString(), 0xeaee57);
+		TinkerTools.registerPatternMaterial("queensgoldIngot", 2, "queensgold");
 		TConstructRegistry.addDefaultToolPartMaterial(config.QueensGoldMatID);
 
-		Smeltery.addMelting(new ItemStack(item_QueensGoldIngot, 1, 0), block_QueensGoldBlock, 0, 500, new FluidStack(
-				moltenQueensGold, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_QueensGoldBlock, 0, 500, new FluidStack(
-				moltenQueensGold, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_queensgoldIngot, 1, 0), block_queensgoldBlock, 0, 500, new FluidStack(
+				moltenqueensgold, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_queensgoldBlock, 0, 500, new FluidStack(
+				moltenqueensgold, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_QueensGoldIngot, 1, 0), new FluidStack(moltenQueensGold,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_queensgoldIngot, 1, 0), new FluidStack(moltenqueensgold,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_QueensGoldBlock, 1, 0), new FluidStack(moltenQueensGold,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_queensgoldBlock, 1, 0), new FluidStack(moltenqueensgold,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenQueensGold, config.QueensGoldMatID);
+		castmolten(moltenqueensgold, config.QueensGoldMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_QueensGoldIngot, 1, 0), 2, "QueensGold", new ItemStack(
+				item_queensgoldIngot, 1, 0), 2, "queensgold", new ItemStack(
 						TinkerTools.toolShard, 1, config.QueensGoldMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.QueensGoldMatID), config.QueensGoldMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenQueensGold, 144 * 8), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltenqueensgold, 144 * 8), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenGoldFluid, 144 * 8), new FluidStack(
 						TinkerSmeltery.moltenEmeraldFluid, 80)});
 
-		// Dogbearium
+		// dogbearium
 		pb.registerMaterialSet("dogbearium", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.DogbeariumMatID);
 
 		TConstructClientRegistry.addMaterialRenderMapping(config.DogbeariumMatID, "tinker", "dogbearium", true);
-		TConstructRegistry.addToolMaterial(config.DogbeariumMatID, "Dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
-		TinkerTools.registerPatternMaterial("DogbeariumIngot", 2, "Dogbearium");
+		TConstructRegistry.addToolMaterial(config.DogbeariumMatID, "dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
+		TinkerTools.registerPatternMaterial("dogbeariumIngot", 2, "dogbearium");
 		TConstructRegistry.addDefaultToolPartMaterial(config.DogbeariumMatID);
 
-		Smeltery.addMelting(new ItemStack(item_DogbeariumIngot, 1, 0), block_DogbeariumBlock, 0, 500, new FluidStack(
-				moltenDogbearium, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_DogbeariumBlock, 0, 500, new FluidStack(
-				moltenDogbearium, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_dogbeariumIngot, 1, 0), block_dogbeariumBlock, 0, 500, new FluidStack(
+				moltendogbearium, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_dogbeariumBlock, 0, 500, new FluidStack(
+				moltendogbearium, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_DogbeariumIngot, 1, 0), new FluidStack(moltenDogbearium,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_dogbeariumIngot, 1, 0), new FluidStack(moltendogbearium,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_DogbeariumBlock, 1, 0), new FluidStack(moltenDogbearium,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_dogbeariumBlock, 1, 0), new FluidStack(moltendogbearium,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenDogbearium, config.DogbeariumMatID);
+		castmolten(moltendogbearium, config.DogbeariumMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_DogbeariumIngot, 1, 0), 2, "Dogbearium", new ItemStack(
+				item_dogbeariumIngot, 1, 0), 2, "dogbearium", new ItemStack(
 						TinkerTools.toolShard, 1, config.DogbeariumMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.DogbeariumMatID), config.DogbeariumMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenDogbearium, 144 * 2), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltendogbearium, 144 * 2), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenArditeFluid, 144), new FluidStack(
 						TinkerSmeltery.bloodFluid, 160), new FluidStack(
 								TinkerSmeltery.moltenEnderFluid, 250)});
 
 		//Red Mint
-		pb.registerMaterialSet("RedMint", new ItemStack(TinkerTools.toolShard,
+		pb.registerMaterialSet("redmint", new ItemStack(TinkerTools.toolShard,
 				1, 10), new ItemStack(TinkerTools.toolRod, 1, 10), config.RedMintMatID);
 
-		TConstructClientRegistry.addMaterialRenderMapping(config.RedMintMatID, "tinker", "RedMint", true);
-		TConstructRegistry.addToolMaterial(config.RedMintMatID, "RedMint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0xFF0000);
-		TinkerTools.registerPatternMaterial("RedMintIngot", 2, "RedMint");
+		TConstructClientRegistry.addMaterialRenderMapping(config.RedMintMatID, "tinker", "redmint", true);
+		TConstructRegistry.addToolMaterial(config.RedMintMatID, "redmint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0xFF0000);
+		TinkerTools.registerPatternMaterial("redmintIngot", 2, "redmint");
 		TConstructRegistry.addDefaultToolPartMaterial(config.RedMintMatID);
 
-		Smeltery.addMelting(new ItemStack(item_RedMintcane, 1, 0), block_RedMintBlock, 0, 250, new FluidStack(
-				moltenRedMint, TConstruct.chunkLiquidValue));
-		Smeltery.addMelting(new ItemStack(item_RedMintIngot, 1, 0), block_RedMintBlock, 0, 500, new FluidStack(
-				moltenRedMint, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_RedMintBlock, 0, 500, new FluidStack(
-				moltenRedMint, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_redmintcane, 1, 0), block_redmintBlock, 0, 250, new FluidStack(
+				moltenredmint, TConstruct.chunkLiquidValue));
+		Smeltery.addMelting(new ItemStack(item_redmintIngot, 1, 0), block_redmintBlock, 0, 500, new FluidStack(
+				moltenredmint, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_redmintBlock, 0, 500, new FluidStack(
+				moltenredmint, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_RedMintIngot, 1, 0), new FluidStack(moltenRedMint,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_redmintIngot, 1, 0), new FluidStack(moltenredmint,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_RedMintBlock, 1, 0), new FluidStack(moltenRedMint,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_redmintBlock, 1, 0), new FluidStack(moltenredmint,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenRedMint, config.RedMintMatID);
+		castmolten(moltenredmint, config.RedMintMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_RedMintcane, 1, 0), 2, "RedMint", new ItemStack(
+				item_redmintcane, 1, 0), 2, "redmint", new ItemStack(
 						TinkerTools.toolShard, 1, config.RedMintMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.RedMintMatID), config.RedMintMatID);
 
 		//Green Mint
-		pb.registerMaterialSet("GreenMint", new ItemStack(
+		pb.registerMaterialSet("greenmint", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.GreenMintMatID);
 
-		TConstructClientRegistry.addMaterialRenderMapping(config.GreenMintMatID, "tinker", "GreenMint", true);
-		TConstructRegistry.addToolMaterial(config.GreenMintMatID, "GreenMint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0x5bde4b);
-		TinkerTools.registerPatternMaterial("GreenMintIngot", 2, "GreenMint");
+		TConstructClientRegistry.addMaterialRenderMapping(config.GreenMintMatID, "tinker", "greenmint", true);
+		TConstructRegistry.addToolMaterial(config.GreenMintMatID, "greenmint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0x5bde4b);
+		TinkerTools.registerPatternMaterial("greenmintIngot", 2, "greenmint");
 		TConstructRegistry.addDefaultToolPartMaterial(config.GreenMintMatID);
 
-		Smeltery.addMelting(new ItemStack(item_GreenMintcane, 1, 0), block_GreenMintBlock, 0, 250, new FluidStack(
-				moltenGreenMint, TConstruct.chunkLiquidValue));
-		Smeltery.addMelting(new ItemStack(item_GreenMintIngot, 1, 0), block_GreenMintBlock, 0, 500, new FluidStack(
-				moltenGreenMint, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_GreenMintBlock, 0, 500, new FluidStack(
-				moltenGreenMint, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_greenmintcane, 1, 0), block_greenmintBlock, 0, 250, new FluidStack(
+				moltengreenmint, TConstruct.chunkLiquidValue));
+		Smeltery.addMelting(new ItemStack(item_greenmintIngot, 1, 0), block_greenmintBlock, 0, 500, new FluidStack(
+				moltengreenmint, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_greenmintBlock, 0, 500, new FluidStack(
+				moltengreenmint, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_GreenMintIngot, 1, 0), new FluidStack(moltenGreenMint,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_greenmintIngot, 1, 0), new FluidStack(moltengreenmint,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_GreenMintBlock, 1, 0), new FluidStack(moltenGreenMint,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_greenmintBlock, 1, 0), new FluidStack(moltengreenmint,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenGreenMint, config.GreenMintMatID);
+		castmolten(moltengreenmint, config.GreenMintMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_GreenMintcane, 1, 0), 2, "GreenMint", new ItemStack(
+				item_greenmintcane, 1, 0), 2, "greenmint", new ItemStack(
 						TinkerTools.toolShard, 1, config.GreenMintMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.GreenMintMatID), config.GreenMintMatID);
 
@@ -692,8 +826,8 @@ public class TinkersDefense
 		tcInject = new Injector(0);
 		GameRegistry.registerItem(tcInject, "???");
 
-		GameRegistry.addShapelessRecipe(new ItemStack(item_Guidebook), new ItemStack(
-				Items.book), new ItemStack(partArmorplate, 1, -1));
+		//		GameRegistry.addShapelessRecipe(new ItemStack(item_Guidebook), new ItemStack(
+		//				Items.book), new ItemStack(partArmorplate, 1, -1));
 
 		mods.Init();
 
@@ -724,88 +858,88 @@ public class TinkersDefense
 		}
 	}
 
-	public void castMolten(Fluid fluid, int ID)
+	public void castmolten(Fluid fluid, int ID)
 	{
 		// .addCastingRecipe(output, fluid, cast, hardeningDelay)
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toolRod, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("toolRodCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.pickaxeHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("pickaxeHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.shovelHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("shovelHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.hatchetHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("hatchetHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.swordBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("swordBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.fullGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("fullGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.wideGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("wideGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.crossbar, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("crossbarCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.binding, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("bindingCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.handGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("handGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.frypanHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("frypanHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.signHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("signHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.knifeBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("knifeBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.chiselHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("chiselHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toughRod, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("toughRodCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toughBinding, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("toughBindingCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.largePlate, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("largePlateCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.broadAxeHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("broadAxeHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.scytheBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("scytheHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.excavatorHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("excavatorHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.largeSwordBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("largeBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.hammerHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("hammerHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.arrowhead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("arrowheadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partArmorplate, 1, ID), new FluidStack(fluid,
 						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 2), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partRivet, 1, ID), new FluidStack(fluid, (int) (144 * 0.5D)), new ItemStack(
 						metalPattern, 1, 0), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partClasp, 1, ID), new FluidStack(fluid, (int) (144 * 1.0D)), new ItemStack(
 						metalPattern, 1, 1), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partChainmaille, 1, ID), new FluidStack(fluid,
 						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 3), 50);
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 56645ac..87188f5 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -4,6 +4,7 @@ import lance5057.tDefense.TDIntegration;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
+import lance5057.tDefense.core.tools.modifiers.Modifiers;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,14 +33,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true)})
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.item.IPixieSpawner", striprefs = true)})
 public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor, IPixieSpawner
 {
 	int				slot;
 	public float	reductionPercent	= 0f;
 	protected int	maxReduction		= 100;
 
-	public String[]	renderParts;
+	//public String[]	renderParts;
 
 	//Thaumcraft
 	boolean			Charge				= false;
@@ -208,7 +209,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
 	{
 
-		TinkersDefense.mods.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
+		Modifiers.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
 	}
 
 	@Override
@@ -276,17 +277,17 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 			case 3:
 				renderReturn = extraStrings.get(tags.getInteger("RenderExtra"));
 				break;
-
-			default:
-				if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
-				{
-					final String effect = effectStrings.get(tags.getInteger("Effect" + (pass - getPartAmount())));
-					if(effect != null)
-						return effect.substring(effect.lastIndexOf("/") + 1);
-					else
-						return "";
-
-				}
+				//
+				//			default:
+				//				if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
+				//				{
+				//					final String effect = effectStrings.get(tags.getInteger("Effect" + (pass - getPartAmount())));
+				//					if(effect != null)
+				//						return effect.substring(effect.lastIndexOf("/") + 1);
+				//					else
+				//						return "";
+				//
+				//				}
 		}
 		if(renderReturn != null && renderReturn != "")
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
index a877515..2aca64c 100644
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
@@ -68,9 +68,9 @@ public class TDArmorAddon
 			{
 				return ToolBuilder.instance.buildTool(new ItemStack(
 						TinkerTools.largePlate, 1, 2), new ItemStack(
-								TinkerTools.toughRod, 1, 2), new ItemStack(
-										TinkersDefense.partArmorplate, 1, 2), new ItemStack(
-												TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
+						TinkerTools.toughRod, 1, 2), new ItemStack(
+						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
+						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
 			}
 
 		};
@@ -139,7 +139,7 @@ public class TDArmorAddon
 	public void init(FMLInitializationEvent e)
 	{
 
-		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkerTools.toughRod);
+		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
 		TConstructRegistry.addToolRecipe(armor_TinkerBreastplate, TinkerTools.largePlate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
 		TConstructRegistry.addToolRecipe(armor_TinkerGrieves, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partChainmaille, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerSabatons, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
@@ -150,7 +150,7 @@ public class TDArmorAddon
 		TConstructRegistry.addToolRecipe(armor_TinkerHood, TinkersDefense.partCloth, TinkerTools.toolRod, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerShoes, TinkersDefense.partCloth, TinkersDefense.partRivet, TinkersDefense.partCloth);
 
-		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkerTools.toughRod);
+		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkerTools.toughRod, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerHauberk, TinkersDefense.partChainmaille, TinkerTools.largePlate, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerChausses, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerBoots, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkersDefense.partRivet);
diff --git a/src/main/java/lance5057/tDefense/armor/TDHelmet.java b/src/main/java/lance5057/tDefense/armor/TDHelmet.java
deleted file mode 100644
index 89bfb44..0000000
--- a/src/main/java/lance5057/tDefense/armor/TDHelmet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package lance5057.tDefense.armor;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.nodes.IRevealer;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-import cpw.mods.fml.common.Optional;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.wand.IWandHUD", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
-public abstract class TDHelmet extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-{
-
-	public TDHelmet(int baseProtection, int slot)
-	{
-		super(baseProtection, slot);
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	public boolean canSeeLPBar(ItemStack stack)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
index 3bbe32e..13648c2 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
@@ -1,43 +1,30 @@
 package lance5057.tDefense.armor.blocks;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Random;
-import java.util.Set;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Direction;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class GlowstoneCrumbs extends Block
 {
 	public GlowstoneCrumbs()
 	{
 		super(Material.ground);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
-		this.setBlockName("glowstonecrumbs");
-		this.setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
-		this.setLightLevel(1f);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
+		setBlockName("glowstonecrumbs");
+		setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
+		setLightLevel(1f);
 	}
 
 	/**
 	 * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
 	 * cleared to be reused)
 	 */
+	@Override
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
 	{
 		return null;
@@ -47,6 +34,7 @@ public class GlowstoneCrumbs extends Block
 	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
 	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
 	 */
+	@Override
 	public boolean isOpaqueCube()
 	{
 		return false;
@@ -55,6 +43,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
 	 */
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -63,11 +52,13 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * The type of render function that is called for this block
 	 */
+	@Override
 	public int getRenderType()
 	{
 		return 23;
 	}
 
+	@Override
 	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
 	{
 		return null;
@@ -76,27 +67,30 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
 	 */
+	@Override
 	public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
 	{
-		return super.canPlaceBlockAt(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
+		return super.canPlaceBlockAt(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
 	}
 
 	/**
 	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
 	 * their own) Args: x, y, z, neighbor Block
 	 */
+	@Override
 	public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
 	{
 		super.onNeighborBlockChange(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_);
-		this.checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
+		checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
 	}
 
 	/**
 	 * Ticks the block if it's been scheduled
 	 */
+	@Override
 	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
 	{
-		this.checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
+		checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
 	}
 
 	/**
@@ -104,7 +98,7 @@ public class GlowstoneCrumbs extends Block
 	 */
 	protected void checkAndDropBlock(World p_149855_1_, int p_149855_2_, int p_149855_3_, int p_149855_4_)
 	{
-		if(!this.canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_))
+		if(!canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_))
 		{
 			p_149855_1_.setBlock(p_149855_2_, p_149855_3_, p_149855_4_, getBlockById(0), 0, 2);
 		}
@@ -113,6 +107,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
 	 */
+	@Override
 	public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
 	{
 		return p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isNormalCube(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_) && !p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isAir(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_);
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
index f6ca02c..adf0c44 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
@@ -6,7 +6,6 @@ import java.util.Random;
 import lance5057.tDefense.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
@@ -29,29 +28,31 @@ public class UnstableBlock extends Block
 	public UnstableBlock()
 	{
 		super(Material.rock);
-		this.setBlockName("unstable");
-		this.setBlockTextureName("unstable");
-		this.setTickRandomly(true);
+		setBlockName("unstable");
+		setBlockTextureName("unstable");
+		setTickRandomly(true);
 	}
 
 	/**
 	 * Gets the block's texture. Args: side, meta
 	 */
+	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(int p_149691_1_, int p_149691_2_)
 	{
-		if(p_149691_2_ < 0 || p_149691_2_ >= this.field_150095_b.length)
+		if(p_149691_2_ < 0 || p_149691_2_ >= field_150095_b.length)
 		{
 			p_149691_2_ = 0;
 		}
 
-		return this.field_150095_b[p_149691_2_];
+		return field_150095_b[p_149691_2_];
 	}
 
 	/**
 	 * Determines the damage on the item the block drops. Used in cloth and
 	 * wood.
 	 */
+	@Override
 	public int damageDropped(int p_149692_1_)
 	{
 		return p_149692_1_;
@@ -61,6 +62,7 @@ public class UnstableBlock extends Block
 	 * returns a list of blocks with the same ID, but different meta (eg: wood
 	 * returns 4 blocks)
 	 */
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_)
 	{
@@ -68,22 +70,25 @@ public class UnstableBlock extends Block
 		p_149666_3_.add(new ItemStack(p_149666_1_, 1, 1));
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister p_149651_1_)
 	{
-		this.field_150095_b = new IIcon[field_150096_a.length];
+		field_150095_b = new IIcon[field_150096_a.length];
 
-		for(int i = 0; i < this.field_150095_b.length; ++i)
+		for(int i = 0; i < field_150095_b.length; ++i)
 		{
-			this.field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + this.getTextureName() + field_150096_a[i]);
+			field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + getTextureName() + field_150096_a[i]);
 		}
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public int getRenderBlockPass()
 	{
 		return 1;
 	}
+
 	@Override
 	public void breakBlock(World par1World, int par2, int par3, int par4, Block p_149749_5_, int meta)
 	{
@@ -103,7 +108,7 @@ public class UnstableBlock extends Block
 	@Override
 	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
 	{
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+		final int meta = par1World.getBlockMetadata(par2, par3, par4);
 
 		if(meta == 0)
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
index 04770c4..2461704 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
@@ -1,6 +1,5 @@
 package lance5057.tDefense.armor.blocks;
 
-import lance5057.tDefense.armor.TDArmorAddon;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
@@ -16,6 +15,6 @@ public class UnstableItemBlock extends ItemBlockWithMetadata
 	@Override
 	public String getUnlocalizedName(ItemStack stack)
 	{
-		return this.getUnlocalizedName() + "_" + ((UnstableBlock) TDArmorAddon.block_Unstable).types[stack.getItemDamage()];
+		return this.getUnlocalizedName() + "_" + UnstableBlock.types[stack.getItemDamage()];
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
index a548922..fd15b98 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
@@ -2,23 +2,14 @@ package lance5057.tDefense.armor.events;
 
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.items.cloth.TinkersRobe;
-import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
-import lance5057.tDefense.armor.items.light.TinkersChausses;
-import lance5057.tDefense.armor.modifiers.ArmorMods;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class ArmorModEvents
 {
@@ -27,55 +18,67 @@ public class ArmorModEvents
 	{
 		int epf = 0;
 
-		if(event.entityLiving instanceof EntityPlayer)
+		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
 		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
+			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+					event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
 		}
 
 		for(int i = 0; i < 4; i++)
 		{
-			ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
+			final ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
 			if(armor != null && armor.getItem() instanceof ArmorCore)
 			{
-				NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
+				final NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
 
 				if(!event.source.isUnblockable())
 				{
 					if(tags.hasKey("Protection"))
+					{
 						epf += (calcModifierDamage(tags.getInteger("Protection"), 1f, event.source));
+					}
 					else if(tags.hasKey("Fire Protection") && event.source.isFireDamage())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Fire Protection"), 2f, event.source));
+					}
 					else if(tags.hasKey("Blast Protection") && event.source.isExplosion())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Blast Protection"), 2f, event.source));
+					}
 					else if(tags.hasKey("Projectile Protection") && event.source.isProjectile())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Projectile Protection"), 2f, event.source));
+					}
 				}
-				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == event.source.fall.getDamageType())
+				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == DamageSource.fall.getDamageType())
+				{
 					epf += (calcModifierDamage(tags.getInteger("Featherfall"), 3f, event.source));
+				}
 			}
 		}
 
 		if(epf > 20)
+		{
 			epf = 20;
+		}
 
-		float adjustedPerc = (float) (1f - (epf * 0.04));
+		final float adjustedPerc = (float) (1f - (epf * 0.04));
 		event.ammount = adjustedPerc * event.ammount;
- 
+
 		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
 		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
+			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+					event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
 		}
 	}
 
 	public int calcModifierDamage(int level, float typeMod, DamageSource source)
 	{
 		if(source.canHarmInCreative())
-		{
 			return 0;
-		}
 		else
 		{
-			float f = (float) (6 + level * level) / 3.0F;
+			final float f = (6 + level * level) / 3.0F;
 			return MathHelper.floor_float(f * typeMod);
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
index adaf76a..535dc35 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
@@ -1,15 +1,14 @@
 package lance5057.tDefense.armor.events;
 
-import tconstruct.armor.ArmorProxyClient;
-import tconstruct.armor.player.ArmorExtended;
-import tconstruct.library.tools.ToolCore;
 import lance5057.tDefense.armor.ArmorCore;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.client.event.RenderPlayerEvent;
+import tconstruct.armor.ArmorProxyClient;
+import tconstruct.armor.player.ArmorExtended;
+import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -23,22 +22,22 @@ public class ArmorRenderEvent
 	{
 		if(event.entityPlayer != null)
 		{
-			ArmorExtended armorEx = ArmorProxyClient.armorExtended;
+			final ArmorExtended armorEx = ArmorProxyClient.armorExtended;
 
-			ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
+			final ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
 
 			if(Armor != null && Armor.getItem() instanceof ArmorCore)
 			{
-				ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
+				final ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
 
 				TrimArmor(armorModel, event);
 			}
 
-			ItemStack Accessory = armorEx.getStackInSlot(event.slot);
+			final ItemStack Accessory = armorEx.getStackInSlot(event.slot);
 
 			if(Accessory != null && Accessory.getItem() instanceof ToolCore)
 			{
-				ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
+				final ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
 
 				TrimArmor(accessoryModel, event);
 			}
@@ -58,14 +57,14 @@ public class ArmorRenderEvent
 
 			if(event.entityPlayer instanceof EntityPlayer)
 			{
-				ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
+				final ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
 				armorModel.heldItemRight = 0;
 				armorModel.aimedBow = false;
 				if(itemstack != null)
 				{
 					if(event.entityPlayer.getItemInUseCount() > 0)
 					{
-						EnumAction enumaction = itemstack.getItemUseAction();
+						final EnumAction enumaction = itemstack.getItemUseAction();
 
 						if(enumaction == EnumAction.block)
 						{
@@ -83,10 +82,10 @@ public class ArmorRenderEvent
 				}
 			}
 
-			float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
-			float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
-			float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
-			float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
+			final float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
+			final float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
+			final float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
+			final float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
 
 			armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
 			armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index ec775a2..7259d48 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -1,21 +1,27 @@
 package lance5057.tDefense.armor.items.cloth;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
+import thaumcraft.api.IGoggles;
 import thaumcraft.api.IVisDiscountGear;
 import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.nodes.IRevealer;
 import vazkii.botania.api.mana.IManaDiscountArmor;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
 import cpw.mods.fml.common.Optional;
 
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDiscountArmor
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor
 {
 	public TinkersHood()
 	{
@@ -145,4 +151,32 @@ public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDisc
 		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
 		return i;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
index 143cab0..12fed96 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -1,15 +1,24 @@
 package lance5057.tDefense.armor.items.heavy;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-
-public class TinkersHelm extends TDHelmet
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.nodes.IRevealer;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
+import cpw.mods.fml.common.Optional;
+
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
+public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
 {
 	public TinkersHelm()
 	{
@@ -28,7 +37,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partChainmaille;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
@@ -40,7 +49,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getExtraItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partChainmaille;
 	}
 
 	@Override
@@ -129,4 +138,32 @@ public class TinkersHelm extends TDHelmet
 	{
 		return ClientProxy.helm;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
index 71b0199..5014bf9 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -1,7 +1,7 @@
 package lance5057.tDefense.armor.items.light;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
@@ -10,9 +10,16 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-
-public class TinkersCoif extends TDHelmet
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.nodes.IRevealer;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
+import cpw.mods.fml.common.Optional;
+
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
+public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
 {
 	public TinkersCoif()
 	{
@@ -31,13 +38,13 @@ public class TinkersCoif extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partCloth;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
 	public Item getAccessoryItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partCloth;
 	}
 
 	@Override
@@ -80,9 +87,9 @@ public class TinkersCoif extends TDHelmet
 			case 1:
 				return "_coif_chain_broken";
 			case 2:
-				return "_coif_cloth";
-			case 3:
 				return "_coif_circlet";
+			case 3:
+				return "_coif_cloth";
 			default:
 				return "";
 		}
@@ -139,4 +146,32 @@ public class TinkersCoif extends TDHelmet
 		// TODO Auto-generated method stub
 		return ClientProxy.coif;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
index bbd6ad3..208031f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
@@ -79,34 +79,34 @@ public class ArmorMods extends ModifiersBase
 	{
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"-c-", "ses", "-s-", 'c', new ItemStack(
 				Items.coal, 1, 1), 's', new ItemStack(Blocks.sapling, 1), 'e', new ItemStack(
-				modItems, 1, 1)});
+						modItems, 1, 1)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 1), new Object[] {"gsg", "lil", "gig", 'g', new ItemStack(
 				Items.gold_nugget, 1, 0), 's', new ItemStack(Items.slime_ball,
-				1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
-				Items.iron_ingot, 1, 0)});
+						1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
+								Items.iron_ingot, 1, 0)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
 				Items.slime_ball, 1, 0), 'e', new ItemStack(modItems, 1, 1), 'i', new ItemStack(
-				TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
-				Items.dye, 1, 4)});
+						TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
+								Items.dye, 1, 4)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 3), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
 				Items.potionitem, 1, 8262), 'e', new ItemStack(
-				Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
-				1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
+						Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
+								1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"ggg", "ala", "ggg", 'g', new ItemStack(
 				Blocks.glowstone, 1, 0), 'a', new ItemStack(
-				Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+						Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"lol", "oao", "lol", 'o', new ItemStack(
 				Blocks.obsidian, 1, 0), 'a', TConstructRegistry.getItemStack("ingotArdite"), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 7), new Object[] {"fgf", 'g', new ItemStack(
 				Items.gold_nugget, 1, 0), 'f', new ItemStack(Items.feather, 1,
-				0)});
+						0)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"ili", "lcl", "ili", 'l', new ItemStack(
 				Blocks.lapis_block, 1, 0), 'i', new ItemStack(Blocks.ice, 1, 0), 'c', TConstructRegistry.getItemStack("ingotCobalt")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 8), new Object[] {"-b-", "rlr", "-s-", 'b', new ItemStack(
 				Items.leather_boots, 1, 0), 'l', new ItemStack(Items.leather,
-				1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
-				Items.slime_ball, 1, 0)});
+						1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
+								Items.slime_ball, 1, 0)});
 
 		if(TDIntegration.thaumcraft)
 		{
@@ -164,7 +164,7 @@ public class ArmorMods extends ModifiersBase
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate,
 						1, 2)}, TinkersDefense.config.ArmorProtectionID, 1,
-				EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
+						EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(Items.magma_cream, 1)},
 				TinkersDefense.config.ArmorFireProtectionID, 1,
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
index d81d05f..a2f9235 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
@@ -13,18 +13,27 @@ import tconstruct.library.client.TConstructClientRegistry;
 import tconstruct.library.crafting.ModifyBuilder;
 import tconstruct.library.tools.ToolCore;
 import vazkii.botania.common.item.ModItems;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class BotaniaArmorMods extends ModifiersBase
 {
 	public BotaniaArmorMods()
 	{
-		super(null, "modItemsBotaniaArmor");
+		super(new String[] {"elementiumcore"}, "modItemsBotaniaArmor");
 	}
 
 	@Override
 	public void RegisterRecipes()
 	{
+		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+				ModItems.manaResource, 1, 7), 's', new ItemStack(
+				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+				ModItems.manaResource, 1, 2)});
 
+		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+				ModItems.manaResource, 1, 7), 's', new ItemStack(
+				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+				ModItems.manaResource, 1, 1)});
 	}
 
 	@Override
@@ -36,9 +45,16 @@ public class BotaniaArmorMods extends ModifiersBase
 				1, EnumChatFormatting.AQUA.toString(), "Mana Embroidery",
 				new String[] {"cloth"}, 1, new String[] {}));
 
+		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+				new ItemStack[] {new ItemStack(modItems, 1, 4)},
+				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
+				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
+				new String[] {"armor"}, 1, new String[] {}));
+
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorManaDiscountModID, "tinker", "manaembroidery", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
 
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
index 986c03e..145764f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
@@ -5,9 +5,6 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.modifier.ItemModifier;
-import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.ToolCore;
 import tconstruct.modifiers.tools.ModInteger;
 
@@ -33,8 +30,8 @@ public class modifierProtection extends ModInteger
 	{
 		if(tool.getItem() instanceof ToolCore)
 		{
-			List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-			NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+			final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 			if(list.contains("heavyarmor") || list.contains("lightarmor"))
 			{
@@ -45,9 +42,13 @@ public class modifierProtection extends ModInteger
 						if(tags.hasKey(types[i]))
 						{
 							if(types[i] != type)
+							{
 								return false;
+							}
 							if(types[i] == type && tags.getInteger(types[i]) > 5)
+							{
 								return false;
+							}
 						}
 					}
 					return true;
@@ -69,7 +70,7 @@ public class modifierProtection extends ModInteger
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		if(tags.hasKey(key))
 		{
 			int increase = tags.getInteger(key);
diff --git a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
index 021a607..480c153 100644
--- a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
+++ b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
@@ -10,19 +10,23 @@ public class Cloth extends CraftingItem implements IToolPart
 	public Cloth()
 	{
 		super(toolMaterialNames, buildTextureNames("_cloth"), "parts/", "tinker", TConstructRegistry.materialTab);
-		this.setHasSubtypes(true);
-		this.setMaxDamage(0);
+		setHasSubtypes(true);
+		setMaxDamage(0);
 	}
 
 	private static String[] buildTextureNames(String textureType)
 	{
-		String[] names = new String[toolMaterialNames.length];
+		final String[] names = new String[toolMaterialNames.length];
 		for(int i = 0; i < toolMaterialNames.length; i++)
 		{
 			if(toolTextureNames[i].equals(""))
+			{
 				names[i] = "";
+			}
 			else
+			{
 				names[i] = toolTextureNames[i] + textureType;
+			}
 		}
 		return names;
 	}
@@ -34,7 +38,9 @@ public class Cloth extends CraftingItem implements IToolPart
 	public int getMaterialID(ItemStack stack)
 	{
 		if(stack.getItemDamage() >= toolMaterialNames.length)
+		{
 			return -1;
+		}
 		return stack.getItemDamage();
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
index 9841c80..3a35160 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
@@ -1,16 +1,11 @@
 package lance5057.tDefense.armor.renderers;
 
-import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.FMLClientHandler;
-
 /**
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
@@ -27,20 +22,20 @@ public class ModelSheath extends ArmorRenderer
 	{
 		super(0.5f, 0, 64, 64);
 
-		this.textureWidth = 64;
-		this.textureHeight = 64;
+		textureWidth = 64;
+		textureHeight = 64;
 
-		this.belt = new ModelRenderer(this, 16, 32);
-		this.belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
-		this.belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
-		this.setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
-		this.bipedBody.addChild(belt);
+		belt = new ModelRenderer(this, 16, 32);
+		belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
+		belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
+		setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
+		bipedBody.addChild(belt);
 
-		this.sheath = new ModelRenderer(this, 0, 32);
-		this.sheath.setRotationPoint(0f, 0f, 0f);
-		this.sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
-		this.setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
-		this.bipedBody.addChild(sheath);
+		sheath = new ModelRenderer(this, 0, 32);
+		sheath.setRotationPoint(0f, 0f, 0f);
+		sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
+		setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
+		bipedBody.addChild(sheath);
 	}
 
 	@Override
@@ -50,13 +45,13 @@ public class ModelSheath extends ArmorRenderer
 
 		for(int i = 0; i < 10; i++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
 				super.render(entity, f, f1, f2, f3, f4, f5);
 
 				GL11.glPopMatrix();
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
index d40b416..b64c0d9 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
@@ -40,147 +40,172 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
-		KnuckleSpikesL = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesL = new ModelRenderer(this, "Knuckle Spikes Left");
+		KnuckleSpikesL.setTextureOffset(56, 40);
 		KnuckleSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesL.addBox(3.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesL);
 
-		KnuckleSpikesBackL = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesBackL = new ModelRenderer(this, "Knuckle Spikes Back Left");
+		KnuckleSpikesBackL.setTextureOffset(56, 40);
 		KnuckleSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesBackL.addBox(3.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesBackL);
 
-		KnuckleL = new ModelRenderer(this, 0, 41);
+		KnuckleL = new ModelRenderer(this, "Knuckle Left");
+		KnuckleL.setTextureOffset(0, 41);
 		KnuckleL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleL.addBox(0.1F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
 		bipedLeftArm.addChild(KnuckleL);
 
-		ArmSpikesR = new ModelRenderer(this, 56, 32);
+		ArmSpikesR = new ModelRenderer(this, "Arm Spikes Right");
+		ArmSpikesR.setTextureOffset(56, 32);
 		ArmSpikesR.mirror = true;
 		ArmSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesR.addBox(-7.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(ArmSpikesR);
 
-		RebraceL = new ModelRenderer(this, 14, 40);
+		RebraceL = new ModelRenderer(this, "Rebrace Left");
+		RebraceL.setTextureOffset(14, 40);
 		RebraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		RebraceL.addBox(-1.1F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
 		bipedLeftArm.addChild(RebraceL);
 
-		BoltL = new ModelRenderer(this, 16, 32);
+		BoltL = new ModelRenderer(this, "Bolt Left");
+		BoltL.setTextureOffset(16, 32);
 		BoltL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		BoltL.addBox(-5.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
 		setRotateAngle(BoltL, 0.0F, 0.0F, -0.7853981633974483F);
 		bipedLeftArm.addChild(BoltL);
 
-		KnuckleSpikesBackR = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesBackR = new ModelRenderer(this,
+				"Knuckle Spikes Back Right");
+		KnuckleSpikesBackR.setTextureOffset(56, 40);
 		KnuckleSpikesBackR.mirror = true;
 		KnuckleSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesBackR.addBox(-7.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesBackR);
 
-		GloveR = new ModelRenderer(this, 0, 32);
+		GloveR = new ModelRenderer(this, "Glove Right");
+		GloveR.setTextureOffset(0, 32);
 		GloveR.mirror = true;
 		GloveR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GloveR.addBox(-3.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
 		bipedRightArm.addChild(GloveR);
 
-		BoltR = new ModelRenderer(this, 16, 32);
+		BoltR = new ModelRenderer(this, "Bolt Right");
+		BoltR.setTextureOffset(16, 32);
 		BoltR.mirror = true;
 		BoltR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		BoltR.addBox(3.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
 		setRotateAngle(BoltR, 0.0F, 0.0F, 0.7853981633974483F);
 		bipedRightArm.addChild(BoltR);
 
-		KnuckleR = new ModelRenderer(this, 0, 41);
+		KnuckleR = new ModelRenderer(this, "Knuckle Right");
+		KnuckleR.setTextureOffset(0, 41);
 		KnuckleR.mirror = true;
 		KnuckleR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleR.addBox(-2.9F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
 		bipedRightArm.addChild(KnuckleR);
 
-		KnuckleSpikesR = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesR = new ModelRenderer(this, "Knuckle Spikes Right");
+		KnuckleSpikesR.setTextureOffset(56, 40);
 		KnuckleSpikesR.mirror = true;
 		KnuckleSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesR.addBox(-7.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesR);
 
-		KnuckleSpikesMidL = new ModelRenderer(this, 54, 48);
+		KnuckleSpikesMidL = new ModelRenderer(this, "Knuckle Spikes Mid Left");
+		KnuckleSpikesMidL.setTextureOffset(54, 48);
 		KnuckleSpikesMidL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesMidL.addBox(3.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesMidL);
 
-		ArmSpikesBackL = new ModelRenderer(this, 56, 32);
+		ArmSpikesBackL = new ModelRenderer(this, "Arm Spikes Back Left");
+		ArmSpikesBackL.setTextureOffset(56, 32);
 		ArmSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesBackL.addBox(3.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(ArmSpikesBackL);
 
-		ArmSpikesBackR = new ModelRenderer(this, 56, 32);
+		ArmSpikesBackR = new ModelRenderer(this, "Arm Spikes Back Right");
+		ArmSpikesBackR.setTextureOffset(56, 32);
 		ArmSpikesBackR.mirror = true;
 		ArmSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesBackR.addBox(-7.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(ArmSpikesBackR);
 
-		VambraceR = new ModelRenderer(this, 0, 56);
+		VambraceR = new ModelRenderer(this, "Vambrace Right");
+		VambraceR.setTextureOffset(0, 56);
 		VambraceR.mirror = true;
 		VambraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		VambraceR.addBox(-3.6F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
 		setRotateAngle(VambraceR, 0.0F, 0.0F, -0.08726646259971647F);
 		bipedRightArm.addChild(VambraceR);
 
-		GemR = new ModelRenderer(this, 0, 48);
+		GemR = new ModelRenderer(this, "Gem Right");
+		GemR.setTextureOffset(0, 48);
 		GemR.mirror = true;
 		GemR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GemR.addBox(-4.2F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
 		bipedRightArm.addChild(GemR);
 
-		RebraceR = new ModelRenderer(this, 14, 40);
+		RebraceR = new ModelRenderer(this, "Rebrace Right");
+		RebraceR.setTextureOffset(14, 40);
 		RebraceR.mirror = true;
 		RebraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		RebraceR.addBox(-1.9F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
 		bipedRightArm.addChild(RebraceR);
 
-		SettingR = new ModelRenderer(this, 12, 49);
+		SettingR = new ModelRenderer(this, "Setting Right");
+		SettingR.setTextureOffset(12, 49);
 		SettingR.mirror = true;
 		SettingR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		SettingR.addBox(-3.7F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
 		bipedRightArm.addChild(SettingR);
 
-		GloveL = new ModelRenderer(this, 0, 32);
+		GloveL = new ModelRenderer(this, "Glove Left");
+		GloveL.setTextureOffset(0, 32);
 		GloveL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GloveL.addBox(-1.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
 		bipedLeftArm.addChild(GloveL);
 
-		GemL = new ModelRenderer(this, 0, 48);
+		GemL = new ModelRenderer(this, "Gem Left");
+		GemL.setTextureOffset(0, 48);
 		GemL.mirror = true;
 		GemL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GemL.addBox(2.4F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
 		bipedLeftArm.addChild(GemL);
 
-		VambraceL = new ModelRenderer(this, 0, 56);
+		VambraceL = new ModelRenderer(this, "Vambrace Left");
+		VambraceL.setTextureOffset(0, 56);
 		VambraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		VambraceL.addBox(0.8F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
 		setRotateAngle(VambraceL, 0.0F, 0.0F, 0.08726646259971647F);
 		bipedLeftArm.addChild(VambraceL);
 
-		KnuckleSpikesMidR = new ModelRenderer(this, 54, 48);
+		KnuckleSpikesMidR = new ModelRenderer(this, "Knuckle Spikes Mid Right");
+		KnuckleSpikesMidR.setTextureOffset(54, 48);
 		KnuckleSpikesMidR.mirror = true;
 		KnuckleSpikesMidR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesMidR.addBox(-8.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesMidR);
 
-		SettingL = new ModelRenderer(this, 12, 49);
+		SettingL = new ModelRenderer(this, "Setting Left");
+		SettingL.setTextureOffset(12, 49);
 		SettingL.mirror = true;
 		SettingL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		SettingL.addBox(2.9F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
 		bipedLeftArm.addChild(SettingL);
 
-		ArmSpikesL = new ModelRenderer(this, 56, 32);
+		ArmSpikesL = new ModelRenderer(this, "Arm Spikes Left");
+		ArmSpikesL.setTextureOffset(56, 32);
 		ArmSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesL.addBox(3.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
@@ -200,6 +225,8 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		KnuckleSpikesR.isHidden = true;
 		SettingL.isHidden = true;
 		SettingR.isHidden = true;
+
+		init();
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
index fe92f2b..2bce53e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
@@ -1,58 +1,56 @@
 package lance5057.tDefense.armor.renderers;
 
 import lance5057.tDefense.armor.ArmorCore;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
+import org.lwjgl.opengl.GL11;
+
 /**
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
  */
-public class ModelTinkersTabard  extends ArmorRenderer
+public class ModelTinkersTabard extends ArmorRenderer
 {
-    public ModelRenderer Tabard;
-    public ModelRenderer TabardBottomF;
-    public ModelRenderer TabardBottomB;
+	public ModelRenderer	Tabard;
+	public ModelRenderer	TabardBottomF;
+	public ModelRenderer	TabardBottomB;
+
+	public ModelTinkersTabard()
+	{
+		super(0.5f, 0, 64, 64);
+
+		textureWidth = 64;
+		textureHeight = 64;
+
+		Tabard = new ModelRenderer(this, 0, 32);
+		Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
+		Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
+
+		TabardBottomF = new ModelRenderer(this, 26, 32);
+		TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
+		TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
+		TabardBottomB = new ModelRenderer(this, 26, 32);
+		TabardBottomB.mirror = true;
 
-    public ModelTinkersTabard() 
-    {
-    	super(0.5f, 0, 64, 64);
-    	
-        this.textureWidth = 64;
-        this.textureHeight = 64;
-        
-        this.Tabard = new ModelRenderer(this, 0, 32);
-        this.Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
-        this.Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
-        
-        this.TabardBottomF = new ModelRenderer(this, 26, 32);
-        this.TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
-        this.TabardBottomB = new ModelRenderer(this, 26, 32);
-        this.TabardBottomB.mirror = true;
-        
-        this.TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
-    }
+		TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
+		TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
+	}
 
-    @Override
-    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) 
-    { 
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+	{
 		GL11.glPushMatrix();
 
 		for(int i = 0; i < 10; i++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
 				super.render(entity, f, f1, f2, f3, f4, f5);
 
 				GL11.glPopMatrix();
@@ -60,14 +58,15 @@ public class ModelTinkersTabard  extends ArmorRenderer
 		}
 
 		GL11.glPopMatrix();
-    }
+	}
 
-    /**
-     * This is a helper function from Tabula to set the rotation of model parts
-     */
-    public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
-        modelRenderer.rotateAngleX = x;
-        modelRenderer.rotateAngleY = y;
-        modelRenderer.rotateAngleZ = z;
-    }
+	/**
+	 * This is a helper function from Tabula to set the rotation of model parts
+	 */
+	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
+	{
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
index 0fd14bd..f97f7ba 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -23,17 +23,19 @@ public class ModelTinkersHood extends ArmorRenderer
 	public ModelRenderer	Tip_2;
 	public ModelRenderer	ScarfExtra;
 	public ModelRenderer	ScarfExtra_1;
+	public ModelRenderer	BandExtra;
+	public ModelRenderer	BandExtra_1;
 
 	public ModelTinkersHood()
 	{
-		super(0.1f, 0, 128, 64);
+		super(0.2f, 0, 128, 64);
 
 		textureWidth = 128;
 		textureHeight = 64;
 
 		bipedHeadwear = new ModelRenderer(this, "Headwear");
 		bipedHeadwear.setTextureOffset(32, 0);
-		bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.1f + 0.5F);
+		bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.2f + 0.5F);
 		bipedHeadwear.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
 
 		Flop = new ModelRenderer(this, "Flop");
@@ -90,7 +92,7 @@ public class ModelTinkersHood extends ArmorRenderer
 		bipedHead.addChild(HatTopTall);
 
 		Rim = new ModelRenderer(this, "Rim");
-		Rim.setTextureOffset(64, 20);
+		Rim.setTextureOffset(65, 20);
 		Rim.setRotationPoint(0.0F, 0.0F, 0.0F);
 		Rim.addBox(-6.0F, -5.5F, -6.0F, 12, 1, 12, 0.1F);
 		bipedHead.addChild(Rim);
@@ -105,9 +107,23 @@ public class ModelTinkersHood extends ArmorRenderer
 		Band = new ModelRenderer(this, "Band");
 		Band.setTextureOffset(64, 9);
 		Band.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Band.addBox(-4.5F, -6.7F, -4.5F, 9, 2, 9, 0.2F);
+		Band.addBox(-4.5F, -7F, -4.5F, 9, 3, 9, -0.3F);
 		bipedHead.addChild(Band);
 
+		BandExtra = new ModelRenderer(this, "BandExtra");
+		BandExtra.setTextureOffset(44, 32);
+		BandExtra.setRotationPoint(0.0F, 0.0F, 0.0F);
+		BandExtra.addBox(0.2F, -6.0F, 3.4F, 3, 5, 1, -0.3F);
+		setRotateAngle(BandExtra, 0.0F, 0.0F, -0.17453292519943295F);
+		bipedHead.addChild(BandExtra);
+
+		BandExtra_1 = new ModelRenderer(this, "BandExtra 1");
+		BandExtra_1.setTextureOffset(36, 32);
+		BandExtra_1.setRotationPoint(0.0F, 0.0F, 0.0F);
+		BandExtra_1.addBox(-3.2F, -6.0F, 3.4F, 3, 7, 1, -0.3F);
+		setRotateAngle(BandExtra_1, 0.0F, 0.0F, 0.17453292519943295F);
+		bipedHead.addChild(BandExtra_1);
+
 		Tip = new ModelRenderer(this, "Tip");
 		Tip.setTextureOffset(0, 44);
 		Tip.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
index 534f917..9eccca3 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
@@ -188,6 +188,17 @@ public class ModelTinkersGrieves extends ArmorRenderer
 		setRotateAngle(CenterBackR, 0.08726646259971647F, 0.0F, 0.0F);
 		bipedRightLeg.addChild(CenterBackR);
 
+		SecBeltL.isHidden = true;
+		SecBeltR.isHidden = true;
+		CenterBackL.isHidden = true;
+		CenterBackR.isHidden = true;
+		CenterFrontL.isHidden = true;
+		CenterFrontR.isHidden = true;
+		LeftBackL.isHidden = true;
+		LeftFrontL.isHidden = true;
+		RightBackL.isHidden = true;
+		RightFrontL.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
index 8e35b7c..0238b75 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
@@ -204,6 +204,22 @@ public class ModelTinkersHelm extends ArmorRenderer
 		HornL_2.addChild(HornTipL_2);
 		HornR_2.addChild(HornTipR_2);
 
+		HornL.isHidden = true;
+		HornR.isHidden = true;
+		HornL_1.isHidden = true;
+		HornL_2.isHidden = true;
+		HornR_1.isHidden = true;
+		HornR_2.isHidden = true;
+		FeatherBase.isHidden = true;
+		FeatherRod.isHidden = true;
+		Feathers.isHidden = true;
+		Spike1.isHidden = true;
+		Spike2.isHidden = true;
+		SpikeBase.isHidden = true;
+		WingL.isHidden = true;
+		WingR.isHidden = true;
+		Helm2.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
index 3294e83..f700e93 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -25,10 +25,21 @@ public class ModelTinkersBoots extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
+		bipedRightLeg = new ModelRenderer(this, "Right Leg");
+		bipedRightLeg.setTextureOffset(0, 16);
+		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
+
+		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
+		bipedLeftLeg.setTextureOffset(0, 16);
+		bipedLeftLeg.mirror = true;
+		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
+
 		FootR = new ModelRenderer(this, "FootR");
 		FootR.setTextureOffset(0, 41);
 		FootR.setRotationPoint(0f, 0f, 0f);
-		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedRightLeg.addChild(FootR);
 
 		BootTopR = new ModelRenderer(this, "BootTopR");
@@ -61,7 +72,7 @@ public class ModelTinkersBoots extends ArmorRenderer
 		FootL.setTextureOffset(0, 41);
 		FootL.mirror = true;
 		FootL.setRotationPoint(0f, 0f, 0f);
-		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedLeftLeg.addChild(FootL);
 
 		LegGuardL = new ModelRenderer(this, "LegGuardL");
@@ -82,6 +93,8 @@ public class ModelTinkersBoots extends ArmorRenderer
 		BootTopR.isHidden = true;
 		FootTipL.isHidden = true;
 		FootTipR.isHidden = true;
+		LegGuardL.isHidden = true;
+		LegGuardR.isHidden = true;
 
 		init();
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
index b667ef2..f2eb795 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -40,7 +40,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
 
 		HipGuardR = new ModelRenderer(this, "Hip Guard Right");
-		HipGuardR.setTextureOffset(0, 49);
+		HipGuardR.setTextureOffset(10, 37);
 		HipGuardR.setRotationPoint(0f, 0f, 0f);
 		HipGuardR.addBox(-2.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
 		setRotateAngle(HipGuardR, 0.0F, 0.0F, 0.17453292519943295F);
@@ -55,19 +55,19 @@ public class ModelTinkersChausses extends ArmorRenderer
 		FrontR = new ModelRenderer(this, "Front Right");
 		FrontR.setTextureOffset(0, 40);
 		FrontR.setRotationPoint(1.9f, 0f, -0.1f);
-		FrontR.addBox(-2.0F, 0.0F, -2.4F, 4, 7, 1, 0.0F);
+		FrontR.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
 		setRotateAngle(FrontR, -0.1F, 0.0F, 0.0f);
 		bipedRightLeg.addChild(FrontR);
 
 		FrontL = new ModelRenderer(this, "Front Left");
 		FrontL.setTextureOffset(0, 40);
 		FrontL.setRotationPoint(-1.9f, 0f, -0.1f);
-		FrontL.addBox(-2.0F, 0.0F, -2.4F, 4, 7, 1, 0.0F);
+		FrontL.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
 		setRotateAngle(FrontL, -0.1F, 0.0F, 0.0f);
 		bipedLeftLeg.addChild(FrontL);
 
 		HipGuardL_1 = new ModelRenderer(this, "Hip Guard Left 2");
-		HipGuardL_1.setTextureOffset(10, 37);
+		HipGuardL_1.setTextureOffset(0, 49);
 		HipGuardL_1.mirror = true;
 		HipGuardL_1.setRotationPoint(0f, 0f, 0f);
 		HipGuardL_1.addBox(-1.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
@@ -90,7 +90,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.addChild(BeltL);
 
 		HipGuardR_1 = new ModelRenderer(this, "Hip Guard Right 2");
-		HipGuardR_1.setTextureOffset(10, 37);
+		HipGuardR_1.setTextureOffset(0, 49);
 		HipGuardR_1.setRotationPoint(0f, 0f, 0f);
 		HipGuardR_1.addBox(-2.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
 		setRotateAngle(HipGuardR_1, 0.0F, 0.0F, 0.08726646259971647F);
@@ -99,24 +99,31 @@ public class ModelTinkersChausses extends ArmorRenderer
 		BackR = new ModelRenderer(this, "Back Right");
 		BackR.setTextureOffset(0, 40);
 		BackR.setRotationPoint(1.9f, 0f, 0f);
-		BackR.addBox(-2.0F, 0.0F, 1.2F, 4, 7, 1, 0.0F);
+		BackR.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
 		setRotateAngle(BackR, 0.1F, 0.0F, 0.0f);
 		bipedRightLeg.addChild(BackR);
 
 		BackL = new ModelRenderer(this, "Back Light");
 		BackL.setTextureOffset(0, 40);
 		BackL.setRotationPoint(-1.9f, 0f, 0f);
-		BackL.addBox(-2.0F, 0.0F, 1.2F, 4, 7, 1, 0.0F);
+		BackL.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
 		setRotateAngle(BackL, 0.1F, 0.0F, 0.0f);
 		bipedLeftLeg.addChild(BackL);
 
 		HipGuardL = new ModelRenderer(this, "Hip Guard Left");
-		HipGuardL.setTextureOffset(0, 48);
+		HipGuardL.setTextureOffset(10, 37);
 		HipGuardL.mirror = true;
 		HipGuardL.setRotationPoint(0f, 0f, 0f);
 		HipGuardL.addBox(-1.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
 		setRotateAngle(HipGuardL, 0.0F, 0.0F, -0.17453292519943295F);
 		bipedLeftLeg.addChild(HipGuardL);
+
+		BeltL.isHidden = true;
+		BeltR.isHidden = true;
+		HipGuardL_1.isHidden = true;
+		HipGuardR_1.isHidden = true;
+
+		init();
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
index 44a64d7..7496f00 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -75,9 +75,16 @@ public class ModelTinkersCoif extends ArmorRenderer
 		Coif = new ModelRenderer(this, "Coif");
 		Coif.setTextureOffset(0, 32);
 		Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.5F);
+		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.6F);
 		bipedHead.addChild(Coif);
 
+		Mask.isHidden = true;
+		Mohawk.isHidden = true;
+		MohawkL.isHidden = true;
+		MohawkR.isHidden = true;
+		WingL.isHidden = true;
+		WingR.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
index d68c816..68e92aa 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
@@ -34,6 +34,22 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
+		bipedBody = new ModelRenderer(this, "Body");
+		bipedBody.setTextureOffset(16, 16);
+		bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.05f);
+		bipedBody.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
+
+		bipedRightArm = new ModelRenderer(this, "Right Arm");
+		bipedRightArm.setTextureOffset(40, 16);
+		bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedRightArm.setRotationPoint(-5.0F, 2.0F + 0, 0.0F);
+
+		bipedLeftArm = new ModelRenderer(this, "Left Arm");
+		bipedLeftArm.setTextureOffset(40, 16);
+		bipedLeftArm.mirror = true;
+		bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedLeftArm.setRotationPoint(5.0F, 2.0F + 0, 0.0F);
+
 		ChestBelt_1 = new ModelRenderer(this, "ChestBelt_1");
 		ChestBelt_1.setTextureOffset(0, 57);
 		ChestBelt_1.setRotationPoint(0.0F, 0.0F, 0.0F);
@@ -157,6 +173,16 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		ChestBelt.addBox(-4.5F, 3.0F, -2.5F, 9, 2, 5, -0.19F);
 		bipedBody.addChild(ChestBelt);
 
+		//ChestBelt.isHidden = true;
+		ChestBelt_1.isHidden = true;
+		ChestBelt_2.isHidden = true;
+		ChestBeltL.isHidden = true;
+		ChestBeltL_1.isHidden = true;
+		ChestBeltR.isHidden = true;
+		ChestBeltR_1.isHidden = true;
+		PauldronFlairL.isHidden = true;
+		PauldronFlairR.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java b/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
index c2985c5..8f5608c 100644
--- a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
+++ b/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
@@ -24,7 +24,7 @@ public class Renderer_JewelersBench extends TileEntitySpecialRenderer
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
 		final ResourceLocation textures = (new ResourceLocation(
-				"tinkersdefense:textures/blocks/JewelersBench.png"));
+				"tinkersdefense:textures/blocks/jewelersbench.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
diff --git a/src/main/java/lance5057/tDefense/core/TD_Patterns.java b/src/main/java/lance5057/tDefense/core/TD_Patterns.java
index af9d735..0f31dc2 100644
--- a/src/main/java/lance5057/tDefense/core/TD_Patterns.java
+++ b/src/main/java/lance5057/tDefense/core/TD_Patterns.java
@@ -16,14 +16,16 @@ public class TD_Patterns extends Pattern
 	{
 		super(patternName, getPatternNames(patternName, patternType), "patterns/");
 
-		this.setUnlocalizedName(Reference.prefix(name));
+		setUnlocalizedName(Reference.prefix(name));
 	}
 
 	public static String[] getPatternNames(String[] patternName, String partType)
 	{
-		String[] names = new String[patternName.length];
+		final String[] names = new String[patternName.length];
 		for(int i = 0; i < patternName.length; i++)
+		{
 			names[i] = partType + patternName[i];
+		}
 		return names;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
index e9e4550..91c076a 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
@@ -25,7 +25,8 @@ public class Container_CrestMount extends Container
 		{
 			for(int x = 0; x < 9; x++)
 			{
-				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, 84 + y * 18));
+				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9,
+						8 + 18 * x, 84 + y * 18));
 			}
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
index f366b2d..507bef4 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
@@ -27,7 +27,7 @@ public class CrestMount extends BlockContainer
 	public CrestMount()
 	{
 		super(Material.iron);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 	}
 
 	@Override
@@ -40,11 +40,9 @@ public class CrestMount extends BlockContainer
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
 	{
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(tileEntity == null || player.isSneaking())
-		{
 			return false;
-		}
 		//code to open gui explained later
 		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_CREST_INV, player.worldObj, x, y, z);
 		return true;
@@ -59,33 +57,33 @@ public class CrestMount extends BlockContainer
 
 	private void dropItems(World world, int x, int y, int z)
 	{
-		Random rand = new Random();
+		final Random rand = new Random();
 
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(!(tileEntity instanceof IInventory))
-		{
 			return;
-		}
-		IInventory inventory = (IInventory) tileEntity;
+		final IInventory inventory = (IInventory) tileEntity;
 
 		for(int i = 0; i < inventory.getSizeInventory(); i++)
 		{
-			ItemStack item = inventory.getStackInSlot(i);
+			final ItemStack item = inventory.getStackInSlot(i);
 
 			if(item != null && item.stackSize > 0)
 			{
-				float rx = rand.nextFloat() * 0.8F + 0.1F;
-				float ry = rand.nextFloat() * 0.8F + 0.1F;
-				float rz = rand.nextFloat() * 0.8F + 0.1F;
+				final float rx = rand.nextFloat() * 0.8F + 0.1F;
+				final float ry = rand.nextFloat() * 0.8F + 0.1F;
+				final float rz = rand.nextFloat() * 0.8F + 0.1F;
 
-				EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
+				final EntityItem entityItem = new EntityItem(world, x + rx,
+						y + ry, z + rz, new ItemStack(item.getItem(),
+								item.stackSize, item.getItemDamage()));
 
 				if(item.hasTagCompound())
 				{
 					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
 				}
 
-				float factor = 0.05F;
+				final float factor = 0.05F;
 				entityItem.motionX = rand.nextGaussian() * factor;
 				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
 				entityItem.motionZ = rand.nextGaussian() * factor;
@@ -110,6 +108,7 @@ public class CrestMount extends BlockContainer
 	}
 
 	//It's not a normal block, so you need this too.
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -120,13 +119,13 @@ public class CrestMount extends BlockContainer
 	@Override
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("tinkersdefense:Item_CrestMount");
+		blockIcon = icon.registerIcon("tinkersdefense:item_crestmount");
 	}
 
 	@Override
 	public TileEntity createNewTileEntity(World w, int md)
 	{
-		TileEntity_CrestMount te = new TileEntity_CrestMount();
+		final TileEntity_CrestMount te = new TileEntity_CrestMount();
 		return te;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
index ae2aafd..1cb2a2f 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
@@ -11,17 +11,16 @@ import org.lwjgl.opengl.GL11;
 
 public class Gui_CrestMount extends GuiContainer
 {
-	private float							xSize_lo;
-	private float							ySize_lo;
-
-	private static final ResourceLocation	iconLocation	= new ResourceLocation("tinkersdefense", "textures/gui/crest_mount.png");
+	private static final ResourceLocation	iconLocation	= new ResourceLocation(
+			"tinkersdefense",
+			"textures/gui/crest_mount.png");
 
 	private final TileEntity_CrestMount		inventory;
 
 	public Gui_CrestMount(InventoryPlayer invPlayer, TileEntity_CrestMount te_crest)
 	{
 		super(new Container_CrestMount(invPlayer, te_crest));
-		this.inventory = te_crest;
+		inventory = te_crest;
 
 	}
 
@@ -29,11 +28,15 @@ public class Gui_CrestMount extends GuiContainer
 	public void initGui()
 	{
 		super.initGui();
-		this.buttonList.add(new GuiButton(1, this.guiLeft + 61, this.guiTop + 8, 18, 18, "Flip"));
-		this.buttonList.add(new GuiButton(3, this.guiLeft + 79, this.guiTop + 8, 18, 18, "Flip"));
-		this.buttonList.add(new GuiButton(2, this.guiLeft + 97, this.guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(1, guiLeft + 61,
+				guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(3, guiLeft + 79,
+				guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(2, guiLeft + 97,
+				guiTop + 8, 18, 18, "Flip"));
 
-		this.buttonList.add(new GuiButton(4, this.guiLeft + 79, this.guiTop + 63, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(4, guiLeft + 79,
+				guiTop + 63, 18, 18, "Flip"));
 	}
 
 	@Override
@@ -44,33 +47,40 @@ public class Gui_CrestMount extends GuiContainer
 			if(button.id == i)
 			{
 				if(inventory.flip[i - 1] == false)
+				{
 					inventory.flip[i - 1] = true;
+				}
 				else
+				{
 					inventory.flip[i - 1] = false;
+				}
 
-				TinkersDefense.INSTANCE.sendToServer(new Message_CrestMount(inventory.xCoord, inventory.yCoord, inventory.zCoord, inventory.flip));
+				TinkersDefense.INSTANCE.sendToServer(new Message_CrestMount(
+						inventory.xCoord, inventory.yCoord, inventory.zCoord,
+						inventory.flip));
 			}
 		}
 	}
 
+	@Override
 	public void drawScreen(int par1, int par2, float par3)
 	{
 		super.drawScreen(par1, par2, par3);
-		this.xSize_lo = (float) par1;
-		this.ySize_lo = (float) par2;
 	}
 
+	@Override
 	protected void drawGuiContainerForegroundLayer(int par1, int par2)
 	{
 
 	}
 
+	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		this.mc.getTextureManager().bindTexture(iconLocation);
-		int k = (this.width - this.xSize) / 2;
-		int l = (this.height - this.ySize) / 2;
-		this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
+		mc.getTextureManager().bindTexture(iconLocation);
+		final int k = (width - xSize) / 2;
+		final int l = (height - ySize) / 2;
+		drawTexturedModalRect(k, l, 0, 0, xSize, ySize);
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
index 82310dd..5b816ae 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
@@ -66,11 +66,17 @@ public class ModelCrestMount extends ModelBase
 		super.render(entity, f, f1, f2, f3, f4, f5);
 		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 		if(shield)
+		{
 			ShieldMount.render(f5);
+		}
 		if(left)
+		{
 			SwordMount1.render(f5);
+		}
 		if(right)
+		{
 			SwordMount2.render(f5);
+		}
 
 		Base.render(f5);
 		//SwordMount3.render(f5);
@@ -83,6 +89,7 @@ public class ModelCrestMount extends ModelBase
 		model.rotateAngleZ = z;
 	}
 
+	@Override
 	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
 	{
 		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
index 33a8f39..67bbcda 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
@@ -24,35 +24,42 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 
 	public Renderer_CrestMount()
 	{
-		this.model = new ModelCrestMount();
+		model = new ModelCrestMount();
 	}
 
 	@Override
 	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
 	{
-		TileEntity_CrestMount tileEntity = (TileEntity_CrestMount) te;
+		final TileEntity_CrestMount tileEntity = (TileEntity_CrestMount) te;
 
 		boolean left = false, right = false, shield = false;
 
-		if(tileEntity.getStackInSlot(0) != null)
-			right = true;
 		if(tileEntity.getStackInSlot(1) != null)
+		{
+			right = true;
+		}
+		if(tileEntity.getStackInSlot(0) != null)
+		{
 			left = true;
+		}
 		if(tileEntity.getStackInSlot(3) != null)
+		{
 			shield = true;
+		}
 
 		GL11.glPushMatrix();
 
 		//Render Crest Mount
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
-		ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/CrestMount.png"));
+		final ResourceLocation textures = (new ResourceLocation(
+				"tinkersdefense:textures/blocks/crestmount.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
 		GL11.glPushMatrix();
 
-		int meta = te.getBlockMetadata();
+		final int meta = te.getBlockMetadata();
 		float rotation = 0;
 		switch(meta)
 		{
@@ -75,31 +82,34 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		GL11.glRotatef(90F, 0.5F, 0.0F, 0.0F);
 		GL11.glTranslatef(0, -1, -1);
 
-		this.model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F, left, right, shield);
+		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F, left, right, shield);
 		GL11.glPopMatrix();
 
 		//Render Inventory            
 
 		//right slot
-		int slot = 0;
+		int slot = 1;
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem == null) || entItem.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem = new EntityItem(tileEntity.getWorldObj(), 0, 0, 0, tileEntity.getStackInSlot(slot));
+			{
+				entItem = new EntityItem(tileEntity.getWorldObj(), 0, 0, 0,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem.hoverStart = 0.0F;
+			entItem.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(90, 0, 0, -1);
 			GL11.glRotatef(rotation, -1.0F, 0.0F, 0.0F);
 			//GL11.glTranslatef(0.4f/*up - down*/, -0.3f/*left - right*/, 0.22f);
-			if(tileEntity.flip[0] == true)
+			if(tileEntity.flip[1] == true)
 			{
 				GL11.glRotatef(180, 0, 0, 1);
 				GL11.glTranslatef(-0.8f, 0.2f, 0);
 			}
 
-			if(tileEntity.getStackInSlot(0).getItem() instanceof ToolCore)
+			if(tileEntity.getStackInSlot(1).getItem() instanceof ToolCore)
 			{
 				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
 				GL11.glTranslatef(-0.505f, -0.32f, 0);
@@ -111,25 +121,28 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		}
 
 		//left slot
-		slot = 1;
+		slot = 0;
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem2 == null) || entItem2.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem2 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem2 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem2.hoverStart = 0.0F;
+			entItem2.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			//GL11.glTranslatef((float)te.xCoord + 0.5F, (float)te.yCoord + 1.02F, (float)te.zCoord + 0.3F);
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(180, 0, 0, 1);
 			GL11.glRotatef(rotation, 0.0F, -1.0F, 0.0F);
-			if(tileEntity.flip[1] == true)
+			if(tileEntity.flip[0] == true)
 			{
 				GL11.glRotatef(180, 0, 0, 1);
 				GL11.glTranslatef(0.2f, -0.8f, 0);
 			}
 
-			if(tileEntity.getStackInSlot(1).getItem() instanceof ToolCore)
+			if(tileEntity.getStackInSlot(0).getItem() instanceof ToolCore)
 			{
 				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
 				GL11.glTranslatef(0.5f, -0.325f, 0);
@@ -145,15 +158,22 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem3 == null) || entItem3.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem3 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem3 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem3.hoverStart = 0.0F;
+			entItem3.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			if(rotation == 90)
+			{
 				GL11.glTranslatef(0.3f, 0, 0.0f);
+			}
 			if(rotation == -90)
+			{
 				GL11.glTranslatef(-0.3f, 0, 0.0f);
+			}
 			GL11.glRotatef(225, 0, 0, 1);
 			GL11.glRotatef(rotation, 1F, 1F, 0F);
 			if(tileEntity.flip[2] == true)
@@ -178,9 +198,12 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem4 == null) || entItem4.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem4 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem4 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem4.hoverStart = 0.0F;
+			entItem4.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
index 4ed3630..33a293d 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
@@ -42,7 +42,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public Packet getDescriptionPacket()
 	{
-		NBTTagCompound tag = new NBTTagCompound();
+		final NBTTagCompound tag = new NBTTagCompound();
 		writeToNBT(tag);
 		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
 	}
@@ -85,7 +85,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 				setInventorySlotContents(slot, null);
 			}
 
-			this.markDirty();
+			markDirty();
 		}
 		return stack;
 	}
@@ -93,7 +93,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public ItemStack getStackInSlotOnClosing(int slot)
 	{
-		ItemStack stack = getStackInSlot(slot);
+		final ItemStack stack = getStackInSlot(slot);
 
 		if(stack != null)
 		{
@@ -105,14 +105,14 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemstack)
 	{
-		this.inventory[slot] = itemstack;
+		inventory[slot] = itemstack;
 
-		if(itemstack != null && itemstack.stackSize > this.getInventoryStackLimit())
+		if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
 		{
-			itemstack.stackSize = this.getInventoryStackLimit();
+			itemstack.stackSize = getInventoryStackLimit();
 		}
 
-		this.markDirty();
+		markDirty();
 	}
 
 	@Override
@@ -187,11 +187,11 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 
 	public void readInventoryFromNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
+		final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
 		for(int iter = 0; iter < nbttaglist.tagCount(); iter++)
 		{
-			NBTTagCompound tagList = (NBTTagCompound) nbttaglist.getCompoundTagAt(iter);
-			byte slotID = tagList.getByte("Slot");
+			final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter);
+			final byte slotID = tagList.getByte("Slot");
 			if(slotID >= 0 && slotID < inventory.length)
 			{
 				inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList);
@@ -201,12 +201,12 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 
 	public void writeInventoryToNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = new NBTTagList();
+		final NBTTagList nbttaglist = new NBTTagList();
 		for(int iter = 0; iter < inventory.length; iter++)
 		{
 			if(inventory[iter] != null)
 			{
-				NBTTagCompound tagList = new NBTTagCompound();
+				final NBTTagCompound tagList = new NBTTagCompound();
 				tagList.setByte("Slot", (byte) iter);
 				inventory[iter].writeToNBT(tagList);
 				nbttaglist.appendTag(tagList);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java b/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
index 9219cb6..0778857 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
@@ -15,12 +15,12 @@ public class TD_Ore extends Block
 	public TD_Ore(Material mat, String name, Item drop)
 	{
 		super(mat);
-		this.setBlockName(name + "ore");
-		this.setBlockTextureName(Reference.MOD_ID + ":" + name + "ore");
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setStepSound(soundTypeStone);
-		this.setHardness(10.0f);
-		this.setResistance(20.0f);
+		setBlockName(name + "ore");
+		setBlockTextureName(Reference.MOD_ID + ":" + name + "ore");
+		setCreativeTab(TinkersDefense.tabName);
+		setStepSound(soundTypeStone);
+		setHardness(10.0f);
+		setResistance(20.0f);
 		setHarvestLevel("pickaxe", 2);
 
 		drops = drop;
@@ -35,7 +35,7 @@ public class TD_Ore extends Block
 	@Override
 	public int quantityDropped(int meta, int fortune, Random random)
 	{
-		int rand = random.nextInt(fortune + 1) + 1;
+		final int rand = random.nextInt(fortune + 1) + 1;
 		return rand;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java b/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
index bf24e82..3c24863 100644
--- a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
+++ b/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
@@ -65,7 +65,9 @@ public class EntityHookshotHook extends EntityThrowable
 			final Block block = worldObj.getBlock(Op.blockX, Op.blockY, Op.blockZ);
 
 			if(!block.getMaterial().blocksMovement())
+			{
 				return;
+			}
 			if(ticksExisted < getChainLength())
 			{
 				dataWatcher.updateObject(DATA_ARRIVED, (byte) 1);
@@ -98,7 +100,9 @@ public class EntityHookshotHook extends EntityThrowable
 	{
 		final String name = dataWatcher.getWatchableObjectString(DATA_PLAYER);
 		if(name == "")
+		{
 			return null;
+		}
 		return worldObj.getPlayerEntityByName(name);
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java b/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
index d5c5fee..638bebf 100644
--- a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
+++ b/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
@@ -158,6 +158,7 @@ public class GuiTDGuideBook extends GuiScreen
 			default:
 				((GuiButton) buttonList.get(chapter + 3)).enabled = true;
 				chapter = button.id - 3;
+				page = 0;
 				((GuiButton) buttonList.get(chapter + 3)).enabled = false;
 				break;
 		}
@@ -412,8 +413,6 @@ public class GuiTDGuideBook extends GuiScreen
 			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 			RenderHelper.enableGUIStandardItemLighting();
 			gui.mc.getTextureManager().bindTexture(guiLocation2);
-			final IRecipe recipe;
-
 			gui.drawTexturedModalRect(w / 2 + 7, h / 2 - 48, 157, 57, 99, 40);
 
 			itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
@@ -437,9 +436,9 @@ public class GuiTDGuideBook extends GuiScreen
 						TCRecipe.get(3), 1, TCItemCycle.get(3)), w / 2 + 11, h / 2 - 37);
 				itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), ToolBuilder.instance.buildTool(new ItemStack(
 						TCRecipe.get(0), 1, TCItemCycle.get(0)), new ItemStack(
-						TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
-						TCRecipe.get(2), 1, TCItemCycle.get(2)), new ItemStack(
-						TCRecipe.get(3), 1, TCItemCycle.get(3)), "Result"), w / 2 + 87, h / 2 - 37);
+								TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
+										TCRecipe.get(2), 1, TCItemCycle.get(2)), new ItemStack(
+												TCRecipe.get(3), 1, TCItemCycle.get(3)), "Result"), w / 2 + 87, h / 2 - 37);
 			}
 
 			GL11.glEnable(GL11.GL_BLEND);
@@ -454,8 +453,8 @@ public class GuiTDGuideBook extends GuiScreen
 		int spaceIndex = 0;
 		while(str.length() > index)
 		{
-			endIndex = index + 22;
-			if(index + 22 > str.length())
+			endIndex = index + 20;
+			if(index + 20 > str.length())
 			{
 				endIndex = str.length();
 			}
diff --git a/src/main/java/lance5057/tDefense/core/items/GuideBook.java b/src/main/java/lance5057/tDefense/core/items/GuideBook.java
index 215b8a1..ec591c6 100644
--- a/src/main/java/lance5057/tDefense/core/items/GuideBook.java
+++ b/src/main/java/lance5057/tDefense/core/items/GuideBook.java
@@ -11,15 +11,16 @@ public class GuideBook extends Item
 {
 	public GuideBook()
 	{
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setMaxStackSize(1);
-		this.setUnlocalizedName("guidebook");
-		this.setTextureName(Reference.MOD_ID + ":tdbook");
+		setCreativeTab(TinkersDefense.tabName);
+		setMaxStackSize(1);
+		setUnlocalizedName("guidebook");
+		setTextureName(Reference.MOD_ID + ":tdbook");
 	}
-	
+
+	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
-    {
-		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_GUIDEBOOK, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ);
-        return stack;
-    }
+	{
+		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_GUIDEBOOK, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ);
+		return stack;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java b/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
index 0bd5f11..7f11e02 100644
--- a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
+++ b/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
@@ -31,7 +31,7 @@ public class MetaModifierItem extends Item
 	{
 		for(int i = 0; i < metaAmount; i++)
 		{
-			icons[i] = reg.registerIcon(Reference.MOD_ID + ":item_" + names[i]);
+			icons[i] = reg.registerIcon(Reference.MOD_ID + ":item_" + names[i].toLowerCase());
 		}
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/items/RawGem.java b/src/main/java/lance5057/tDefense/core/items/RawGem.java
index ed08b32..41565aa 100644
--- a/src/main/java/lance5057/tDefense/core/items/RawGem.java
+++ b/src/main/java/lance5057/tDefense/core/items/RawGem.java
@@ -8,9 +8,9 @@ public class RawGem extends Item
 {
 	public RawGem(String name)
 	{
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setMaxStackSize(64);
-		this.setUnlocalizedName("raw" + name);
-		this.setTextureName(Reference.MOD_ID + ":raw" + name);
+		setCreativeTab(TinkersDefense.tabName);
+		setMaxStackSize(64);
+		setUnlocalizedName("raw" + name);
+		setTextureName(Reference.MOD_ID + ":raw" + name);
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java b/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
index c3600da..48ab09f 100644
--- a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
+++ b/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
@@ -12,8 +12,8 @@ public class MoltenFluid extends BlockFluidClassic
 {
 	private IIcon	stillIcon;
 	private IIcon	flowingIcon;
-	private String	stillIconTexture;
-	private String	flowIconTexture;
+	private final String	stillIconTexture;
+	private final String	flowIconTexture;
 
 	public MoltenFluid(Fluid fluid, String name)
 	{
@@ -29,20 +29,20 @@ public class MoltenFluid extends BlockFluidClassic
 	@SideOnly(Side.CLIENT)
 	public void func_149651_a(IIconRegister icon)
 	{
-		this.stillIcon = icon.registerIcon(this.stillIconTexture);
-		this.flowingIcon = icon.registerIcon(this.flowIconTexture);
+		stillIcon = icon.registerIcon(stillIconTexture);
+		flowingIcon = icon.registerIcon(flowIconTexture);
 
-		getFluid().setIcons(this.stillIcon, this.flowingIcon);
+		getFluid().setIcons(stillIcon, flowingIcon);
 	}
 
 	public IIcon getStillIcon()
 	{
-		return this.stillIcon;
+		return stillIcon;
 	}
 
 	public IIcon getFlowingIcon()
 	{
-		return this.flowingIcon;
+		return flowingIcon;
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -50,8 +50,8 @@ public class MoltenFluid extends BlockFluidClassic
 	{
 		if(side <= 1)
 		{
-			return this.stillIcon;
+			return stillIcon;
 		}
-		return this.flowingIcon;
+		return flowingIcon;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
index 3781788..ac4e5a2 100644
--- a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
@@ -11,7 +11,7 @@ public class Handler_CrestMount implements IMessageHandler<Message_CrestMount, I
 	@Override
 	public IMessage onMessage(Message_CrestMount message, MessageContext ctx)
 	{
-		TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
 		if(te instanceof TileEntity_CrestMount)
 		{
 			((TileEntity_CrestMount) te).flip = message.flip;
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
index 703f40e..561f326 100644
--- a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
@@ -11,7 +11,7 @@ public class Handler_FinishingAnvil implements IMessageHandler<Message_Finishing
 	@Override
 	public IMessage onMessage(Message_FinishingAnvil message, MessageContext ctx)
 	{
-		TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
 		if(te instanceof TileEntity_FinishingAnvil)
 		{
 			//((TileEntity_FinishingAnvil) te).flip = message.flip;
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
index a537775..390e638 100644
--- a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
@@ -26,12 +26,12 @@ public class Message_CrestMount implements IMessage
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
-		this.x = buf.readInt();
-		this.y = buf.readInt();
-		this.z = buf.readInt();
+		x = buf.readInt();
+		y = buf.readInt();
+		z = buf.readInt();
 		for(int i = 0; i < flip.length; i++)
 		{
-			this.flip[i] = buf.readBoolean();
+			flip[i] = buf.readBoolean();
 		}
 	}
 
@@ -41,9 +41,9 @@ public class Message_CrestMount implements IMessage
 		buf.writeInt(x);
 		buf.writeInt(y);
 		buf.writeInt(z);
-		for(int i = 0; i < flip.length; i++)
+		for(final boolean element : flip)
 		{
-			buf.writeBoolean(flip[i]);
+			buf.writeBoolean(element);
 		}
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
index 207c67f..c9a6124 100644
--- a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
@@ -29,11 +29,11 @@ public class Message_FinishingAnvil implements IMessage
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
-		this.x = buf.readInt();
-		this.y = buf.readInt();
-		this.z = buf.readInt();
+		x = buf.readInt();
+		y = buf.readInt();
+		z = buf.readInt();
 
-		this.item = bbu.readItemStack(buf);
+		item = ByteBufUtils.readItemStack(buf);
 	}
 
 	@Override
@@ -43,7 +43,7 @@ public class Message_FinishingAnvil implements IMessage
 		buf.writeInt(y);
 		buf.writeInt(z);
 
-		bbu.writeItemStack(buf, item);
+		ByteBufUtils.writeItemStack(buf, item);
 	}
 
 }
diff --git a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
index 04ea899..bb25c76 100644
--- a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
+++ b/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
@@ -15,9 +15,9 @@ import org.lwjgl.opengl.GL12;
 public class HookRenderer extends Render
 {
 	ResourceLocation	head	= new ResourceLocation(
-										"tinkersdefense:textures/entity/swordhead.png");
+			"tinkersdefense:textures/entity/swordhead.png");
 	ResourceLocation	chain	= new ResourceLocation(
-										"tinkersdefense:textures/entity/chain.png");
+			"tinkersdefense:textures/entity/chain.png");
 
 	public HookRenderer()
 	{
@@ -85,7 +85,7 @@ public class HookRenderer extends Render
 		bindTexture(chain);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		final float f9 = 0.0F - (f8) * 0.1F;
-		final float f10 = MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6) / 32.0F - (p_76986_1_.ticksExisted + p_76986_9_) * 0.01F;
+		MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6);
 
 		GL11.glScalef(0.5f, 0.5f, 1);
 		for(int j = 0; j < 2; j++)
@@ -98,7 +98,6 @@ public class HookRenderer extends Render
 
 				final float f11 = MathHelper.sin(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
 				final float f12 = MathHelper.cos(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
-				final float f13 = i % b0 * 1.0F / b0;
 				tessellator.addVertexWithUV(f11, f12, 0.0D, 0, 0);
 				tessellator.addVertexWithUV(f11, f12, f8, 0, f9);
 				tessellator.addVertexWithUV(f11, f12, 0.0D, 1, 0);
diff --git a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
index e1fe841..0412731 100644
--- a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
+++ b/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
@@ -39,7 +39,9 @@ public class MoreFlexibleToolRenderer extends FlexibleToolRenderer
 	public boolean handleRenderType(ItemStack item, ItemRenderType type)
 	{
 		if(!item.hasTagCompound())
+		{
 			return false;
+		}
 
 		switch(type)
 		{
@@ -76,7 +78,9 @@ public class MoreFlexibleToolRenderer extends FlexibleToolRenderer
 	public void renderItem(ItemRenderType type, ItemStack item, Object... data)
 	{
 		if(item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore))
+		{
 			return;
+		}
 
 		Entity ent = null;
 		if(data.length > 1)
diff --git a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
index ad70bfd..06bcd34 100644
--- a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
@@ -1,19 +1,11 @@
 package lance5057.tDefense.core.tools;
 
-import java.util.List;
-
 import lance5057.tDefense.TinkersDefense;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class HeaterShield extends Shield
 {
@@ -22,7 +14,7 @@ public class HeaterShield extends Shield
 	public HeaterShield()
 	{
 		super(0);
-		this.setUnlocalizedName("heatershield");
+		setUnlocalizedName("heatershield");
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java b/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
index b4d03ac..e561c44 100644
--- a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
+++ b/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
@@ -1,12 +1,13 @@
 package lance5057.tDefense.core.tools;
 
+import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
 
 public class ModifierSoul extends ModifierBoolExclusive
 {
-	String name;
+	String	name;
+
 	public ModifierSoul(ItemStack[] items, int effect, String tag, String c, String tip, String[] exclusive, int modsNeeded, String[] excludeMods, String name)
 	{
 		super(items, effect, tag, c, tip, exclusive, modsNeeded, excludeMods);
@@ -16,7 +17,7 @@ public class ModifierSoul extends ModifierBoolExclusive
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 		tags.setBoolean(key, true);
 		tags.setString("Soul", name);
diff --git a/src/main/java/lance5057/tDefense/core/tools/Shears.java b/src/main/java/lance5057/tDefense/core/tools/Shears.java
index 046acdc..9bf9e36 100644
--- a/src/main/java/lance5057/tDefense/core/tools/Shears.java
+++ b/src/main/java/lance5057/tDefense/core/tools/Shears.java
@@ -91,9 +91,13 @@ public class Shears extends ToolCore
 	public boolean onBlockDestroyed(ItemStack p_150894_1_, World p_150894_2_, Block p_150894_3_, int p_150894_4_, int p_150894_5_, int p_150894_6_, EntityLivingBase p_150894_7_)
 	{
 		if(p_150894_3_.getMaterial() != Material.leaves && p_150894_3_ != Blocks.web && p_150894_3_ != Blocks.tallgrass && p_150894_3_ != Blocks.vine && p_150894_3_ != Blocks.tripwire && !(p_150894_3_ instanceof IShearable))
+		{
 			return super.onBlockDestroyed(p_150894_1_, p_150894_2_, p_150894_3_, p_150894_4_, p_150894_5_, p_150894_6_, p_150894_7_);
+		}
 		else
+		{
 			return true;
+		}
 	}
 
 	@Override
@@ -115,7 +119,9 @@ public class Shears extends ToolCore
 	public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity)
 	{
 		if(entity.worldObj.isRemote)
+		{
 			return false;
+		}
 		if(entity instanceof IShearable)
 		{
 			final IShearable target = (IShearable) entity;
@@ -154,7 +160,9 @@ public class Shears extends ToolCore
 	public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player)
 	{
 		if(player.worldObj.isRemote)
+		{
 			return false;
+		}
 		final Block block = player.worldObj.getBlock(x, y, z);
 		if(block instanceof IShearable)
 		{
diff --git a/src/main/java/lance5057/tDefense/core/tools/Shield.java b/src/main/java/lance5057/tDefense/core/tools/Shield.java
index 030a62f..2f20e67 100644
--- a/src/main/java/lance5057/tDefense/core/tools/Shield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/Shield.java
@@ -97,10 +97,12 @@ public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatche
 	@Override
 	public boolean canHarvestBlock(Block block, ItemStack is)
 	{
-		for(int i = 0; i < web.length; i++)
+		for(final Material element : web)
 		{
-			if(block.getMaterial() == web[i])
+			if(block.getMaterial() == element)
+			{
 				return true;
+			}
 		}
 		return super.canHarvestBlock(block, is);
 	}
@@ -146,9 +148,13 @@ public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatche
 	public int getArrowCount(ItemStack stack)
 	{
 		if(stack.hasTagCompound() && stack.getTagCompound().hasKey("arrows"))
+		{
 			return stack.getTagCompound().getShort("arrows");
+		}
 		else
+		{
 			return 0;
+		}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
index da288be..9fb8589 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
@@ -117,7 +117,9 @@ public class TinkerWrench extends ToolCore implements IToolWrench, IToolHammer
 		final NBTTagCompound tags = player.inventory.getCurrentItem().getTagCompound().getCompoundTag("InfiTool");
 
 		if(!tags.getBoolean("Broken"))
+		{
 			return true;
+		}
 		return false;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
index 7f99f22..b7f68bc 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
@@ -11,6 +11,7 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
+import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.Weapon;
 import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.common.Optional;
@@ -50,6 +51,19 @@ public class TinkerZweihander extends Weapon
 	}
 
 	@Override
+	public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
+	{
+		if(AbilityHelper.onLeftClickEntity(stack, player, entity, this))
+		{
+			if(entity.riddenByEntity != null || entity.ridingEntity != null)
+			{
+				player.attackTargetEntityWithCurrentItem(entity);
+			}
+		}
+		return true;
+	}
+
+	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
 	{
 		if(!player.isPotionActive(Potion.moveSlowdown))
@@ -86,12 +100,6 @@ public class TinkerZweihander extends Weapon
 	}
 
 	@Override
-	public float getDamageModifier()
-	{
-		return 1.4f;
-	}
-
-	@Override
 	public int getPartAmount()
 	{
 		return 4;
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java b/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
index b0b3ef0..061aa51 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
@@ -87,16 +87,16 @@ public class TinkersHookshot extends ToolCore
 		final Item accessory = getAccessoryItem();
 		final ItemStack accessoryStack = accessory != null ? new ItemStack(
 				getAccessoryItem(), 1, id) : null;
-		final Item extra = getExtraItem();
-		final ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null;
-		final ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(
-				getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
-		if(tool != null)
-		{
-			tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
-			tool.getTagCompound().getCompoundTag("InfiTool").setInteger("ChainLength", 10);
-			list.add(tool);
-		}
+				final Item extra = getExtraItem();
+				final ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null;
+				final ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(
+						getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
+				if(tool != null)
+				{
+					tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
+					tool.getTagCompound().getCompoundTag("InfiTool").setInteger("ChainLength", 10);
+					list.add(tool);
+				}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
index 1d1d284..25bc332 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
@@ -68,9 +68,9 @@ public class BloodMagicMods extends ModifiersBase
 		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
 				new ItemStack[] {new ItemStack(ModItems.apprenticeBloodOrb, 1), new ItemStack(
 						ModItems.sacrificialDagger, 1)},
-				TinkersDefense.config.SuppingModID, "Supping",
-				EnumChatFormatting.DARK_RED.toString(), "Supping",
-				new String[] {"weapon"}, 1, new String[] {"Scabbing"}));
+						TinkersDefense.config.SuppingModID, "Supping",
+						EnumChatFormatting.DARK_RED.toString(), "Supping",
+						new String[] {"weapon"}, 1, new String[] {"Scabbing"}));
 
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
index eda2388..c0f1bfc 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
@@ -3,7 +3,6 @@ package lance5057.tDefense.core.tools.modifiers.Botania;
 import lance5057.tDefense.TDIntegration;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,7 +38,7 @@ public class BotaniaMods extends ModifiersBase
 {
 	public BotaniaMods()
 	{
-		super(new String[] {"corpseIvyGraft", "corpseIvy", "terraCore", "manaCore", "elementiumcore"}, "modItemsBotania");
+		super(new String[] {"corpseIvyGraft", "corpseIvy", "terraCore", "manaCore"}, "modItemsBotania");
 	}
 
 	@Override
@@ -49,8 +48,8 @@ public class BotaniaMods extends ModifiersBase
 				new ItemStack(modItems, 1, 0),
 				new Object[] {"fsf", "oio", "fgf", 'f', ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), 'i', new ItemStack(
 						ModItems.keepIvy, 1, 0), 's', LibOreDict.MANA_STRING, 'g', new ItemStack(
-								TinkerTools.craftedSoil, 1, 3), 'o', new ItemStack(
-										ModItems.fertilizer, 1, 1)}));
+						TinkerTools.craftedSoil, 1, 3), 'o', new ItemStack(
+						ModItems.fertilizer, 1, 1)}));
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
 				ModItems.manaResource, 1, 4), 's', new ItemStack(
@@ -70,15 +69,6 @@ public class BotaniaMods extends ModifiersBase
 		BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(modItems, 1, 1), new ItemStack(
 				modItems, 1, 0), 100000);
 
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 4, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 2)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 4, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 1)});
 	}
 
 	@Override
@@ -102,18 +92,11 @@ public class BotaniaMods extends ModifiersBase
 				EnumChatFormatting.AQUA.toString(), "ManaCore",
 				new String[] {}, 1, new String[] {"CorpseIvy"}));
 
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 4)},
-				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
-				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
-				new String[] {"armor", "weapon"}, 1, new String[] {}));
-
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CorpseIvyModID, "tinker", "corpseivy", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.TerraCoreModID, "tinker", "terracore", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ManaRepairModID, "tinker", "manacore", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
 
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
index b785daf..62a63ce 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
@@ -40,9 +40,9 @@ public class ModifierBoolExclusive extends ModBoolean
 
 		if(exclusive.length > 0)
 		{
-			for(int i = 0; i < exclusive.length; i++)
+			for(final String element : exclusive)
 			{
-				if(list.contains(exclusive[i]))
+				if(list.contains(element))
 				{
 					isExclusive = true;
 				}
@@ -55,9 +55,9 @@ public class ModifierBoolExclusive extends ModBoolean
 
 		if(modExclusions != null)
 		{
-			for(int i = 0; i < modExclusions.length; i++)
+			for(final String modExclusion : modExclusions)
 			{
-				if(tags.hasKey(modExclusions[i]))
+				if(tags.hasKey(modExclusion))
 				{
 					hasModRejection = true;
 				}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
index 2db9f6b..4b9b9a3 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
@@ -27,7 +27,7 @@ public class ModifierIntExclusive extends ModInteger
 		initialIncrease = secondaryIncrease = increase;
 		color = c;
 		tooltipName = tip;
-		this.modExclusions = excludeMods;
+		modExclusions = excludeMods;
 	}
 
 	public ModifierIntExclusive(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip, String[] exclusive, int modsNeeded, int max)
@@ -44,27 +44,22 @@ public class ModifierIntExclusive extends ModInteger
 	@Override
 	protected boolean canModify(ItemStack tool, ItemStack[] input)
 	{
-		List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
-		boolean isExclusive = false;
-		boolean hasModRejection = false;
-
-		for(int i = 0; i < exclusive.length; i++)
+		for(final String element : exclusive)
 		{
-			if(list.contains(exclusive[i]))
+			if(list.contains(element))
 			{
-				isExclusive = true;
 			}
 		}
 
 		if(modExclusions != null)
 		{
-			for(int i = 0; i < modExclusions.length; i++)
+			for(final String modExclusion : modExclusions)
 			{
-				if(tags.hasKey(modExclusions[i]))
+				if(tags.hasKey(modExclusion))
 				{
-					hasModRejection = true;
 				}
 			}
 		}
@@ -75,7 +70,7 @@ public class ModifierIntExclusive extends ModInteger
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		if(tags.hasKey(key))
 		{
 			int increase = tags.getInteger(key);
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
index 895675b..eda54f1 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
@@ -258,9 +258,13 @@ public class ModifierSoulHandler
 	{
 		final int lines = getAmountOfLines("soul." + name + "." + type + ".");
 		if(lines > 0)
+		{
 			return StatCollector.translateToLocal("soul." + name + "." + type + "." + world.rand.nextInt(lines));
+		}
 		if(TinkersDefense.config.debug)
+		{
 			return "Error: No lines (" + type + " chat)";
+		}
 		return "";
 	}
 
@@ -315,8 +319,8 @@ public class ModifierSoulHandler
 	@SubscribeEvent
 	public void ModifySoulEvent(ModifyEvent event)
 	{
-		if(event.modifier.stacks != null && !event.modifier.stacks.isEmpty() && event.modifier.stacks.get(0) != null && ((ItemStack) event.modifier.stacks.get(0)).areItemStacksEqual((ItemStack) event.modifier.stacks.get(0), new ItemStack(
-				TinkersDefense.mods.TMod.modItems, 1, 3)))
+		if(event.modifier.stacks != null && !event.modifier.stacks.isEmpty() && event.modifier.stacks.get(0) != null && ItemStack.areItemStacksEqual((ItemStack) event.modifier.stacks.get(0), new ItemStack(
+				Modifiers.TMod.modItems, 1, 3)))
 		{
 			newlymade = true;
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
index 9ed2d6c..eb23077 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
@@ -11,6 +11,7 @@ import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import lance5057.tDefense.core.tools.modifiers.modLapisShears;
 import lance5057.tDefense.core.tools.modifiers.ActiveToolMods.TDefenseActiveToolMod;
+import lance5057.tDefense.proxy.CommonProxy;
 import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent;
 import mods.battlegear2.api.core.IBattlePlayer;
 import net.minecraft.entity.Entity;
@@ -69,22 +70,22 @@ public class TDMods extends ModifiersBase
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-1-", "1d1", "-1-", 'd', new ItemStack(
 				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE), '1', new ItemStack(
-						Items.experience_bottle, 1, 0)});
+				Items.experience_bottle, 1, 0)});
 
 		GameRegistry.addShapelessRecipe(new ItemStack(modItems, 1, 12), new ItemStack(
 				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE));
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"fcf", "sps", "fcf", 'f', new ItemStack(
 				Items.feather, 1, -1), 'c', new ItemStack(
-						TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-								Items.string, 1, -1), 'p', new ItemStack(modItems, 1, 12)});
+				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
+				Items.string, 1, -1), 'p', new ItemStack(modItems, 1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"gng", "spc", "gbg", 'g', new ItemStack(
 				Blocks.glass_pane, 1, -1), 'c', new ItemStack(
-						TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-								Blocks.sand, 1, OreDictionary.WILDCARD_VALUE), 'p', new ItemStack(
-										modItems, 1, 12), 'n', new ItemStack(Items.nether_star, 1, 0), 'b', new ItemStack(
-												Blocks.gold_block, 1, 12)});
+				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
+				Blocks.sand, 1, OreDictionary.WILDCARD_VALUE), 'p', new ItemStack(
+				modItems, 1, 12), 'n', new ItemStack(Items.nether_star, 1, 0), 'b', new ItemStack(
+				Blocks.gold_block, 1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"-r-", "-p-", "---", 'r', new ItemStack(
 				modItems, 1, 0), 'p', new ItemStack(modItems, 1, 12)});
@@ -99,7 +100,7 @@ public class TDMods extends ModifiersBase
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 9), new Object[] {"brb", "apa", "ara", 'b', TConstructRegistry.getItemStack("necroticBone"), 'r', new ItemStack(
 				TinkerTools.toughRod, 1, 7), 'a', new ItemStack(
-						TinkerWeaponry.arrowhead, 1, 11), 'p', new ItemStack(modItems,
+				TinkerWeaponry.arrowhead, 1, 11), 'p', new ItemStack(modItems,
 				1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 10), new Object[] {"PfP", "tpt", "PfP", 'P', new ItemStack(
@@ -124,7 +125,8 @@ public class TDMods extends ModifiersBase
 		//Weapons
 		//TO-DO
 		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(Blocks.iron_block, 1, 0)},
+				new ItemStack[] {new ItemStack(
+						Blocks.heavy_weighted_pressure_plate, 1, 0)},
 				TinkersDefense.config.DazeID, "Daze", 1,
 				EnumChatFormatting.GRAY.toString(), "Daze",
 				new String[] {"weapon"}, 1, null));
@@ -151,7 +153,7 @@ public class TDMods extends ModifiersBase
 				modItems, 1, 4), 1);
 		RegisterCrestModifier(TinkersDefense.config.CrestMirrorsID, "Mirrors", EnumChatFormatting.DARK_AQUA.toString(), new ItemStack(
 				modItems, 1, 5), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestLegendsID, "Legends", EnumChatFormatting.GOLD.toString(), new ItemStack(
+		RegisterLegendModifier(TinkersDefense.config.CrestLegendsID, "Legends", EnumChatFormatting.GOLD.toString(), new ItemStack(
 				modItems, 1, 6), 1);
 		//		RegisterCrestModifier(TinkersDefense.config.CrestBladesID, "Blades", 1, EnumChatFormatting.GRAY.toString(), new ItemStack(
 		//				modItems, 1, 7), 1);
@@ -195,7 +197,7 @@ public class TDMods extends ModifiersBase
 			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLightID, "tinker", "light", true);
 
 			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeInsultID, "tinker", "insult", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokePyrotechID, "tinker", "pyrotech", true);
+			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokePyrotechID, "tinker", "pyrotech", true);
 			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeCompensateID, "tinker", "compensate", true);
 
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SoulBoundID, "tinker", "soulbound", true);
@@ -236,10 +238,26 @@ public class TDMods extends ModifiersBase
 		}
 	}
 
+	public void RegisterLegendModifier(int[] effect, String tag, String color, ItemStack item, int mods)
+	{
+
+		for(int i = 0; i < TinkersDefense.colors.length; i++)
+		{
+			final ItemStack[] items = {item, new ItemStack(Items.dye, 1, i)};
+			ModifyBuilder.registerModifier(new ModifierBoolExclusive(items,
+					effect[i], tag.toLowerCase(), color, "Crest of " + tag,
+					new String[] {"heatershield"}, mods, null));
+			for(final ToolCore tool : TConstructRegistry.getToolMapping())
+			{
+				TConstructClientRegistry.addEffectRenderMapping(tool, effect[i], "tinker", TinkersDefense.colors[i] + "_" + tag.toLowerCase(), true);
+			}
+		}
+	}
+
 	@Override
 	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
 	{
-		if(tags.hasKey("Mirrors"))
+		if(tags.hasKey("mirrors"))
 		{
 			UpdateMirrors(tool, stack, world, entity);
 		}
@@ -249,9 +267,9 @@ public class TDMods extends ModifiersBase
 		}
 		if(world.isRemote && tags.hasKey("Ensouled") && tags.hasKey("Soul"))
 		{
-			if(TinkersDefense.proxy.SoulHandler != null)
+			if(CommonProxy.SoulHandler != null)
 			{
-				TinkersDefense.proxy.SoulHandler.Update(stack);
+				CommonProxy.SoulHandler.Update(stack);
 			}
 		}
 	}
@@ -308,7 +326,7 @@ public class TDMods extends ModifiersBase
 		{
 			final EntityPlayer player = (EntityPlayer) event.source.getSourceOfDamage();
 			final ItemStack itemstack = player.getCurrentEquippedItem();
-			if(itemstack != null)
+			if(itemstack != null && itemstack.getItem() instanceof ToolCore)
 			{
 				final NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool");
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
index a18e691..75b477c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
@@ -1,9 +1,7 @@
 package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import cpw.mods.fml.common.FMLLog;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import net.minecraft.entity.Entity;
@@ -19,7 +17,7 @@ import tconstruct.library.tools.ToolCore;
 import thaumcraft.api.ItemApi;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.internal.DummyInternalMethodHandler;
+import cpw.mods.fml.common.FMLLog;
 
 public class ThaumcraftMods extends ModifiersBase
 {
@@ -43,9 +41,12 @@ public class ThaumcraftMods extends ModifiersBase
 	@Override
 	public void RegisterModifiers()
 	{
-		ModifyBuilder.registerModifier(new modifierRepairVis(new ItemStack[] {ItemApi.getItem("itemWandCap", 0)}, TinkersDefense.config.CapsModID, "Caps", EnumChatFormatting.GOLD.toString(), "Caps"));
-		
-		for(ToolCore tool : TConstructRegistry.getToolMapping())
+		ModifyBuilder.registerModifier(new modifierRepairVis(
+				new ItemStack[] {ItemApi.getItem("itemWandCap", 0)},
+				TinkersDefense.config.CapsModID, "Caps",
+				EnumChatFormatting.GOLD.toString(), "Caps"));
+
+		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CapsModID, "tinker", "cap", true);
 		}
@@ -57,7 +58,9 @@ public class ThaumcraftMods extends ModifiersBase
 		if(!world.isRemote)
 		{
 			if(tags.hasKey("Caps"))
+			{
 				UpdateRepairVis(tool, stack, world, entity, tags);
+			}
 		}
 	}
 
@@ -67,7 +70,7 @@ public class ThaumcraftMods extends ModifiersBase
 	{
 		if(tags.getInteger("Damage") > 0)
 		{
-			AspectList cost = new AspectList();
+			final AspectList cost = new AspectList();
 			cost.add(Aspect.AIR, (int) (10 * tags.getFloat("Caps")));
 			cost.add(Aspect.WATER, (int) (30 * tags.getFloat("Caps")));
 			cost.add(Aspect.FIRE, (int) (10 * tags.getFloat("Caps")));
@@ -82,9 +85,9 @@ public class ThaumcraftMods extends ModifiersBase
 				{
 					consumeVisFromInventory = Class.forName("thaumcraft.common.items.wands.WandManager").getMethod("consumeVisFromInventory", EntityPlayer.class, AspectList.class);
 				}
-				success = (Boolean) consumeVisFromInventory.invoke(null, (EntityPlayer) entity, cost);
+				success = (Boolean) consumeVisFromInventory.invoke(null, entity, cost);
 			}
-			catch(Exception ex)
+			catch(final Exception ex)
 			{
 				FMLLog.warning("Thaumcraft is missing, you shouldn't see this, please report");
 			}
@@ -93,9 +96,13 @@ public class ThaumcraftMods extends ModifiersBase
 				if(success)
 				{
 					if(tags.getInteger("Damage") >= 4)
+					{
 						tags.setInteger("Damage", tags.getInteger("Damage") - 4);
+					}
 					else
+					{
 						tags.setInteger("Damage", 0);
+					}
 				}
 			}
 		}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
index 13c14d4..ddea547 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
@@ -1,13 +1,9 @@
 package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import tconstruct.modifiers.tools.ModBoolean;
 import thaumcraft.api.wands.WandCap;
-import thaumcraft.common.items.wands.ItemWandCap;
 
 public class modifierRepairVis extends ModBoolean
 {
@@ -26,14 +22,14 @@ public class modifierRepairVis extends ModBoolean
 	public boolean matches(ItemStack[] recipe, ItemStack input)
 	{
 		cap = null;
-		for(int i = 0; i < recipe.length; i++)
+		for(final ItemStack element : recipe)
 		{
-			if(recipe[i] != null)
+			if(element != null)
 			{
-				for(WandCap cp : WandCap.caps.values())
+				for(final WandCap cp : WandCap.caps.values())
 				{
-					ItemStack test = cp.getItem();
-					if(recipe[i].getItem() == test.getItem() && recipe[i].getItemDamage() == test.getItemDamage())
+					final ItemStack test = cp.getItem();
+					if(element.getItem() == test.getItem() && element.getItemDamage() == test.getItemDamage())
 					{
 						cap = cp;
 						break;
@@ -43,23 +39,27 @@ public class modifierRepairVis extends ModBoolean
 		}
 
 		if(!canModify(input, recipe))
+		{
 			return false;
+		}
 		if(cap == null)
+		{
 			return false;
+		}
 		return true;
 	}
 
 	@Override
 	protected boolean canModify(ItemStack tool, ItemStack[] input)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && cap != null; //Will fail if the modifier is false or the tag doesn't exist
 	}
 
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 		tags.setFloat(key, cap.getBaseCostModifier());
 
@@ -67,7 +67,7 @@ public class modifierRepairVis extends ModBoolean
 		modifiers -= 1;
 		tags.setInteger("Modifiers", modifiers);
 
-		String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " ";
+		final String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " ";
 		addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " (" + (int) (cap.getBaseCostModifier() * 100) + "%)");
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
index a12690d..8261b4c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
@@ -41,7 +41,6 @@ public class modLapisShears extends ModLapis
 		tags.setIntArray(key, keyPair);
 		final ToolCore toolcore = (ToolCore) tool.getItem();
 		final String[] types = toolcore.getTraits();
-		final boolean weapon = false;
 		boolean harvest = false;
 		for(final String s : types)
 		{
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
index f137076..c10f3b2 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
@@ -21,7 +21,8 @@ public class Container_FinishingAnvil extends Container
 		{
 			for(int x = 0; x < 9; x++)
 			{
-				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, 84 + y * 18));
+				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9,
+						8 + 18 * x, 84 + y * 18));
 			}
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
index e12586a..c94648b 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
@@ -27,7 +27,7 @@ public class FinishingAnvil extends BlockContainer
 	public FinishingAnvil()
 	{
 		super(Material.iron);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 	}
 
 	@Override
@@ -40,11 +40,9 @@ public class FinishingAnvil extends BlockContainer
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
 	{
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(tileEntity == null || player.isSneaking())
-		{
 			return false;
-		}
 		//code to open gui explained later
 		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_ANVIL_INV, player.worldObj, x, y, z);
 		return true;
@@ -59,33 +57,33 @@ public class FinishingAnvil extends BlockContainer
 
 	private void dropItems(World world, int x, int y, int z)
 	{
-		Random rand = new Random();
+		final Random rand = new Random();
 
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(!(tileEntity instanceof IInventory))
-		{
 			return;
-		}
-		IInventory inventory = (IInventory) tileEntity;
+		final IInventory inventory = (IInventory) tileEntity;
 
 		for(int i = 0; i < inventory.getSizeInventory(); i++)
 		{
-			ItemStack item = inventory.getStackInSlot(i);
+			final ItemStack item = inventory.getStackInSlot(i);
 
 			if(item != null && item.stackSize > 0)
 			{
-				float rx = rand.nextFloat() * 0.8F + 0.1F;
-				float ry = rand.nextFloat() * 0.8F + 0.1F;
-				float rz = rand.nextFloat() * 0.8F + 0.1F;
+				final float rx = rand.nextFloat() * 0.8F + 0.1F;
+				final float ry = rand.nextFloat() * 0.8F + 0.1F;
+				final float rz = rand.nextFloat() * 0.8F + 0.1F;
 
-				EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
+				final EntityItem entityItem = new EntityItem(world, x + rx,
+						y + ry, z + rz, new ItemStack(item.getItem(),
+								item.stackSize, item.getItemDamage()));
 
 				if(item.hasTagCompound())
 				{
 					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
 				}
 
-				float factor = 0.05F;
+				final float factor = 0.05F;
 				entityItem.motionX = rand.nextGaussian() * factor;
 				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
 				entityItem.motionZ = rand.nextGaussian() * factor;
@@ -110,6 +108,7 @@ public class FinishingAnvil extends BlockContainer
 	}
 
 	//It's not a normal block, so you need this too.
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -120,13 +119,13 @@ public class FinishingAnvil extends BlockContainer
 	@Override
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("tinkersdefense:WIP");
+		blockIcon = icon.registerIcon("tinkersdefense:item_armoranvil");
 	}
 
 	@Override
 	public TileEntity createNewTileEntity(World w, int md)
 	{
-		TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil();
+		final TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil();
 		return te;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
index 0395b61..ea56f5a 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
@@ -9,7 +9,7 @@ import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.network.Message_FinishingAnvil;
 import lance5057.tDefense.finishingAnvil.utilities.Injector;
 import lance5057.tDefense.finishingAnvil.utilities.ToolCoreTip;
-import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -17,7 +17,6 @@ import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -34,35 +33,34 @@ import cpw.mods.fml.client.config.GuiButtonExt;
 
 public class Gui_FinishingAnvil extends GuiContainer
 {
-	private float							xSize_lo;
-	private float							ySize_lo;
-
 	private ItemStack						bigCopy;
+	NBTTagCompound							bigCopyTags;
+	private final RenderItem				bigRender		= new RenderItem_FinishingAnvil(
+			this,
+			3.5f,
+			3.5f, 1.0f);
+
+	private ItemStack						rightCopy1, rightCopy2, rightCopy3;
+	NBTTagCompound							rightCopyTags1, rightCopyTags2,
+	rightCopyTags3;
+	private final RenderItem				normalRender	= new RenderItem_FinishingAnvil(
+			this, 1.0f,
+			1.0f, 1.0f);
+
 	//private Boolean							isNull			= true;
 	private ItemStack						editItem;
-	private final RenderItem				bigRender		= new RenderItem_FinishingAnvil(
-																	this);
 
 	public final TileEntity_FinishingAnvil	inventory;
 	private ResourceLocation				forGui;
 
 	private int								leftButtonPosX	= 0;
-	private final int						leftButtonPosY	= 0;
-	private int								xLIcon_one, yLIcon_one;
-	private int								xLIcon_two, yLIcon_two;
-	private int								xLIcon_three, yLIcon_three;
 	private int								leftSelect		= 0;
 
-	private int								rightButtonPosX	= 0;
-	private int								rightButtonPosY	= 0;
-	private int								xRIcon_one, yRIcon_one;
-	private int								xRIcon_two, yRIcon_two;
-	private int								xRIcon_three, yRIcon_three;
+	private int								rightButtonPos	= 0;
+	private final int						rightSelect		= 0;
 
 	String[]								renders;
 
-	NBTTagCompound							tags;
-
 	boolean									renderFlat		= true;
 	boolean									renderBiped		= true;
 	int										rotation		= 0;
@@ -70,8 +68,8 @@ public class Gui_FinishingAnvil extends GuiContainer
 	InventoryPlayer							player;
 
 	private static final ResourceLocation	iconLocation	= new ResourceLocation(
-																	"tinkersdefense",
-																	"textures/gui/finishinganvil.png");
+			"tinkersdefense",
+			"textures/gui/finishinganvil.png");
 
 	public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te)
 	{
@@ -92,20 +90,20 @@ public class Gui_FinishingAnvil extends GuiContainer
 	{
 		super.initGui();
 		buttonList.add(new GuiButtonExt(1, guiLeft + 25, guiTop + 11, 10, 10,
-				"⇑"));
+				""));
 		buttonList.add(new GuiButtonExt(2, guiLeft + 25, guiTop + 61, 10, 10,
-				"⇓"));
+				""));
 		buttonList.add(new GuiButtonExt(3, guiLeft + 38, guiTop + 53, 18, 18,
-				"✓"));
+				""));
 
 		buttonList.add(new GuiButtonExt(4, guiLeft + 5, guiTop + 11, 20, 20, ""));
 		buttonList.add(new GuiButtonExt(5, guiLeft + 5, guiTop + 31, 20, 20, ""));
 		buttonList.add(new GuiButtonExt(6, guiLeft + 5, guiTop + 51, 20, 20, ""));
 
 		buttonList.add(new GuiButtonExt(7, guiLeft + 141, guiTop + 11, 10, 10,
-				"⇑"));
+				""));
 		buttonList.add(new GuiButtonExt(8, guiLeft + 141, guiTop + 61, 10, 10,
-				"⇓"));
+				""));
 
 		buttonList.add(new GuiButtonExt(9, guiLeft + 151, guiTop + 11, 20, 20,
 				""));
@@ -115,7 +113,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 				""));
 
 		buttonList.add(new GuiButtonExt(12, guiLeft + 38, guiTop + 11, 18, 18,
-				"∅"));
+				""));
 		buttonList.add(new GuiButtonExt(13, guiLeft + 120, guiTop + 11, 18, 18,
 				"3D"));
 		buttonList.add(new GuiButtonExt(14, guiLeft + 120, guiTop + 53, 18, 18,
@@ -130,7 +128,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 	@Override
 	protected void actionPerformed(GuiButton button)
 	{
-		if(tags != null)
+		if(bigCopy != null && bigCopyTags != null)
 		{
 			switch(button.id)
 			{
@@ -155,27 +153,26 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 				case 4:
 					leftSelect = 0 + leftButtonPosX;
-					rightButtonPosY = 0 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 				case 5:
 					leftSelect = 1 + leftButtonPosX;
-					rightButtonPosY = 3 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 				case 6:
 					leftSelect = 2 + leftButtonPosX;
-					rightButtonPosY = 6 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 
 				case 7:
-					if(rightButtonPosX > 0)
+					if(rightButtonPos > 0)
 					{
-						rightButtonPosX--;
-					}
-					else if(rightButtonPosY > (0 + leftSelect * 4))
-					{
-						rightButtonPosY--;
-						rightButtonPosX = 15;
+						rightButtonPos--;
 					}
+					setRenders();
 					break;
 
 				case 13:
@@ -220,55 +217,53 @@ public class Gui_FinishingAnvil extends GuiContainer
 		switch(id)
 		{
 			case 9:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					if(rightButtonPosX > 0)
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + (rightButtonPos * TinkersDefense.config.MaterialIndex));
+					if(rightButtonPos > 0)
 					{
-						tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+						bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 					}
 					else
 					{
-						tags.removeTag(renders[leftSelect] + "Color");
+						bigCopyTags.removeTag(renders[leftSelect] + "Color");
 					}
 				}
 				break;
 
 			case 10:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
+					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 				}
 				break;
 
 			case 11:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
+					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 				}
 				break;
 
 			case 12:
-				tags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
-				tags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
-				tags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
-				tags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
-
-				tags.removeTag(renders[0] + "Color");
-				tags.removeTag(renders[1] + "Color");
-				tags.removeTag(renders[2] + "Color");
-				tags.removeTag(renders[3] + "Color");
+				bigCopyTags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
+				bigCopyTags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
+				bigCopyTags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
+				bigCopyTags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
+
+				bigCopyTags.removeTag(renders[0] + "Color");
+				bigCopyTags.removeTag(renders[1] + "Color");
+				bigCopyTags.removeTag(renders[2] + "Color");
+				bigCopyTags.removeTag(renders[3] + "Color");
+
+				setRenders();
 				break;
 
 			case 8:
-				rightButtonPosX++;
-				if(rightButtonPosX >= 16)
-				{
-					rightButtonPosY++;
-					rightButtonPosX = 0;
-				}
+				rightButtonPos++;
+				setRenders();
 				break;
 
 		}
@@ -276,40 +271,32 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 	public void doArmorEdit(int id)
 	{
-		final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
+		NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
 		final ArmorCore armor = (ArmorCore) bigCopy.getItem();
 		final List<ModelRenderer> boxes = armor.getRenderer().boxList;
 
 		switch(id)
 		{
 			case 9:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName));
 				break;
 
 			case 10:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + 1 + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName));
 				break;
 
 			case 11:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + 2 + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName));
 				break;
 
 			case 12:
-				tags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
-				tags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
-				tags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
-				tags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
-
-				tags.removeTag(renders[0] + "Color");
-				tags.removeTag(renders[1] + "Color");
-				tags.removeTag(renders[2] + "Color");
-				tags.removeTag(renders[3] + "Color");
+				aTags = armor.getRenderer().defaultTags;
 				break;
 
 			case 8:
-				if(rightButtonPosX < boxes.size() - 12)
+				if(rightButtonPos < boxes.size() - 12)
 				{
-					rightButtonPosX++;
+					rightButtonPos++;
 				}
 				break;
 
@@ -320,17 +307,20 @@ public class Gui_FinishingAnvil extends GuiContainer
 	public void drawScreen(int x, int y, float par3)
 	{
 
-		if(inventory.getStackInSlot(0) != null)
+		if(inventory.getStackInSlot(0) != null && inventory.getStackInSlot(0).getItem() instanceof ToolCore)
 		{
 			if(bigCopy == null)
 			{
+				rightButtonPos = 0;
+				leftButtonPosX = 0;
 				bigCopy = inventory.getStackInSlot(0).copy();
 				if(bigCopy.hasTagCompound() && bigCopy.getTagCompound().hasKey("InfiTool"))
 				{
-					tags = bigCopy.getTagCompound().getCompoundTag("InfiTool");
+					bigCopyTags = bigCopy.getTagCompound().getCompoundTag("InfiTool");
 				}
+				setRenders();
 			}
-			else if(inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage())
+			else if(bigCopy != null && inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage())
 			{
 				bigCopy = null;
 			}
@@ -342,95 +332,52 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 		super.drawScreen(x, y, par3);
 		drawTooltip(x, y);
-		xSize_lo = x;
-		ySize_lo = y;
 	}
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(int par1, int par2)
 	{
+
 		mc.getTextureManager().bindTexture(iconLocation);
 
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+		drawTexturedModalRect(144, 14, 5, 167, 5, 3);
+		drawTexturedModalRect(144, 64, 0, 167, 5, 3);
+		drawTexturedModalRect(39, 54, 32, 176, 16, 16);
+		drawTexturedModalRect(39, 12, 48, 176, 16, 16);
+		drawTexturedModalRect(28, 14, 5, 167, 5, 3);
+		drawTexturedModalRect(28, 64, 0, 167, 5, 3);
 		drawTexturedModalRect(121, 54, 16, 176, 16, 16);
 
-		xLIcon_one = 0;
-		yLIcon_one = 176;
-		xLIcon_two = 0;
-		yLIcon_two = 176;
-		xLIcon_three = 0;
-		yLIcon_three = 176;
-
-		xRIcon_one = 0;
-		yRIcon_one = 176;
-		xRIcon_two = 0;
-		yRIcon_two = 176;
-		xRIcon_three = 0;
-		yRIcon_three = 176;
-
-		if(inventory.getStackInSlot(0) != null)
+		if(bigCopy != null)
 		{
-			editItem = inventory.getStackInSlot(0);
-			if(editItem.getItem() instanceof ToolCore)
-			{
-				//this.drawTexturedModelRectFromIcon(this.guiLeft+4, this.guiTop+14, 
-				//		((ToolCore)this.inventorySlots.inventorySlots.get(0)).getHeadItem(), 16, 16);
-
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-				forGui = new ResourceLocation(
-						"tinkersdefense",
-						"textures/gui/" + ((ToolCore) editItem.getItem()).getDefaultFolder() + ".png");
-				xLIcon_one = 32;
-				yLIcon_one = 0;
-				xLIcon_two = 48;
-				yLIcon_two = 0;
-				xLIcon_three = 64;
-				yLIcon_three = 0;
-
-				xRIcon_one = 0;
-				yRIcon_one = 32;
-				xRIcon_two = 16;
-				yRIcon_two = 32;
-				xRIcon_three = 32;
-				yRIcon_three = 32;
-			}
-		}
 
-		if(forGui != null && bigCopy != null)
-		{
 			if(!(bigCopy.getItem() instanceof ArmorCore))
 			{
-				mc.getTextureManager().bindTexture(forGui);
-
-				if(inventory.getStackInSlot(0) != null)
+				if(renderFlat)
 				{
-					//			int leftMax = leftSelect;
-					//			if(leftMax > 2)
-					//				leftMax = 2;
-					drawTexturedModalRect(7, 13 + ((leftSelect - leftButtonPosX) * 20), 16, 0, 16, 16);
-				}
-
-				drawTexturedModalRect(7, 13, xLIcon_one + (leftButtonPosX * 16), yLIcon_one + 0, 16, 16);
-				drawTexturedModalRect(7, 33, xLIcon_two + (leftButtonPosX * 16), yLIcon_two + 0, 16, 16);
-				drawTexturedModalRect(7, 53, xLIcon_three + (leftButtonPosX * 16), yLIcon_three + 0, 16, 16);
+					if(leftSelect > 2)
+					{
+						drawTexturedModalRect(7, 13, 16, 192, 16, 16);
+						drawTexturedModalRect(7, 33, 32, 192, 16, 16);
+						drawTexturedModalRect(7, 53, 48, 192, 16, 16);
+					}
+					else
+					{
+						drawTexturedModalRect(7, 13, 0, 192, 16, 16);
+						drawTexturedModalRect(7, 33, 16, 192, 16, 16);
+						drawTexturedModalRect(7, 53, 32, 192, 16, 16);
+					}
 
-				drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPosX * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
+					((GuiButtonExt) buttonList.get(14)).enabled = false;
+					((GuiButtonExt) buttonList.get(15)).enabled = false;
+					((GuiButtonExt) buttonList.get(12)).displayString = "3D";
 
-				if(rightButtonPosX + 1 < 16)
-				{
-					drawTexturedModalRect(153, 33, xRIcon_two + (rightButtonPosX * 16), yRIcon_two + (rightButtonPosY * 16), 16, 16);
-				}
-				else
-				{
-					drawTexturedModalRect(153, 33, xRIcon_two + ((rightButtonPosX - 16) * 16), yRIcon_two + ((rightButtonPosY + 1) * 16), 16, 16);
-				}
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy1, 153, 13);
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy2, 153, 33);
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy3, 153, 53);
 
-				if(rightButtonPosX + 2 < 16)
-				{
-					drawTexturedModalRect(153, 53, xRIcon_three + (rightButtonPosX * 16), yRIcon_three + (rightButtonPosY * 16), 16, 16);
-				}
-				else
-				{
-					drawTexturedModalRect(153, 53, xRIcon_three + ((rightButtonPosX - 16) * 16), yRIcon_three + ((rightButtonPosY + 1) * 16), 16, 16);
 				}
 			}
 			else
@@ -443,37 +390,32 @@ public class Gui_FinishingAnvil extends GuiContainer
 				drawTexturedModalRect(7, 33, 0, 176, 16, 16);
 				drawTexturedModalRect(7, 53, 0, 176, 16, 16);
 
-				//drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPosX * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
+				//drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPos * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
 
-				drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+
+			}
 
+			if(renderFlat)
+			{
+				bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, 17, 4);
 			}
+
 		}
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
 	}
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
-
 		mc.getTextureManager().bindTexture(iconLocation);
 		final int k = ((width - xSize) / 2);
 		final int l = (height - ySize) / 2;
 		drawTexturedModalRect(k, l, 0, 0, xSize + 80, ySize);
 
-		if(renderFlat)
-		{
-			((GuiButtonExt) buttonList.get(14)).enabled = false;
-			((GuiButtonExt) buttonList.get(15)).enabled = false;
-			((GuiButtonExt) buttonList.get(12)).displayString = "3D";
-
-			final ScaledResolution scaledresolution = new ScaledResolution(mc,
-					mc.displayWidth, mc.displayHeight);
-			bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, (int) (((scaledresolution.getScaledWidth() - 58) / 2) / 3.4), (int) (((scaledresolution.getScaledHeight() - 136) / 2) / 3.4));
-		}
-		else
+		if(!renderFlat)
 		{
 			if(bigCopy != null && bigCopy.getItem() instanceof ArmorCore)
 			{
@@ -487,8 +429,6 @@ public class Gui_FinishingAnvil extends GuiContainer
 				final ArmorRenderer renderer = (ArmorRenderer) armor.getArmorModel(null, bigCopy, 0);
 				renderer.isChild = false;
 
-				final float yaw = player.player.prevRotationYawHead + (player.player.rotationYawHead - player.player.prevRotationYawHead);
-				final float yawOffset = player.player.prevRenderYawOffset + (player.player.renderYawOffset - player.player.prevRenderYawOffset);
 				final float limbs = player.player.prevLimbSwingAmount + (player.player.limbSwingAmount - player.player.prevLimbSwingAmount);
 				final float limbSwing = player.player.limbSwing - player.player.limbSwingAmount * (1.0F);
 
@@ -525,16 +465,17 @@ public class Gui_FinishingAnvil extends GuiContainer
 					final ModelBiped biped = new ModelBiped(0f);
 					//biped.bipedHeadwear.isHidden = true;
 					//biped.bipedHead.isHidden = true;
-					ResourceLocation rc = AbstractClientPlayer.getLocationSkin(player.player.getDisplayName());
-					;
+					final ResourceLocation rc = new ResourceLocation(
+							Minecraft.getMinecraft().thePlayer.getLocationSkin().toString());
+
 					FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc);
-					if(tex.getGlTextureId() == 1)
-					{
-						rc = new ResourceLocation(
-								"minecraft:textures/entity/steve.png");
-						FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					}
+					//					final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc);
+					//					if(tex.getGlTextureId() == 1)
+					//					{
+					//						rc = new ResourceLocation(
+					//								"minecraft:textures/entity/steve.png");
+					//						FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
+					//					}
 
 					biped.isChild = false;
 					biped.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.0625f);
@@ -556,6 +497,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 				renderFlat = true;
 			}
 		}
+
 	}
 
 	protected void drawTooltip(int x, int y)
@@ -572,7 +514,8 @@ public class Gui_FinishingAnvil extends GuiContainer
 				if(bigCopy != null && bigCopy.getItem() instanceof ToolCore)
 				{
 					final ToolCore tool = (ToolCore) bigCopy.getItem();
-					final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(tool.getToolName());
+					final String toolName = tool.getUnlocalizedName().toLowerCase().substring(tool.getUnlocalizedName().lastIndexOf('.') + 1, tool.getUnlocalizedName().length());
+					final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(toolName);
 					final List<String> list = new ArrayList();
 
 					if(tt != null)
@@ -582,25 +525,25 @@ public class Gui_FinishingAnvil extends GuiContainer
 							case 0:
 								list.add(tt.getPart(1 + leftButtonPosX));
 								break;
-							case 1:
+							case 2:
 								list.add(tt.getPart(3 + leftButtonPosX));
 								break;
-							case 2:
+							case 1:
 								list.add(tt.getPart(2 + leftButtonPosX));
 								break;
 
 							case 3:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos)));
 								break;
 							case 4:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 1)));
 								break;
 							case 5:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 2)));
 								break;
 						}
 
-						if(list.get(0).contains("Metallurgy"))
+						if(list.get(0).contains("m5"))
 						{
 							list.add(" -by Shadowclaimer");
 						}
@@ -608,7 +551,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 					}
 					else if(bigCopy.getItem() instanceof ArmorCore)
 					{
-						final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
+						bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
 						final ArmorCore armor = (ArmorCore) bigCopy.getItem();
 						final List<ModelRenderer> boxes = armor.getRenderer().boxList;
 
@@ -620,13 +563,13 @@ public class Gui_FinishingAnvil extends GuiContainer
 								break;
 
 							case 3:
-								list.add(boxes.get(rightButtonPosX + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 9).boxName);
 								break;
 							case 4:
-								list.add(boxes.get(rightButtonPosX + 1 + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 1 + 9).boxName);
 								break;
 							case 5:
-								list.add(boxes.get(rightButtonPosX + 2 + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 2 + 9).boxName);
 								break;
 						}
 						func_146283_a(list, x, y);
@@ -640,4 +583,25 @@ public class Gui_FinishingAnvil extends GuiContainer
 			}
 		}
 	}
+
+	void setRenders()
+	{
+		rightCopy1 = bigCopy.copy();
+		rightCopyTags1 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags1.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags1.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy1.getTagCompound().setTag("InfiTool", rightCopyTags1);
+
+		rightCopy2 = bigCopy.copy();
+		rightCopyTags2 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags2.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags2.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy2.getTagCompound().setTag("InfiTool", rightCopyTags2);
+
+		rightCopy3 = bigCopy.copy();
+		rightCopyTags3 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags3.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags3.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy3.getTagCompound().setTag("InfiTool", rightCopyTags3);
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
index cf7253a..843b6c9 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
@@ -19,38 +19,38 @@ public class ModelFinishingAnvil extends ModelBase
 
 	public ModelFinishingAnvil()
 	{
-		this.textureWidth = 64;
-		this.textureHeight = 64;
-		this.AnvilTop = new ModelRenderer(this, 0, 22);
-		this.AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F);
-		this.AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F);
-		this.HammerHead = new ModelRenderer(this, 15, 21);
-		this.HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F);
-		this.HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F);
-		this.setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F);
-		this.AnvilStem = new ModelRenderer(this, 10, 32);
-		this.AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F);
-		this.AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F);
-		this.HammerHandle = new ModelRenderer(this, 17, 47);
-		this.HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F);
-		this.HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F);
-		this.AnvilBase = new ModelRenderer(this, 2, 28);
-		this.AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F);
-		this.AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F);
-		this.Log = new ModelRenderer(this, 0, 40);
-		this.Log.setRotationPoint(-8.0F, 16.0F, -8.0F);
-		this.Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F);
-		this.HammerHead.addChild(this.HammerHandle);
+		textureWidth = 64;
+		textureHeight = 64;
+		AnvilTop = new ModelRenderer(this, 0, 22);
+		AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F);
+		AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F);
+		HammerHead = new ModelRenderer(this, 15, 21);
+		HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F);
+		HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F);
+		setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F);
+		AnvilStem = new ModelRenderer(this, 10, 32);
+		AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F);
+		AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F);
+		HammerHandle = new ModelRenderer(this, 17, 47);
+		HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F);
+		HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F);
+		AnvilBase = new ModelRenderer(this, 2, 28);
+		AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F);
+		AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F);
+		Log = new ModelRenderer(this, 0, 40);
+		Log.setRotationPoint(-8.0F, 16.0F, -8.0F);
+		Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F);
+		HammerHead.addChild(HammerHandle);
 	}
 
 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
-		this.AnvilTop.render(f5);
-		this.HammerHead.render(f5);
-		this.AnvilStem.render(f5);
-		this.AnvilBase.render(f5);
-		this.Log.render(f5);
+		AnvilTop.render(f5);
+		HammerHead.render(f5);
+		AnvilStem.render(f5);
+		AnvilBase.render(f5);
+		Log.render(f5);
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
index edbd414..834b583 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
@@ -11,31 +11,35 @@ import org.lwjgl.opengl.GL11;
 
 public class RenderItem_FinishingAnvil extends RenderItem
 {
-	private Gui_FinishingAnvil	anvilGui;
+	private final Gui_FinishingAnvil	anvilGui;
+	float								sx;
+	float								sy;
+	float								sz;
 
-	RenderItem_FinishingAnvil(Gui_FinishingAnvil gui)
+	RenderItem_FinishingAnvil(Gui_FinishingAnvil gui, float sx, float sy, float sz)
 	{
 		super();
 		anvilGui = gui;
+		this.sx = sx;
+		this.sy = sy;
+		this.sz = sz;
 	}
 
 	@Override
 	public void renderItemAndEffectIntoGUI(FontRenderer fontRenderer, TextureManager textureManager, ItemStack itemStack, int x, int y)
 	{
 		if(itemStack == null)
-		{
 			return;
-		}
 
 		RenderHelper.enableGUIStandardItemLighting();
 
-		Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0);
+		final Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0);
 
 		if(slot.getStack() != null)
 		{
 			GL11.glPushMatrix();
 
-			GL11.glScalef(3.438f, 3.43f, 1.0f);
+			GL11.glScalef(sx, sy, sz);
 			super.renderItemAndEffectIntoGUI(fontRenderer, textureManager, itemStack, x, y);
 
 			GL11.glPopMatrix();
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
index db95e9f..c3013e4 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
@@ -14,7 +14,7 @@ public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer
 
 	public Renderer_FinishingAnvil()
 	{
-		this.model = new ModelFinishingAnvil();
+		model = new ModelFinishingAnvil();
 	}
 
 	@Override
@@ -25,17 +25,18 @@ public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer
 
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
-		ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/ArmorAnvil.png"));
+		final ResourceLocation textures = (new ResourceLocation(
+				"tinkersdefense:textures/blocks/armoranvil.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
 		GL11.glPushMatrix();
 
-		int meta = te.getBlockMetadata();
+		te.getBlockMetadata();
 
 		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
 
-		this.model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
 		GL11.glPopMatrix();
 		GL11.glPopMatrix();
 
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
index 3e68d51..e0567bb 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
@@ -33,7 +33,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public Packet getDescriptionPacket()
 	{
-		NBTTagCompound tag = new NBTTagCompound();
+		final NBTTagCompound tag = new NBTTagCompound();
 		writeToNBT(tag);
 		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
 	}
@@ -76,7 +76,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 				setInventorySlotContents(slot, null);
 			}
 
-			this.markDirty();
+			markDirty();
 		}
 		return stack;
 	}
@@ -84,7 +84,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public ItemStack getStackInSlotOnClosing(int slot)
 	{
-		ItemStack stack = getStackInSlot(slot);
+		final ItemStack stack = getStackInSlot(slot);
 
 		if(stack != null)
 		{
@@ -96,14 +96,14 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemstack)
 	{
-		this.inventory[slot] = itemstack;
+		inventory[slot] = itemstack;
 
-		if(itemstack != null && itemstack.stackSize > this.getInventoryStackLimit())
+		if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
 		{
-			itemstack.stackSize = this.getInventoryStackLimit();
+			itemstack.stackSize = getInventoryStackLimit();
 		}
 
-		this.markDirty();
+		markDirty();
 	}
 
 	@Override
@@ -164,11 +164,11 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 
 	public void readInventoryFromNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
+		final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
 		for(int iter = 0; iter < nbttaglist.tagCount(); iter++)
 		{
-			NBTTagCompound tagList = (NBTTagCompound) nbttaglist.getCompoundTagAt(iter);
-			byte slotID = tagList.getByte("Slot");
+			final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter);
+			final byte slotID = tagList.getByte("Slot");
 			if(slotID >= 0 && slotID < inventory.length)
 			{
 				inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList);
@@ -178,12 +178,12 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 
 	public void writeInventoryToNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = new NBTTagList();
+		final NBTTagList nbttaglist = new NBTTagList();
 		for(int iter = 0; iter < inventory.length; iter++)
 		{
 			if(inventory[iter] != null)
 			{
-				NBTTagCompound tagList = new NBTTagCompound();
+				final NBTTagCompound tagList = new NBTTagCompound();
 				tagList.setByte("Slot", (byte) iter);
 				inventory[iter].writeToNBT(tagList);
 				nbttaglist.appendTag(tagList);
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
new file mode 100644
index 0000000..9221376
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
@@ -0,0 +1,21 @@
+package lance5057.tDefense.finishingAnvil.utilities;
+
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileGetter extends SimpleFileVisitor<Path>
+{
+	final public List<String>	filenames	= new ArrayList<String>();
+
+	@Override
+	public FileVisitResult visitFile(Path file,
+			BasicFileAttributes attr)
+	{
+		filenames.add(file.getFileName().toString());
+		return FileVisitResult.CONTINUE;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
index 375b2e5..2b754f0 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -1,14 +1,23 @@
 package lance5057.tDefense.finishingAnvil.utilities;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import lance5057.tDefense.TinkersDefense;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.crafting.PatternBuilder;
 import tconstruct.library.crafting.PatternBuilder.MaterialSet;
@@ -28,12 +37,53 @@ public class Injector extends ToolCore
 		super(0);
 	}
 
-	protected void loadHeads(IIconRegister iconRegister)
+	protected void loadHeads(IIconRegister iconRegister) throws IOException, URISyntaxException
 	{
 
+		//		final URL jarFile =
+		//				TinkersDefense.class.getResource("assets/tinkersdefense/textures/items/");
+
 		final int toolLength = TConstructRegistry.tools.size();
 		for(int i = 0; i < toolLength; i++)
 		{
+			final String toolName = TConstructRegistry.tools.get(i).getUnlocalizedName().toLowerCase().substring(TConstructRegistry.tools.get(i).getUnlocalizedName().lastIndexOf('.') + 1, TConstructRegistry.tools.get(i).getUnlocalizedName().length());
+			final String path = "/assets/tinkersdefense/textures/items/" + toolName + "/";
+
+			final ResourceLocation loc = new ResourceLocation(
+					"tinkersdefense:textures/items/");
+			//final InputStream in = Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream();
+			//final List<String> filenames = new ArrayList<String>();
+			//final File files = new File(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
+
+			final Path zipfile = Paths.get(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
+			final FileSystem fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
+
+			final Path root = fs.getPath(path);
+			//final Iterable<FileStore> files = fs.getFileStores();
+			final FileGetter fileget = new FileGetter();
+
+			Files.walkFileTree(root, fileget);
+
+			//IDE
+			//final File files = new File(url.toURI());
+
+			if(TinkersDefense.config.debug)
+			{
+				for(final String file : fileget.filenames)
+				{
+					System.out.println(file);
+				}
+			}
+			setup(TConstructRegistry.tools.get(i), toolName, fileget.filenames, iconRegister);
+		}
+	}
+
+	//}
+	//}
+
+	private void setup(ToolCore tool, String name, List<String> filenames, IIconRegister iconRegister)
+	{
+		{
 			heads.clear();
 			accessories.clear();
 			handles.clear();
@@ -48,45 +98,116 @@ public class Injector extends ToolCore
 			extraStrings.clear();
 			extraIcons.clear();
 
-			final ToolCore tool = TConstructRegistry.tools.get(i);
-
 			final IIcon origHead = tool.headIcons.get(-1);
 			final IIcon origAccessory = tool.accessoryIcons.get(-1);
 			final IIcon origHandle = tool.handleIcons.get(-1);
 			final IIcon origExtra = tool.extraIcons.get(-1);
 
-			if(tool.getToolName().equals("Battleaxe"))
-			{
-				BattleAxe();
-			}
-			if(tool.getToolName().equals("Arrow"))
-			{
-				Arrow();
-			}
-			if(tool.getToolName().equals("Broadsword"))
-			{
-				Broadsword();
-			}
-			if(tool.getToolName().equals("Battlesign"))
-			{
-				Battlesign();
-			}
-			if(tool.getToolName().equals("Hatchet"))
-			{
-				Axe();
-			}
-			if(tool.getToolName().equals("Mattock"))
-			{
-				Mattock();
-			}
-			if(tool.getToolName().equals("Longbow"))
-			{
-				Longbow();
-			}
-			if(tool.getToolName().equals("HeaterShield"))
+			final ToolCoreTip tt = new ToolCoreTip();
+
+			tt.accessory = "Accessory";
+			tt.head = "Head";
+			tt.handle = "Handle";
+			tt.extra = "Extra";
+
+			tt.headTT.add("Standard");
+			tt.accessoryTT.add("Standard");
+			tt.handleTT.add("Standard");
+			tt.extraTT.add("Standard");
+
+			for(int i = 0; i < filenames.size(); i++)
 			{
-				HeaterShield();
+				final String filename = filenames.get(i);
+
+				if(filename.contains("head"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					heads.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted = formatted.replace('_', ' ');
+					tt.headTT.add(formatted);
+				}
+
+				if(filename.contains("accessory"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					accessories.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.accessoryTT.add(formatted);
+				}
+
+				if(filename.contains("handle"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					handles.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.handleTT.add(formatted);
+				}
+
+				if(filename.contains("extra"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					extras.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.extraTT.add(formatted);
+				}
 			}
+			//			tt.headTT.add("Magic Backhead");
+			//			tt.headTT.add("Scythe Backhead");
+			//
+			//			extras.add("_magic_extra");
+			//			extras.add("_scythe_extra");
+			//			extras.add("_halbard_extra");
+			//			extras.add("_ornate_extra");
+			//
+			//			tt.extraTT.add("Halbard Head");
+			//			tt.extraTT.add("Magic Head");
+			//			tt.extraTT.add("Scythe Head");
+			//			tt.extraTT.add("Ornate Head");
+			//
+			//			accessories.add("_magic_accessory");
+			//			accessories.add("_halbard_accessory");
+			//			accessories.add("_knob_accessory");
+
+			//Metallurgy 5
+
+			tools.put(name, tt);
+
+			//			if(tool.getToolName().equals("Battleaxe"))
+			//			{
+			//				BattleAxe();
+			//			}
+			//			if(tool.getToolName().equals("Arrow"))
+			//			{
+			//				Arrow();
+			//			}
+			//			if(tool.getToolName().equals("Broadsword"))
+			//			{
+			//				Broadsword();
+			//			}
+			//			if(tool.getToolName().equals("Battlesign"))
+			//			{
+			//				Battlesign();
+			//			}
+			//			if(tool.getToolName().equals("Hatchet"))
+			//			{
+			//				Axe();
+			//			}
+			//			if(tool.getToolName().equals("Mattock"))
+			//			{
+			//				Mattock();
+			//			}
+			//			if(tool.getToolName().equals("Longbow"))
+			//			{
+			//				Longbow();
+			//			}
+			//			if(tool.getToolName().equals("HeaterShield"))
+			//			{
+			//				HeaterShield();
+			//			}
 			setupIcons(tool, iconRegister, heads, headStrings, headIcons);
 			setupIcons(tool, iconRegister, accessories, accessoryStrings, accessoryIcons);
 			setupIcons(tool, iconRegister, handles, handleStrings, handleIcons);
@@ -114,7 +235,18 @@ public class Injector extends ToolCore
 	@Override
 	public void registerIcons(IIconRegister iconRegister)
 	{
-		loadHeads(iconRegister);
+		try
+		{
+			loadHeads(iconRegister);
+		}
+		catch(final IOException e)
+		{
+			System.out.print("No Finishing Anvil for you");
+		}
+		catch(final URISyntaxException e)
+		{
+			System.out.print("No Finishing Anvil for you");
+		}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
index 7da31f0..e93a11d 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
@@ -25,9 +25,9 @@ public class ToolCoreTip
 		{
 			case 1:
 				return head;
-			case 2:
-				return handle;
 			case 3:
+				return handle;
+			case 2:
 				return accessory;
 			case 4:
 				return extra;
@@ -41,16 +41,16 @@ public class ToolCoreTip
 		switch(partId)
 		{
 			case 1:
-				if(headTT.size() > 0 && headTT.size() >= id - 1 && headTT.get(id) != null)
+				if(headTT.size() > 0 && headTT.size() - 1 >= id && headTT.get(id) != null)
 					return headTT.get(id);
-			case 2:
-				if(handleTT.size() > 0 && handleTT.size() >= id - 1 && handleTT.get(id) != null)
-					return handleTT.get(id);
 			case 3:
-				if(accessoryTT.size() > 0 && accessoryTT.size() >= id - 1 && accessoryTT.get(id) != null)
+				if(handleTT.size() > 0 && handleTT.size() - 1 >= id && handleTT.get(id) != null)
+					return handleTT.get(id);
+			case 2:
+				if(accessoryTT.size() > 0 && accessoryTT.size() - 1 >= id && accessoryTT.get(id) != null)
 					return accessoryTT.get(id);
 			case 4:
-				if(extraTT.size() > 0 && extraTT.size() >= id - 1 && extraTT.get(id) != null)
+				if(extraTT.size() > 0 && extraTT.size() - 1 >= id && extraTT.get(id) != null)
 					return extraTT.get(id);
 			default:
 				return "";
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 2fd44ac..9234dc0 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -99,5 +99,15 @@ public class ClientProxy extends CommonProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_CrestMount.class, new Renderer_CrestMount());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_FinishingAnvil.class, new Renderer_FinishingAnvil());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_JewelersBench.class, new Renderer_JewelersBench());
+
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_ArmorAnvil), new CustomModelItemRenderer(
+		//				new Renderer_FinishingAnvil(), new TileEntity_FinishingAnvil()));
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_CrestMount), new CustomModelItemRenderer(
+		//				new Renderer_CrestMount(), new TileEntity_CrestMount()));
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_JewelersBench), new CustomModelItemRenderer(
+		//				new Renderer_JewelersBench(), new TileEntity_JewelersBench()));
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index 0caa0e0..643b068 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -4,7 +4,6 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
-import lance5057.tDefense.core.gui.GuiTDGuideBook;
 import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Container_FinishingAnvil;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Gui_FinishingAnvil;
@@ -65,8 +64,6 @@ public class CommonProxy implements IGuiHandler
 		if(ID == TinkersDefense.GUI_ANVIL_INV)
 			return new Gui_FinishingAnvil(player.inventory,
 					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
-		if(ID == TinkersDefense.GUI_GUIDEBOOK)
-			return new GuiTDGuideBook();
 		return null;
 	}
 }
diff --git a/src/main/resources/assets/tinker/textures/gui/icons.png b/src/main/resources/assets/tinker/textures/gui/icons.png
index 28b7662..0e06248 100644
--- a/src/main/resources/assets/tinker/textures/gui/icons.png
+++ b/src/main/resources/assets/tinker/textures/gui/icons.png
diff --git a/src/main/resources/assets/tinker/textures/items/arrow/manacore_arrow_effect.png b/src/main/resources/assets/tinker/textures/items/arrow/manacore_arrow_effect.png
new file mode 100644
index 0000000..005220b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/arrow/manacore_arrow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/arrow/scabbing_arrow_effect.png b/src/main/resources/assets/tinker/textures/items/arrow/scabbing_arrow_effect.png
new file mode 100644
index 0000000..65d802e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/arrow/scabbing_arrow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/arrow/supping_arrow_effect.png b/src/main/resources/assets/tinker/textures/items/arrow/supping_arrow_effect.png
new file mode 100644
index 0000000..22c2f7c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/arrow/supping_arrow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/arrow/terracore_arrow_effect.png b/src/main/resources/assets/tinker/textures/items/arrow/terracore_arrow_effect.png
new file mode 100644
index 0000000..b6198a6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/arrow/terracore_arrow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/arrow/textbook_arrow_effect.png b/src/main/resources/assets/tinker/textures/items/arrow/textbook_arrow_effect.png
new file mode 100644
index 0000000..d3ad284
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/arrow/textbook_arrow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/axe/manacore_axe_effect.png b/src/main/resources/assets/tinker/textures/items/axe/manacore_axe_effect.png
new file mode 100644
index 0000000..00424e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/axe/manacore_axe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/axe/scabbing_axe_effect.png b/src/main/resources/assets/tinker/textures/items/axe/scabbing_axe_effect.png
new file mode 100644
index 0000000..9717395
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/axe/scabbing_axe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battleaxe/manacore_battleaxe_effect.png b/src/main/resources/assets/tinker/textures/items/battleaxe/manacore_battleaxe_effect.png
new file mode 100644
index 0000000..2157b59
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battleaxe/manacore_battleaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battleaxe/scabbing_battleaxe_effect.png b/src/main/resources/assets/tinker/textures/items/battleaxe/scabbing_battleaxe_effect.png
new file mode 100644
index 0000000..2d5141b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battleaxe/scabbing_battleaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battleaxe/supping_battleaxe_effect.png b/src/main/resources/assets/tinker/textures/items/battleaxe/supping_battleaxe_effect.png
new file mode 100644
index 0000000..d97a974
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battleaxe/supping_battleaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battleaxe/terracore_battleaxe_effect.png b/src/main/resources/assets/tinker/textures/items/battleaxe/terracore_battleaxe_effect.png
new file mode 100644
index 0000000..1121bf1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battleaxe/terracore_battleaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battleaxe/textbook_battleaxe_effect.png b/src/main/resources/assets/tinker/textures/items/battleaxe/textbook_battleaxe_effect.png
new file mode 100644
index 0000000..88ce334
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battleaxe/textbook_battleaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battlesign/manacore_battlesign_effect.png b/src/main/resources/assets/tinker/textures/items/battlesign/manacore_battlesign_effect.png
new file mode 100644
index 0000000..1ff39f7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battlesign/manacore_battlesign_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battlesign/scabbing_battlesign_effect.png b/src/main/resources/assets/tinker/textures/items/battlesign/scabbing_battlesign_effect.png
new file mode 100644
index 0000000..e4f55d6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battlesign/scabbing_battlesign_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battlesign/supping_battlesign_effect.png b/src/main/resources/assets/tinker/textures/items/battlesign/supping_battlesign_effect.png
new file mode 100644
index 0000000..e92d2f9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battlesign/supping_battlesign_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battlesign/terracore_battlesign_effect.png b/src/main/resources/assets/tinker/textures/items/battlesign/terracore_battlesign_effect.png
new file mode 100644
index 0000000..5418c30
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battlesign/terracore_battlesign_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/battlesign/textbook_battlesign_effect.png b/src/main/resources/assets/tinker/textures/items/battlesign/textbook_battlesign_effect.png
new file mode 100644
index 0000000..2e51a3e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/battlesign/textbook_battlesign_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/bolt/manacore_bolt_effect.png b/src/main/resources/assets/tinker/textures/items/bolt/manacore_bolt_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/bolt/manacore_bolt_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/bolt/scabbing_bolt_effect.png b/src/main/resources/assets/tinker/textures/items/bolt/scabbing_bolt_effect.png
new file mode 100644
index 0000000..72cc0d1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/bolt/scabbing_bolt_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/bolt/supping_bolt_effect.png b/src/main/resources/assets/tinker/textures/items/bolt/supping_bolt_effect.png
new file mode 100644
index 0000000..b3aec0e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/bolt/supping_bolt_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/bolt/terracore_bolt_effect.png b/src/main/resources/assets/tinker/textures/items/bolt/terracore_bolt_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/bolt/terracore_bolt_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/bolt/textbook_bolt_effect.png b/src/main/resources/assets/tinker/textures/items/bolt/textbook_bolt_effect.png
new file mode 100644
index 0000000..f7f41f5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/bolt/textbook_bolt_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/_sword_accessory.png b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_accessory.png
new file mode 100644
index 0000000..74921ab
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_accessory.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/_sword_blade.png b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_blade.png
new file mode 100644
index 0000000..4b02302
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/_sword_handle.png b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_handle.png
new file mode 100644
index 0000000..967b810
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/_sword_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/bloodoath_sword_effect copy.png b/src/main/resources/assets/tinker/textures/items/broadsword/bloodoath_sword_effect copy.png
new file mode 100644
index 0000000..783c5f9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/bloodoath_sword_effect copy.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/manacore_sword_effect.png b/src/main/resources/assets/tinker/textures/items/broadsword/manacore_sword_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/manacore_sword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/supping_sword_effect.png b/src/main/resources/assets/tinker/textures/items/broadsword/supping_sword_effect.png
new file mode 100644
index 0000000..de72acc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/supping_sword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/terracore_sword_effect.png b/src/main/resources/assets/tinker/textures/items/broadsword/terracore_sword_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/terracore_sword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/xpboost_sword_effect.png b/src/main/resources/assets/tinker/textures/items/broadsword/xpboost_sword_effect.png
new file mode 100644
index 0000000..b5b8a63
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/xpboost_sword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/chisel/_chisel_handle.png b/src/main/resources/assets/tinker/textures/items/chisel/_chisel_handle.png
new file mode 100644
index 0000000..9d95f87
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/chisel/_chisel_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/chisel/_chisel_head.png b/src/main/resources/assets/tinker/textures/items/chisel/_chisel_head.png
new file mode 100644
index 0000000..479a316
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/chisel/_chisel_head.png
diff --git a/src/main/resources/assets/tinker/textures/items/chisel/manacore_chisel_effect.png b/src/main/resources/assets/tinker/textures/items/chisel/manacore_chisel_effect.png
new file mode 100644
index 0000000..00424e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/chisel/manacore_chisel_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/chisel/scabbing_chisel_effect.png b/src/main/resources/assets/tinker/textures/items/chisel/scabbing_chisel_effect.png
new file mode 100644
index 0000000..9b029a4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/chisel/scabbing_chisel_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cleaver/manacore_cleaver_effect.png b/src/main/resources/assets/tinker/textures/items/cleaver/manacore_cleaver_effect.png
new file mode 100644
index 0000000..005220b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cleaver/manacore_cleaver_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cleaver/scabbing_cleaver_effect.png b/src/main/resources/assets/tinker/textures/items/cleaver/scabbing_cleaver_effect.png
new file mode 100644
index 0000000..d09ca12
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cleaver/scabbing_cleaver_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cleaver/supping_cleaver_effect.png b/src/main/resources/assets/tinker/textures/items/cleaver/supping_cleaver_effect.png
new file mode 100644
index 0000000..2ab1a35
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cleaver/supping_cleaver_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cleaver/terracore_cleaver_effect.png b/src/main/resources/assets/tinker/textures/items/cleaver/terracore_cleaver_effect.png
new file mode 100644
index 0000000..b6198a6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cleaver/terracore_cleaver_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cleaver/textbook_cleaver_effect.png b/src/main/resources/assets/tinker/textures/items/cleaver/textbook_cleaver_effect.png
new file mode 100644
index 0000000..c6c5ee4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cleaver/textbook_cleaver_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/crossbow/manacore_crossbow_effect.png b/src/main/resources/assets/tinker/textures/items/crossbow/manacore_crossbow_effect.png
new file mode 100644
index 0000000..4e38e96
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/crossbow/manacore_crossbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/crossbow/scabbing_crossbow_effect.png b/src/main/resources/assets/tinker/textures/items/crossbow/scabbing_crossbow_effect.png
new file mode 100644
index 0000000..4e8b106
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/crossbow/scabbing_crossbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/crossbow/supping_crossbow_effect.png b/src/main/resources/assets/tinker/textures/items/crossbow/supping_crossbow_effect.png
new file mode 100644
index 0000000..41b1cc2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/crossbow/supping_crossbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/crossbow/terracore_crossbow_effect.png b/src/main/resources/assets/tinker/textures/items/crossbow/terracore_crossbow_effect.png
new file mode 100644
index 0000000..743da0a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/crossbow/terracore_crossbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/crossbow/textbook_crossbow_effect.png b/src/main/resources/assets/tinker/textures/items/crossbow/textbook_crossbow_effect.png
new file mode 100644
index 0000000..a03ff18
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/crossbow/textbook_crossbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cutlass/manacore_cutlass_effect.png b/src/main/resources/assets/tinker/textures/items/cutlass/manacore_cutlass_effect.png
new file mode 100644
index 0000000..9c90aad
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cutlass/manacore_cutlass_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cutlass/scabbing_cutlass_effect.png b/src/main/resources/assets/tinker/textures/items/cutlass/scabbing_cutlass_effect.png
new file mode 100644
index 0000000..6a4695d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cutlass/scabbing_cutlass_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cutlass/supping_cutlass_effect.png b/src/main/resources/assets/tinker/textures/items/cutlass/supping_cutlass_effect.png
new file mode 100644
index 0000000..e810c97
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cutlass/supping_cutlass_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cutlass/terracore_cutlass_effect.png b/src/main/resources/assets/tinker/textures/items/cutlass/terracore_cutlass_effect.png
new file mode 100644
index 0000000..2418019
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cutlass/terracore_cutlass_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/cutlass/textbook_cutlass_effect.png b/src/main/resources/assets/tinker/textures/items/cutlass/textbook_cutlass_effect.png
new file mode 100644
index 0000000..d973f98
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/cutlass/textbook_cutlass_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/dagger/manacore_dagger_effect.png b/src/main/resources/assets/tinker/textures/items/dagger/manacore_dagger_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/dagger/manacore_dagger_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/dagger/scabbing_dagger_effect.png b/src/main/resources/assets/tinker/textures/items/dagger/scabbing_dagger_effect.png
new file mode 100644
index 0000000..03d5754
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/dagger/scabbing_dagger_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/dagger/supping_dagger_effect.png b/src/main/resources/assets/tinker/textures/items/dagger/supping_dagger_effect.png
new file mode 100644
index 0000000..9201fcf
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/dagger/supping_dagger_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/dagger/terracore_dagger_effect.png b/src/main/resources/assets/tinker/textures/items/dagger/terracore_dagger_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/dagger/terracore_dagger_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/dagger/textbook_dagger_effect.png b/src/main/resources/assets/tinker/textures/items/dagger/textbook_dagger_effect.png
new file mode 100644
index 0000000..e8a48bf
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/dagger/textbook_dagger_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/excavator/manacore_excavator_effect.png b/src/main/resources/assets/tinker/textures/items/excavator/manacore_excavator_effect.png
new file mode 100644
index 0000000..95662c2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/excavator/manacore_excavator_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/excavator/scabbing_excavator_effect.png b/src/main/resources/assets/tinker/textures/items/excavator/scabbing_excavator_effect.png
new file mode 100644
index 0000000..974b787
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/excavator/scabbing_excavator_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/frypan/manacore_frypan_effect.png b/src/main/resources/assets/tinker/textures/items/frypan/manacore_frypan_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/frypan/manacore_frypan_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/frypan/scabbing_frypan_effect.png b/src/main/resources/assets/tinker/textures/items/frypan/scabbing_frypan_effect.png
new file mode 100644
index 0000000..72e1040
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/frypan/scabbing_frypan_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/frypan/supping_frypan_effect.png b/src/main/resources/assets/tinker/textures/items/frypan/supping_frypan_effect.png
new file mode 100644
index 0000000..61aaf3e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/frypan/supping_frypan_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/frypan/terracore_frypan_effect.png b/src/main/resources/assets/tinker/textures/items/frypan/terracore_frypan_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/frypan/terracore_frypan_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/frypan/textbook_frypan_effect.png b/src/main/resources/assets/tinker/textures/items/frypan/textbook_frypan_effect.png
new file mode 100644
index 0000000..550bac4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/frypan/textbook_frypan_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/hammer/manacore_hammer_effect.png b/src/main/resources/assets/tinker/textures/items/hammer/manacore_hammer_effect.png
new file mode 100644
index 0000000..2157b59
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/hammer/manacore_hammer_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/hammer/scabbing_hammer_effect.png b/src/main/resources/assets/tinker/textures/items/hammer/scabbing_hammer_effect.png
new file mode 100644
index 0000000..f225858
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/hammer/scabbing_hammer_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/hammer/supping_hammer_effect.png b/src/main/resources/assets/tinker/textures/items/hammer/supping_hammer_effect.png
new file mode 100644
index 0000000..c30e95e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/hammer/supping_hammer_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/hammer/terracore_hammer_effect.png b/src/main/resources/assets/tinker/textures/items/hammer/terracore_hammer_effect.png
new file mode 100644
index 0000000..1121bf1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/hammer/terracore_hammer_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/hammer/textbook_hammer_effect.png b/src/main/resources/assets/tinker/textures/items/hammer/textbook_hammer_effect.png
new file mode 100644
index 0000000..50fcfe5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/hammer/textbook_hammer_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/black_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/black_legends_shield_effect.png
new file mode 100644
index 0000000..57e63a4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/black_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blue_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/blue_legends_shield_effect.png
new file mode 100644
index 0000000..68d54bc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/blue_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/brown_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/brown_legends_shield_effect.png
new file mode 100644
index 0000000..8445167
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/brown_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cyan_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/cyan_legends_shield_effect.png
new file mode 100644
index 0000000..263b348
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/cyan_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png
new file mode 100644
index 0000000..dd223df
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png
new file mode 100644
index 0000000..9a2e3c7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/gray_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/gray_legends_shield_effect.png
new file mode 100644
index 0000000..4a5c5b5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/gray_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/green_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/green_legends_shield_effect.png
new file mode 100644
index 0000000..2aa3207
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/green_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/lightblue_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/lightblue_legends_shield_effect.png
new file mode 100644
index 0000000..b492596
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/lightblue_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/lightgray_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/lightgray_legends_shield_effect.png
new file mode 100644
index 0000000..faa2bd4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/lightgray_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/lime_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/lime_legends_shield_effect.png
new file mode 100644
index 0000000..3c8834a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/lime_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/magenta_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/magenta_legends_shield_effect.png
new file mode 100644
index 0000000..f89f3c7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/magenta_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/manacore_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/manacore_shield_effect.png
new file mode 100644
index 0000000..00424e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/manacore_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/orange_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/orange_legends_shield_effect.png
new file mode 100644
index 0000000..861ef64
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/orange_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/pink_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/pink_legends_shield_effect.png
new file mode 100644
index 0000000..9a3c419
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/pink_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/purple_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/purple_legends_shield_effect.png
new file mode 100644
index 0000000..577babe
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/purple_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/red_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/red_legends_shield_effect.png
new file mode 100644
index 0000000..20096b2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/red_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/scabbing_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/scabbing_shield_effect.png
new file mode 100644
index 0000000..60dca37
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/scabbing_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/white_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/white_legends_shield_effect.png
new file mode 100644
index 0000000..7bbe21d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/white_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/yellow_legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/yellow_legends_shield_effect.png
new file mode 100644
index 0000000..dcb90d1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/yellow_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/javalin/manacore_javalin_effect.png b/src/main/resources/assets/tinker/textures/items/javalin/manacore_javalin_effect.png
new file mode 100644
index 0000000..e990245
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/javalin/manacore_javalin_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/javalin/scabbing_javalin_effect.png b/src/main/resources/assets/tinker/textures/items/javalin/scabbing_javalin_effect.png
new file mode 100644
index 0000000..d1fbce2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/javalin/scabbing_javalin_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/javalin/supping_javalin_effect.png b/src/main/resources/assets/tinker/textures/items/javalin/supping_javalin_effect.png
new file mode 100644
index 0000000..533cf55
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/javalin/supping_javalin_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/javalin/terracore_javalin_effect.png b/src/main/resources/assets/tinker/textures/items/javalin/terracore_javalin_effect.png
new file mode 100644
index 0000000..291d4d4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/javalin/terracore_javalin_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/javalin/textbook_javalin_effect.png b/src/main/resources/assets/tinker/textures/items/javalin/textbook_javalin_effect.png
new file mode 100644
index 0000000..e45652d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/javalin/textbook_javalin_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longbow/manacore_longbow_effect.png b/src/main/resources/assets/tinker/textures/items/longbow/manacore_longbow_effect.png
new file mode 100644
index 0000000..e990245
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longbow/manacore_longbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longbow/scabbing_longbow_effect.png b/src/main/resources/assets/tinker/textures/items/longbow/scabbing_longbow_effect.png
new file mode 100644
index 0000000..182427d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longbow/scabbing_longbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longbow/supping_longbow_effect.png b/src/main/resources/assets/tinker/textures/items/longbow/supping_longbow_effect.png
new file mode 100644
index 0000000..1f3c89c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longbow/supping_longbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longbow/terracore_longbow_effect.png b/src/main/resources/assets/tinker/textures/items/longbow/terracore_longbow_effect.png
new file mode 100644
index 0000000..291d4d4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longbow/terracore_longbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longbow/textbook_longbow_effect.png b/src/main/resources/assets/tinker/textures/items/longbow/textbook_longbow_effect.png
new file mode 100644
index 0000000..b10bf80
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longbow/textbook_longbow_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/manacore_longsword_effect.png b/src/main/resources/assets/tinker/textures/items/longsword/manacore_longsword_effect.png
new file mode 100644
index 0000000..3135dd9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/manacore_longsword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/scabbing_longsword_effect.png b/src/main/resources/assets/tinker/textures/items/longsword/scabbing_longsword_effect.png
new file mode 100644
index 0000000..97cdb6d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/scabbing_longsword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/supping_longsword_effect.png b/src/main/resources/assets/tinker/textures/items/longsword/supping_longsword_effect.png
new file mode 100644
index 0000000..872727f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/supping_longsword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/terracore_longsword_effect.png b/src/main/resources/assets/tinker/textures/items/longsword/terracore_longsword_effect.png
new file mode 100644
index 0000000..cccbf33
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/terracore_longsword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/textbook_longsword_effect.png b/src/main/resources/assets/tinker/textures/items/longsword/textbook_longsword_effect.png
new file mode 100644
index 0000000..2ac0aaa
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/textbook_longsword_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_binding.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_binding.png
new file mode 100644
index 0000000..2782ac2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_binding.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_handle.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_handle.png
new file mode 100644
index 0000000..5f02130
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_head.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_head.png
new file mode 100644
index 0000000..969fe4b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_head.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_shield.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_shield.png
new file mode 100644
index 0000000..4b24db5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/_lumberaxe_shield.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/manacore_lumberaxe_effect.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/manacore_lumberaxe_effect.png
new file mode 100644
index 0000000..68e4e66
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/manacore_lumberaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/lumberaxe/scabbing_lumberaxe_effect.png b/src/main/resources/assets/tinker/textures/items/lumberaxe/scabbing_lumberaxe_effect.png
new file mode 100644
index 0000000..6176f05
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/lumberaxe/scabbing_lumberaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/mattock/manacore_mattock_effect.png b/src/main/resources/assets/tinker/textures/items/mattock/manacore_mattock_effect.png
new file mode 100644
index 0000000..00424e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/mattock/manacore_mattock_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/mattock/scabbing_mattock_effect.png b/src/main/resources/assets/tinker/textures/items/mattock/scabbing_mattock_effect.png
new file mode 100644
index 0000000..423ecef
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/mattock/scabbing_mattock_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/parts/_clasp.png b/src/main/resources/assets/tinker/textures/items/parts/_clasp.png
index 9919256..20ab87f 100644
--- a/src/main/resources/assets/tinker/textures/items/parts/_clasp.png
+++ b/src/main/resources/assets/tinker/textures/items/parts/_clasp.png
diff --git a/src/main/resources/assets/tinker/textures/items/pickaxe/manacore_pickaxe_effect.png b/src/main/resources/assets/tinker/textures/items/pickaxe/manacore_pickaxe_effect.png
new file mode 100644
index 0000000..c4fa9aa
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/pickaxe/manacore_pickaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/pickaxe/scabbing_pickaxe_effect.png b/src/main/resources/assets/tinker/textures/items/pickaxe/scabbing_pickaxe_effect.png
new file mode 100644
index 0000000..a160cfe
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/pickaxe/scabbing_pickaxe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/rapier/manacore_rapier_effect.png b/src/main/resources/assets/tinker/textures/items/rapier/manacore_rapier_effect.png
new file mode 100644
index 0000000..f28f691
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/rapier/manacore_rapier_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/rapier/scabbing_rapier_effect.png b/src/main/resources/assets/tinker/textures/items/rapier/scabbing_rapier_effect.png
new file mode 100644
index 0000000..0d81a61
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/rapier/scabbing_rapier_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/rapier/supping_rapier_effect.png b/src/main/resources/assets/tinker/textures/items/rapier/supping_rapier_effect.png
new file mode 100644
index 0000000..3fbfd66
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/rapier/supping_rapier_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/rapier/terracore_rapier_effect.png b/src/main/resources/assets/tinker/textures/items/rapier/terracore_rapier_effect.png
new file mode 100644
index 0000000..970c471
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/rapier/terracore_rapier_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/rapier/textbook_rapier_effect.png b/src/main/resources/assets/tinker/textures/items/rapier/textbook_rapier_effect.png
new file mode 100644
index 0000000..8405cc9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/rapier/textbook_rapier_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/scythe/manacore_scythe_effect.png b/src/main/resources/assets/tinker/textures/items/scythe/manacore_scythe_effect.png
new file mode 100644
index 0000000..a20b4a5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/scythe/manacore_scythe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/scythe/scabbing_scythe_effect.png b/src/main/resources/assets/tinker/textures/items/scythe/scabbing_scythe_effect.png
new file mode 100644
index 0000000..cae72d5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/scythe/scabbing_scythe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/scythe/supping_scythe_effect.png b/src/main/resources/assets/tinker/textures/items/scythe/supping_scythe_effect.png
new file mode 100644
index 0000000..237ed8c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/scythe/supping_scythe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/scythe/terracore_scythe_effect.png b/src/main/resources/assets/tinker/textures/items/scythe/terracore_scythe_effect.png
new file mode 100644
index 0000000..36aadcf
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/scythe/terracore_scythe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/scythe/textbook_scythe_effect.png b/src/main/resources/assets/tinker/textures/items/scythe/textbook_scythe_effect.png
new file mode 100644
index 0000000..7cd4dc0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/scythe/textbook_scythe_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/_shield_edge.png
index 9d39ddd..e5922c5 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/_shield_edge.png
+++ b/src/main/resources/assets/tinker/textures/items/shield/_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_blades_shield_effect.png
new file mode 100644
index 0000000..d40242f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_feathers_shield_effect.png
new file mode 100644
index 0000000..8d6a764
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_gluttony_shield_effect.png
new file mode 100644
index 0000000..262a09e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_light_shield_effect.png
new file mode 100644
index 0000000..d01fe4a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_mirrors_shield_effect.png
new file mode 100644
index 0000000..b1beea5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_pitch_shield_effect.png
new file mode 100644
index 0000000..0b90c15
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_retribution_shield_effect.png
new file mode 100644
index 0000000..4d8cdd1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..ef6067b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_thorns_shield_effect.png
new file mode 100644
index 0000000..65aed6c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/black_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/black_wind_shield_effect.png
new file mode 100644
index 0000000..d782240
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/black_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_blades_shield_effect.png
new file mode 100644
index 0000000..997f343
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_feathers_shield_effect.png
new file mode 100644
index 0000000..40d7629
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_gluttony_shield_effect.png
new file mode 100644
index 0000000..3d94725
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_light_shield_effect.png
new file mode 100644
index 0000000..78be6fc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_mirrors_shield_effect.png
new file mode 100644
index 0000000..563ed7b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_pitch_shield_effect.png
new file mode 100644
index 0000000..e4b3739
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_retribution_shield_effect.png
new file mode 100644
index 0000000..f13e5ba
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..12d3203
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_thorns_shield_effect.png
new file mode 100644
index 0000000..b2814f0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blue_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/blue_wind_shield_effect.png
new file mode 100644
index 0000000..e4afcd2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_blades_shield_effect.png
new file mode 100644
index 0000000..5467ea7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_feathers_shield_effect.png
new file mode 100644
index 0000000..28ea96e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_gluttony_shield_effect.png
new file mode 100644
index 0000000..2fa5cac
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_light_shield_effect.png
new file mode 100644
index 0000000..ed9d801
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_mirrors_shield_effect.png
new file mode 100644
index 0000000..03ed6dc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_pitch_shield_effect.png
new file mode 100644
index 0000000..c81109e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_retribution_shield_effect.png
new file mode 100644
index 0000000..1b5c207
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..e975e2e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_thorns_shield_effect.png
new file mode 100644
index 0000000..4b81189
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/brown_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/brown_wind_shield_effect.png
new file mode 100644
index 0000000..d03cc7e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/brown_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_blades_shield_effect.png
new file mode 100644
index 0000000..d02976a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_feathers_shield_effect.png
new file mode 100644
index 0000000..0913f90
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_gluttony_shield_effect.png
new file mode 100644
index 0000000..337c789
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_light_shield_effect.png
new file mode 100644
index 0000000..19c9fd9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_mirrors_shield_effect.png
new file mode 100644
index 0000000..3549f42
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_pitch_shield_effect.png
new file mode 100644
index 0000000..e3b6fd7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_retribution_shield_effect.png
new file mode 100644
index 0000000..445e29d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..7c645c3
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_thorns_shield_effect.png
new file mode 100644
index 0000000..a313f63
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cyan_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/cyan_wind_shield_effect.png
new file mode 100644
index 0000000..ea6393b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cyan_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/diamond_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/diamond_shield_effect.png
index f6eba6d..91950f5 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/diamond_shield_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/shield/diamond_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/emerald_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/emerald_shield_effect.png
index 5a71085..b292e91 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/emerald_shield_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/shield/emerald_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_blades_shield_effect.png
new file mode 100644
index 0000000..97929e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_feathers_shield_effect.png
new file mode 100644
index 0000000..c1ee2a5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_gluttony_shield_effect.png
new file mode 100644
index 0000000..652f789
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_light_shield_effect.png
new file mode 100644
index 0000000..7d83a19
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_mirrors_shield_effect.png
new file mode 100644
index 0000000..427716c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_pitch_shield_effect.png
new file mode 100644
index 0000000..e3ec66c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_retribution_shield_effect.png
new file mode 100644
index 0000000..78b792c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..d5bf3bb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_thorns_shield_effect.png
new file mode 100644
index 0000000..595877e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/gray_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/gray_wind_shield_effect.png
new file mode 100644
index 0000000..93e4f8f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/gray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_blades_shield_effect.png
new file mode 100644
index 0000000..c0257cf
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_feathers_shield_effect.png
new file mode 100644
index 0000000..5c67538
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_gluttony_shield_effect.png
new file mode 100644
index 0000000..6d4892a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_light_shield_effect.png
new file mode 100644
index 0000000..1c2cb39
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_mirrors_shield_effect.png
new file mode 100644
index 0000000..e298d66
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_pitch_shield_effect.png
new file mode 100644
index 0000000..11efa61
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_retribution_shield_effect.png
new file mode 100644
index 0000000..929ff29
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..dfc0efc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_thorns_shield_effect.png
new file mode 100644
index 0000000..b5bbc92
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/green_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/green_wind_shield_effect.png
new file mode 100644
index 0000000..ffc3cb9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/green_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lapis_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lapis_shield_effect.png
deleted file mode 100644
index 7251eae..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/lapis_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lava_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lava_shield_effect.png
deleted file mode 100644
index 9b5afbc..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/lava_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_blades_shield_effect.png
new file mode 100644
index 0000000..1627381
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_feathers_shield_effect.png
new file mode 100644
index 0000000..435fc51
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_gluttony_shield_effect.png
new file mode 100644
index 0000000..fad504c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_light_shield_effect.png
new file mode 100644
index 0000000..cc601bc
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_mirrors_shield_effect.png
new file mode 100644
index 0000000..fe1285d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_pitch_shield_effect.png
new file mode 100644
index 0000000..ece1205
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_retribution_shield_effect.png
new file mode 100644
index 0000000..9378a84
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..0069e28
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_thorns_shield_effect.png
new file mode 100644
index 0000000..590b9c5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightblue_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightblue_wind_shield_effect.png
new file mode 100644
index 0000000..47be5ac
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightblue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_blades_shield_effect.png
new file mode 100644
index 0000000..a585c20
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_feathers_shield_effect.png
new file mode 100644
index 0000000..3693d91
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_gluttony_shield_effect.png
new file mode 100644
index 0000000..2b2ad0d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_light_shield_effect.png
new file mode 100644
index 0000000..282c123
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_mirrors_shield_effect.png
new file mode 100644
index 0000000..ebb349d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_pitch_shield_effect.png
new file mode 100644
index 0000000..53c2559
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_retribution_shield_effect.png
new file mode 100644
index 0000000..850ce00
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..5296d59
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_thorns_shield_effect.png
new file mode 100644
index 0000000..dd46475
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lightgray_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lightgray_wind_shield_effect.png
new file mode 100644
index 0000000..f93ad57
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lightgray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_blades_shield_effect.png
new file mode 100644
index 0000000..c77ef47
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_feathers_shield_effect.png
new file mode 100644
index 0000000..404c35c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_gluttony_shield_effect.png
new file mode 100644
index 0000000..54681e7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_light_shield_effect.png
new file mode 100644
index 0000000..187f7db
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_mirrors_shield_effect.png
new file mode 100644
index 0000000..0996af9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_pitch_shield_effect.png
new file mode 100644
index 0000000..eec21f6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_retribution_shield_effect.png
new file mode 100644
index 0000000..be3a0b2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..4e94018
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_thorns_shield_effect.png
new file mode 100644
index 0000000..7efe6b6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/lime_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/lime_wind_shield_effect.png
new file mode 100644
index 0000000..4e6c9e0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/lime_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_blades_shield_effect.png
new file mode 100644
index 0000000..a5cc704
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_feathers_shield_effect.png
new file mode 100644
index 0000000..03ba26b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_gluttony_shield_effect.png
new file mode 100644
index 0000000..2535012
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_light_shield_effect.png
new file mode 100644
index 0000000..a1c58da
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_mirrors_shield_effect.png
new file mode 100644
index 0000000..4cb344d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_pitch_shield_effect.png
new file mode 100644
index 0000000..941220b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_retribution_shield_effect.png
new file mode 100644
index 0000000..af255cb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..7597bc0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_thorns_shield_effect.png
new file mode 100644
index 0000000..eb0e157
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/magenta_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/magenta_wind_shield_effect.png
new file mode 100644
index 0000000..3b37561
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/magenta_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/manacore_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/manacore_shield_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/manacore_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/necrotic_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/necrotic_shield_effect.png
deleted file mode 100644
index b255548..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/necrotic_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_blades_shield_effect.png
new file mode 100644
index 0000000..1ba0689
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_feathers_shield_effect.png
new file mode 100644
index 0000000..9f3e324
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_gluttony_shield_effect.png
new file mode 100644
index 0000000..51c3b84
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_light_shield_effect.png
new file mode 100644
index 0000000..4146d3e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_mirrors_shield_effect.png
new file mode 100644
index 0000000..6d8ac8c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_pitch_shield_effect.png
new file mode 100644
index 0000000..0f4e1cb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_retribution_shield_effect.png
new file mode 100644
index 0000000..35eb175
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..2031e21
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_thorns_shield_effect.png
new file mode 100644
index 0000000..1ce2cef
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/orange_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/orange_wind_shield_effect.png
new file mode 100644
index 0000000..1a7089a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/orange_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_blades_shield_effect.png
new file mode 100644
index 0000000..e8f49b2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_feathers_shield_effect.png
new file mode 100644
index 0000000..c917004
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_gluttony_shield_effect.png
new file mode 100644
index 0000000..d409ece
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_light_shield_effect.png
new file mode 100644
index 0000000..e0f8ce0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_mirrors_shield_effect.png
new file mode 100644
index 0000000..d225ddd
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_pitch_shield_effect.png
new file mode 100644
index 0000000..de7a6a2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_retribution_shield_effect.png
new file mode 100644
index 0000000..ce5d3e3
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..382d675
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_thorns_shield_effect.png
new file mode 100644
index 0000000..7d18a4f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pink_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/pink_wind_shield_effect.png
new file mode 100644
index 0000000..4debb48
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pink_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_blades_shield_effect.png
new file mode 100644
index 0000000..05336b2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_feathers_shield_effect.png
new file mode 100644
index 0000000..4516da7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_gluttony_shield_effect.png
new file mode 100644
index 0000000..6d73cb7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_light_shield_effect.png
new file mode 100644
index 0000000..0f351c6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_mirrors_shield_effect.png
new file mode 100644
index 0000000..ea4a9fa
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_pitch_shield_effect.png
new file mode 100644
index 0000000..1edf921
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_retribution_shield_effect.png
new file mode 100644
index 0000000..a10c6e7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..9e57b1f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_thorns_shield_effect.png
new file mode 100644
index 0000000..d057b29
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/purple_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/purple_wind_shield_effect.png
new file mode 100644
index 0000000..cfc5dfb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/purple_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_blades_shield_effect.png
new file mode 100644
index 0000000..4fd09dd
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_feathers_shield_effect.png
new file mode 100644
index 0000000..e6ca41f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_gluttony_shield_effect.png
new file mode 100644
index 0000000..9de5a63
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_light_shield_effect.png
new file mode 100644
index 0000000..cf1fd63
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_mirrors_shield_effect.png
new file mode 100644
index 0000000..333072f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_pitch_shield_effect.png
new file mode 100644
index 0000000..120d4d7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_retribution_shield_effect.png
new file mode 100644
index 0000000..f177b0d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..5c175f7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_thorns_shield_effect.png
new file mode 100644
index 0000000..1978d86
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/red_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/red_wind_shield_effect.png
new file mode 100644
index 0000000..fcd4de0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/red_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/redstone_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/redstone_shield_effect.png
deleted file mode 100644
index b2bdc2c..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/redstone_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/scabbing_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/scabbing_shield_effect.png
new file mode 100644
index 0000000..60dca37
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/scabbing_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/silk_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/silk_shield_effect.png
deleted file mode 100644
index 70d542a..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/silk_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/smite_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/smite_shield_effect.png
deleted file mode 100644
index e8d632c..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/smite_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/spider_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/spider_shield_effect.png
deleted file mode 100644
index 55f0bdd..0000000
--- a/src/main/resources/assets/tinker/textures/items/shield/spider_shield_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_blades_shield_effect.png
new file mode 100644
index 0000000..dc9c58c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_feathers_shield_effect.png
new file mode 100644
index 0000000..d01bcf2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_gluttony_shield_effect.png
new file mode 100644
index 0000000..4eb7525
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_light_shield_effect.png
new file mode 100644
index 0000000..39d65af
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_mirrors_shield_effect.png
new file mode 100644
index 0000000..7e077de
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_pitch_shield_effect.png
new file mode 100644
index 0000000..d4dffa7
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_retribution_shield_effect.png
new file mode 100644
index 0000000..1ce5c3d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..457076b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_thorns_shield_effect.png
new file mode 100644
index 0000000..e9b1d83
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/white_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/white_wind_shield_effect.png
new file mode 100644
index 0000000..6080024
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/white_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_blades_shield_effect.png
new file mode 100644
index 0000000..21c7667
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_feathers_shield_effect.png
new file mode 100644
index 0000000..ca4eb84
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_gluttony_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_gluttony_shield_effect.png
new file mode 100644
index 0000000..eb9c6e9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_light_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_light_shield_effect.png
new file mode 100644
index 0000000..6e8d79c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_light_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_mirrors_shield_effect.png
new file mode 100644
index 0000000..317547f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_pitch_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_pitch_shield_effect.png
new file mode 100644
index 0000000..47acf97
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_retribution_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_retribution_shield_effect.png
new file mode 100644
index 0000000..d29f712
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_sanguisaga_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_sanguisaga_shield_effect.png
new file mode 100644
index 0000000..b640fa4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_thorns_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_thorns_shield_effect.png
new file mode 100644
index 0000000..4e1623b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/yellow_wind_shield_effect.png b/src/main/resources/assets/tinker/textures/items/shield/yellow_wind_shield_effect.png
new file mode 100644
index 0000000..85fd1d3
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/yellow_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shovel/manacore_shovel_effect.png b/src/main/resources/assets/tinker/textures/items/shovel/manacore_shovel_effect.png
new file mode 100644
index 0000000..55fcc3a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shovel/manacore_shovel_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shovel/scabbing_shovel_effect.png b/src/main/resources/assets/tinker/textures/items/shovel/scabbing_shovel_effect.png
new file mode 100644
index 0000000..8345ded
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shovel/scabbing_shovel_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shuriken/manacore_shuriken_effect.png b/src/main/resources/assets/tinker/textures/items/shuriken/manacore_shuriken_effect.png
new file mode 100644
index 0000000..d059d5f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shuriken/manacore_shuriken_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shuriken/scabbing_shuriken_effect.png b/src/main/resources/assets/tinker/textures/items/shuriken/scabbing_shuriken_effect.png
new file mode 100644
index 0000000..8345ded
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shuriken/scabbing_shuriken_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shuriken/supping_shuriken_effect.png b/src/main/resources/assets/tinker/textures/items/shuriken/supping_shuriken_effect.png
new file mode 100644
index 0000000..f91a767
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shuriken/supping_shuriken_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shuriken/terracore_shuriken_effect.png b/src/main/resources/assets/tinker/textures/items/shuriken/terracore_shuriken_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shuriken/terracore_shuriken_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/shuriken/textbook_shuriken_effect.png b/src/main/resources/assets/tinker/textures/items/shuriken/textbook_shuriken_effect.png
new file mode 100644
index 0000000..44d1d83
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shuriken/textbook_shuriken_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/throwingknife/manacore_knife_effect.png b/src/main/resources/assets/tinker/textures/items/throwingknife/manacore_knife_effect.png
new file mode 100644
index 0000000..1ba0307
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/throwingknife/manacore_knife_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/throwingknife/scabbing_knife_effect.png b/src/main/resources/assets/tinker/textures/items/throwingknife/scabbing_knife_effect.png
new file mode 100644
index 0000000..c2201ac
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/throwingknife/scabbing_knife_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/throwingknife/supping_knife_effect.png b/src/main/resources/assets/tinker/textures/items/throwingknife/supping_knife_effect.png
new file mode 100644
index 0000000..6fa1ea1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/throwingknife/supping_knife_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/throwingknife/terracore_knife_effect.png b/src/main/resources/assets/tinker/textures/items/throwingknife/terracore_knife_effect.png
new file mode 100644
index 0000000..0a05e2b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/throwingknife/terracore_knife_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/throwingknife/textbook_knife_effect.png b/src/main/resources/assets/tinker/textures/items/throwingknife/textbook_knife_effect.png
new file mode 100644
index 0000000..1e5f3a9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/throwingknife/textbook_knife_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/wrench/manacore_wrench_effect.png b/src/main/resources/assets/tinker/textures/items/wrench/manacore_wrench_effect.png
new file mode 100644
index 0000000..95662c2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/wrench/manacore_wrench_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/wrench/scabbing_wrench_effect.png b/src/main/resources/assets/tinker/textures/items/wrench/scabbing_wrench_effect.png
new file mode 100644
index 0000000..32b5802
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/wrench/scabbing_wrench_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/wrench/supping_wrench_effect.png b/src/main/resources/assets/tinker/textures/items/wrench/supping_wrench_effect.png
new file mode 100644
index 0000000..ae95aaf
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/wrench/supping_wrench_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/wrench/terracore_wrench_effect.png b/src/main/resources/assets/tinker/textures/items/wrench/terracore_wrench_effect.png
new file mode 100644
index 0000000..2772352
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/wrench/terracore_wrench_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/wrench/textbook_wrench_effect.png b/src/main/resources/assets/tinker/textures/items/wrench/textbook_wrench_effect.png
new file mode 100644
index 0000000..a379336
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/wrench/textbook_wrench_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png
index f2fb2a1..05ee7ad 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png
index 46bf663..9106565 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png
index 5c7e1f7..70bf386 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png
index d79295d..edf805d 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png
index 07c37a9..64d883e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png
index 91fc466..8563571 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png
new file mode 100644
index 0000000..e77311c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png
index 1c2eee3..795efe6 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png
index 600e05c..8164a71 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png
index 3175c28..804447e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png
new file mode 100644
index 0000000..cfe6390
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png
index 9475927..cfe6390 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png
new file mode 100644
index 0000000..454f57a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png
index 13900b9..454f57a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png
new file mode 100644
index 0000000..e0e79c9
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png
index d9a5559..9cd743a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png
index b1b9b10..5f81bf4 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png
index ff55867..dc9af5a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png
index 87520ce..8cc7817 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png
index d773a04..4a601eb 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png
index 5f1da70..bb66d4e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png
new file mode 100644
index 0000000..7e0551a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png
index d7a5167..92c910a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png
index fd7bea7..830c2df 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png
index 8ce6419..df3bf8e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png
new file mode 100644
index 0000000..ebb74c2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png
new file mode 100644
index 0000000..d65cae8
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/lang/en_US.lang b/src/main/resources/assets/tinkersdefense/lang/en_US.lang
index 86dd61a..b5dad77 100644
--- a/src/main/resources/assets/tinkersdefense/lang/en_US.lang
+++ b/src/main/resources/assets/tinkersdefense/lang/en_US.lang
@@ -1,16 +1,16 @@
 itemGroup.tabName=Tinkers' Defense
-item.AeonsteelIngot.name=Aeonsteel Ingot
-tile.AeonsteelBlock.name=Aeonsteel Block
-tile.MoltenAeonsteel.name=Molten Aeonsteel
+item.aeonsteelingot.name=Aeonsteel Ingot
+tile.aeonsteelblock.name=Aeonsteel Block
+tile.Moltenaeonsteel.name=Molten Aeonsteel
 material.aeonsteel=Aeonsteel
 
-item.QueensGoldIngot.name=Queen's Gold Ingot
-tile.QueensGoldBlock.name=Queen's Gold Block
-tile.MoltenQueensGold.name=Molten Queen's Gold
+item.queensgoldingot.name=Queen's Gold Ingot
+tile.queensgoldblock.name=Queen's Gold Block
+tile.Moltenqueensgold.name=Molten Queen's Gold
 material.queensgold=Queen's Gold
 
-item.DogbeariumIngot.name=Dogbearium Ingot
-tile.DogbeariumBlock.name=Dogbearium Block
+item.dogbeariumingot.name=Dogbearium Ingot
+tile.dogbeariumblock.name=Dogbearium Block
 tile.Moltendogbearium.name=Molten Dogbearium
 material.dogbearium=Dogbearium
 material.dogbearium.ability=Serrated
@@ -21,24 +21,70 @@ material.redmint.ability=Pepperminty
 material.greenmint=Green Mint
 material.greenmint.ability=Spearminty
 
-tile.CrestMount.name=Crest Mount
-tile.ArmorAnvil.name=Finishing Anvil (WIP)
-tile.JewelersBench.name=Jeweler's Bench (WIP)
+tile.crestmount.name=Crest Mount
+tile.armoranvil.name=Finishing Anvil
+tile.jewelersbench.name=Jeweler's Bench (WIP)
 
-tool.roundshield=Round Shield
+tool.roundshield=Buckler
 tool.heatershield=Heater Shield
 
-fluid.moltenAeonsteel.name=Molten Aeon Steel
-fluid.moltenQueensGold.name=Molten Queen's Gold
-fluid.moltenDogbearium.name=Molten Dogbearium
+fluid.moltenaeonsteel.name=Molten Aeon Steel
+fluid.moltenqueensgold.name=Molten Queen's Gold
+fluid.moltendogbearium.name=Molten Dogbearium
 
-gui.toolstation.roundshield.name=Round Shield
-gui.toolstation.roundshield.desc=A simple shield with average durability and average defense.
+gui.toolstation.roundshield.name=Buckler
+gui.toolstation.roundshield.desc=A small shield with low protection but with the ability to counter attacks, slowing down your opponent. Due to its small size it can't hold as many modifiers.
 
 gui.toolstation.heatershield.name=Heater Shield
-gui.toolstation.heatershield.desc=A simple shield with high durability and high defense.
+gui.toolstation.heatershield.desc=A standard shield designed to protect from all incoming attacks while still being mobile.
 
-item.Crest_Feathers.name=Crest of Feathers
+gui.toolstation.helm.name=Helm
+gui.toolstation.helm.desc=A heavy set of interlocking plates to protect the head from most damage.
+
+gui.toolstation.breastplate.name=Breastplate
+gui.toolstation.breastplate.desc=A heavy set of interlocking plates to protect the chest from most damage.
+
+gui.toolstation.grieves.name=Grieves
+gui.toolstation.grieves.desc=A heavy set of interlocking plates to protect the legs from most damage.
+
+gui.toolstation.sabatons.name=Sabatons
+gui.toolstation.sabatons.desc=A heavy set of interlocking plates to protect the feet from most damage.
+
+gui.toolstation.gauntlets.name=Gauntlets
+gui.toolstation.gauntlets.desc=Armored gloves to protect the hands. (Cosmetic)
+
+gui.toolstation.coif.name=Coif
+gui.toolstation.coif.desc=Thickly woven loops linked with small plates and cloth to protect the head.
+
+gui.toolstation.hauberk.name=Hauberk
+gui.toolstation.hauberk.desc=Thickly woven loops linked with small plates and cloth to protect the chest.
+
+gui.toolstation.chausses.name=Chausses
+gui.toolstation.chausses.desc=Thickly woven loops linked with small plates and cloth to protect the legs.
+
+gui.toolstation.boots.name=Boots
+gui.toolstation.boots.desc=Thickly woven loops linked with small plates and cloth to protect the feet.
+
+gui.toolstation.hood.name=Hood
+gui.toolstation.hood.desc=Delicately stitched clothing for the head that offers little protection but is more accepting of magical modifiers.
+
+gui.toolstation.shawl.name=Shawl
+gui.toolstation.shawl.desc=Delicately stitched clothing for the chest that offers little protection but is more accepting of magical modifiers.
+
+gui.toolstation.robe.name=Robe
+gui.toolstation.robe.desc=Delicately stitched clothing for the legs that offers little protection but is more accepting of magical modifiers.
+
+gui.toolstation.shoes.name=Shoes
+gui.toolstation.shoes.desc=Delicately stitched clothing for the head that offers little protection but is more accepting of magical modifiers.
+
+gui.toolstation.shears.name=Shears
+gui.toolstation.shears.desc=A set of sharpened blades bound together to allow shearing of sheep and tree leaves.
+
+gui.toolstation.wrench.name=Wrench
+gui.toolstation.wrench.desc=A tool designed to turn, remove, or configure technical blocks.
+
+gui.toolstation.zweihander.name=Zweihander
+gui.toolstation.zweihander.desc=A great two handed sword designed to take down horse and rider or keep enemies back with its long reach.\n \n x2 Damage against mounted enemies \n Ability: Great Swing - \n Hit all enemies close to you with a great arching slash. Leaves you slowed and weakened temporarily.
 
 toolpart.Chainmaille=%%material Chainmail
 toolpart.Rivets=%%material Rivets
@@ -68,7 +114,7 @@ tool.tinkershood=Hood
 tool.tinkersshoes=Shoes
 
 tool.tinkerscoif=Coif
-tool.tinkershalberd=Halberd
+tool.tinkershauberk=Hauberk
 tool.tinkerschausses=Chausses
 tool.tinkersboots=Boots
 
@@ -76,6 +122,7 @@ tool.tinkershelm=Helm
 tool.tinkersbreastplate=Breastplate
 tool.tinkersgrieves=Grieves
 tool.tinkerssabatons=Sabatons
+tool.tinkersgauntlets=Gauntlets
 
 item.tconstruct.Pattern.rivets.name=Rivet Pattern
 item.tconstruct.Pattern.clasp.name=Clasp Pattern
@@ -91,21 +138,61 @@ tool.tinkerwrench=Wrench
 tool.shears=Shears
 tool.tinkerzweihander=Zweihander
 
-item.GreenMintIngot.name=Green Mint Ingot
-item.RedMintIngot.name=Red Mint Ingot
-item.GreenMintcane.name=Green Mint Cane
-item.RedMintcane.name=Red Mint Cane
-
-tile.RedMintBlock.name=Red Mint Block
-tile.GreenMintBlock.name=Green Mint Block
-tile.MoltenRedMint.name=Molten Red Mint
-tile.MoltenGreenMint.name=Molten Green Mint
+item.greenmintIngot.name=Green Mint Ingot
+item.redmintIngot.name=Red Mint Ingot
+item.greenmintcane.name=Green Mint Cane
+item.redmintcane.name=Red Mint Cane
+
+tile.redmintblock.name=Red Mint Block
+tile.greenmintblock.name=Green Mint Block
+tile.Moltenredmint.name=Molten Red Mint
+tile.Moltengreenmint.name=Molten Green Mint
+
+item.guidebook.name=Order's Manual
+item.modItemsCore_AncientRelic.name=Ancient Relic
+item.modItemsCore_RainbowGem.name=Rainbow Gem
+item.modItemsCore_Textbook.name=Textbook
+item.modItemsCore_SoulStone.name=SoulStone (Steve)
+item.modItemsCore_CrestFeathers.name=Crest of Feathers Template
+item.modItemsCore_CrestMirrors.name=Crest of Mirrors Template
+item.modItemsCore_CrestLegends.name=Crest of Legends Template
+item.modItemsCore_CrestGluttony.name=Crest of Gluttony Template
+item.modItemsCore_CrestThorns.name=Crest of Thorns Template
+item.modItemsCore_CrestSanguisuga.name=Crest of the Sanguisuga Template
+item.modItemsCore_CrestWinds.name=Crest of Winds Template
+item.modItemsCore_CrestLight.name=Crest of Light Template
+item.modItemsCore_CrestPaper.name=Crest Paper
+item.modItemsArmor_Canister.name=Filled Canister
+item.modItemsArmor_EmptyCanister.name=Empty Canister
+item.modItemsArmor_Rebreather.name=Rebreather
+item.modItemsArmor_NightvisionGoggles.name=Nightvision Goggles
+item.modItemsArmor_Glowstep.name=Glowing Crystal
+item.modItemsArmor_Firewalker.name=Fiery Crystal
+item.modItemsArmor_Frostwalker.name=Frosty Crystal
+item.modItemsArmor_FeatherFall.name=Hermes' Feathers
+item.modItemsArmor_Flippers.name=Flippers
+item.modItemsBloodMagic_bindingwrap.name=Oathbinding Chains
+item.modItemsBloodMagic_bloodybandages.name=Bloody Bandages
+item.modItemsBotania_corpseIvyGraft.name=CorpseIvy Graft
+item.modItemsBotania_corpseIvy.name=CorpseIvy
+item.modItemsBotania_terraCore.name=TerraCore
+item.modItemsBotania_manaCore.name=ManaCore
+item.modItemsBotania_elementiumcore.name=ElementiumCore
+
+tile.unstable_ice.name=Unstable Ice
+tile.unstable_obsidian.name=Unstable Obsidian
+tile.glowstonecrumbs.name=Glowstone Crumbs
 
 book.chapter0.page0.titleL=Intro
 book.chapter0.page0.titleR= 
 book.chapter0.page0.ContentL=By command of the Order of the Silver Lance and under supervision of me, Urist Ironhammer, this text has been created for use as reference and learning tool for fellow members.
 book.chapter0.page0.ContentR=Within these pages are secrets long kept by the Order, caution and discretion are adviced to avoid revelation or personal harm.
 
+book.chapter1.page0.titleL=Shields
+book.chapter1.page0.titleR= 
+book.chapter1.page0.ContentL=The first, and sometimes only, defense in a Tinkerer's arsenal is the shield. The Order specializes in two types, the Bucker and the Heater shield.
+book.chapter1.page0.ContentR=Diagrams, blueprints, and ways to modify are shown on the following pages.
+
 //Note to translators - anything in %% is changed in code and ~player~ is the player's name.
 soul.Steve.offense.0=Heh. What is super armor to me. ~damage~ damage!!
 soul.Steve.offense.1=~damage~ damage! Pow!
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
index b144eb5..65a112a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/Layer #1.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/Layer #1.png
new file mode 100644
index 0000000..d568856
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/Layer #1.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png
index 57b87f5..10fabe1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png
index fa33e20..f76fd91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png
index 0bfcc95..830764a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png
index bd3b314..5ec5387 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/char.png b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/char.png
new file mode 100644
index 0000000..e925635
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/chausses/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png
index 74cd775..2460044 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png
index 1c4d62d..3cc8b40 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png b/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png
index 3dde8d5..4b8aa13 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png
index d5f84c2..12e04a2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png
index 0f6830d..5e74978 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
index b092fc2..9ef285e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
index 683add6..181e271 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/item_armoranvil.png b/src/main/resources/assets/tinkersdefense/textures/blocks/item_armoranvil.png
new file mode 100644
index 0000000..1ad8f1d
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/blocks/item_armoranvil.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png b/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png
index 3a65883..64ab3dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png
+++ b/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png
index b9b9fa7..a7f7800 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_accessories.png b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_accessories.png
deleted file mode 100644
index afa6524..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_accessories.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_extras.png b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_extras.png
deleted file mode 100644
index 931f365..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_extras.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_heads.png b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_heads.png
deleted file mode 100644
index 5301262..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/battleaxe_heads.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/broadsword.png b/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/broadsword.png
deleted file mode 100644
index 7f149e2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/broadsword.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_handle.png
deleted file mode 100644
index 7de2e36..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head.png
deleted file mode 100644
index 7a7e800..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head_broken.png
deleted file mode 100644
index 151a008..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/alumite_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_handle.png
deleted file mode 100644
index 7ba88a9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head.png
deleted file mode 100644
index e4895d9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head_broken.png
deleted file mode 100644
index ebe20e7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ardite_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/beheading_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/beheading_chisel_effect.png
deleted file mode 100644
index 7d0b9db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/beheading_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blaze_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/blaze_chisel_effect.png
deleted file mode 100644
index 1a355f9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blaze_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_handle.png
deleted file mode 100644
index e5b8989..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head.png
deleted file mode 100644
index 5fa0758..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head_broken.png
deleted file mode 100644
index dc89f40..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/blueslime_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_handle.png
deleted file mode 100644
index 5a9d197..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head.png
deleted file mode 100644
index bdd5f18..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head_broken.png
deleted file mode 100644
index 74cb805..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bone_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_handle.png
deleted file mode 100644
index 803ce5c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head.png
deleted file mode 100644
index 9f8320b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head_broken.png
deleted file mode 100644
index ef6c0c3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/bronze_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_handle.png
deleted file mode 100644
index ebccdf1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head.png
deleted file mode 100644
index fb6f9b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head_broken.png
deleted file mode 100644
index ba99a68..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cactus_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/chisel.xcf b/src/main/resources/assets/tinkersdefense/textures/items/chisel/chisel.xcf
deleted file mode 100644
index aebd865..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/chisel.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_handle.png
deleted file mode 100644
index 7f935f8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head.png
deleted file mode 100644
index c579587..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head_broken.png
deleted file mode 100644
index 48c1939..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/cobalt_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_handle.png
deleted file mode 100644
index 01bdbbd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head.png
deleted file mode 100644
index 3856f3f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head_broken.png
deleted file mode 100644
index 0510df7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/copper_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/diamond_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/diamond_chisel_effect.png
deleted file mode 100644
index c8d549e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/diamond_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/emerald_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/emerald_chisel_effect.png
deleted file mode 100644
index 0bc923c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/emerald_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_handle.png
deleted file mode 100644
index 4593425..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head.png
deleted file mode 100644
index a799ce5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head_broken.png
deleted file mode 100644
index c7e8c8a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flint_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flux_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/flux_chisel_effect.png
deleted file mode 100644
index e99c645..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/flux_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ice_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/ice_chisel_effect.png
deleted file mode 100644
index e1dd00a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/ice_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_handle.png
deleted file mode 100644
index 224b48a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head.png
deleted file mode 100644
index 36986c0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head_broken.png
deleted file mode 100644
index c8ed759..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/iron_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/lapis_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/lapis_chisel_effect.png
deleted file mode 100644
index 95c9cb3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/lapis_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/lava_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/lava_chisel_effect.png
deleted file mode 100644
index d251a42..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/lava_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_handle.png
deleted file mode 100644
index 16f1a45..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head.png
deleted file mode 100644
index 4ae2bf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head_broken.png
deleted file mode 100644
index 4fe7464..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/manyullyn_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/moss_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/moss_chisel_effect.png
deleted file mode 100644
index 11a23c3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/moss_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/necrotic_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/necrotic_chisel_effect.png
deleted file mode 100644
index d6ae31c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/necrotic_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_handle.png
deleted file mode 100644
index 47a2b20..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head.png
deleted file mode 100644
index 1a022a4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head_broken.png
deleted file mode 100644
index ea0a281..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/netherrack_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_handle.png
deleted file mode 100644
index a38dce8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head.png
deleted file mode 100644
index 746c7f5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head_broken.png
deleted file mode 100644
index 87ce319..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/obsidian_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_handle.png
deleted file mode 100644
index 3b2c1b0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head.png
deleted file mode 100644
index e9801db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head_broken.png
deleted file mode 100644
index d3dce1e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/paper_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_handle.png
deleted file mode 100644
index c8bbba5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head.png
deleted file mode 100644
index bfb2358..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head_broken.png
deleted file mode 100644
index f261537..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/pigiron_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/piston_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/piston_chisel_effect.png
deleted file mode 100644
index d8e68fd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/piston_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/quartz_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/quartz_chisel_effect.png
deleted file mode 100644
index 18fa2ad..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/quartz_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/redstone_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/redstone_chisel_effect.png
deleted file mode 100644
index d1ff23f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/redstone_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/reinforced_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/reinforced_chisel_effect.png
deleted file mode 100644
index 0b18f1b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/reinforced_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/silk_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/silk_chisel_effect.png
deleted file mode 100644
index 4e722fb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/silk_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_handle.png
deleted file mode 100644
index 13d113c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head.png
deleted file mode 100644
index 40fd675..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head_broken.png
deleted file mode 100644
index bd05ec8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/slime_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/smite_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/smite_chisel_effect.png
deleted file mode 100644
index 51f8ca1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/smite_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/spider_chisel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/spider_chisel_effect.png
deleted file mode 100644
index 1f685ae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/spider_chisel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_handle.png
deleted file mode 100644
index d2d55eb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head.png
deleted file mode 100644
index 464c327..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head_broken.png
deleted file mode 100644
index 7f0a332..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/steel_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_handle.png
deleted file mode 100644
index 5b18565..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head.png
deleted file mode 100644
index 7d892e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head_broken.png
deleted file mode 100644
index 5409d94..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/stone_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_handle.png
deleted file mode 100644
index f891e24..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head.png
deleted file mode 100644
index 0660ee6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head_broken.png
deleted file mode 100644
index 857fab4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/thaumium_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_handle.png
deleted file mode 100644
index c8c4752..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head.png
deleted file mode 100644
index 1cd5376..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head_broken.png
deleted file mode 100644
index 97f1d6b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/wood_chisel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_guard.png
deleted file mode 100644
index 768d83e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_handle.png
deleted file mode 100644
index cc16228..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head.png
deleted file mode 100644
index a1a0367..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head_broken.png
deleted file mode 100644
index b0d4079..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_shield.png
deleted file mode 100644
index 0fc295f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_shield_doubleedge.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_extra_doubleedge.png
index 60af9c3..60af9c3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_shield_doubleedge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_extra_doubleedge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_guard_fancy.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_fancy_accessory.png
index 6615106..6615106 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_guard_fancy.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_fancy_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_guard.png
deleted file mode 100644
index ebe1004..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_handle.png
deleted file mode 100644
index 1ad513a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head.png
deleted file mode 100644
index e65ce18..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head_broken.png
deleted file mode 100644
index 3c36faf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_shield.png
deleted file mode 100644
index fdb46f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/alumite_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_guard.png
deleted file mode 100644
index 848ece6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_handle.png
deleted file mode 100644
index b9c245a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head.png
deleted file mode 100644
index 8b75df7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head_broken.png
deleted file mode 100644
index 0118007..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_shield.png
deleted file mode 100644
index 524bd82..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ardite_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/beheading_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/beheading_cleaver_effect.png
deleted file mode 100644
index 9a62fc3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/beheading_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blaze_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blaze_cleaver_effect.png
deleted file mode 100644
index 12b0dee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blaze_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_guard.png
deleted file mode 100644
index 680f23e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_handle.png
deleted file mode 100644
index e2cd9d0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head.png
deleted file mode 100644
index 8e08d74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head_broken.png
deleted file mode 100644
index 58e1289..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_shield.png
deleted file mode 100644
index 17a7825..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/blueslime_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_guard.png
deleted file mode 100644
index 81f3f5a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_handle.png
deleted file mode 100644
index e3ad86e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head.png
deleted file mode 100644
index 19bb31b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head_broken.png
deleted file mode 100644
index d296406..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_shield.png
deleted file mode 100644
index cba0857..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bone_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_guard.png
deleted file mode 100644
index b0372d5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_handle.png
deleted file mode 100644
index 075e447..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head.png
deleted file mode 100644
index e3f0644..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head_broken.png
deleted file mode 100644
index 66d619a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_shield.png
deleted file mode 100644
index df10c2c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/bronze_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_guard.png
deleted file mode 100644
index a4d8f94..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_handle.png
deleted file mode 100644
index 18c0454..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head.png
deleted file mode 100644
index a9eb80d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head_broken.png
deleted file mode 100644
index 362b54d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_shield.png
deleted file mode 100644
index c6701c3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cactus_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cleaver.xcf b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cleaver.xcf
deleted file mode 100644
index a319f70..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cleaver.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_guard.png
deleted file mode 100644
index c58a66c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_handle.png
deleted file mode 100644
index ee84084..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head.png
deleted file mode 100644
index 0f55903..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head_broken.png
deleted file mode 100644
index f296d30..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_shield.png
deleted file mode 100644
index 38a4ab2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/cobalt_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_guard.png
deleted file mode 100644
index bf0785d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_handle.png
deleted file mode 100644
index 29308e1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head.png
deleted file mode 100644
index 564b2c6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head_broken.png
deleted file mode 100644
index 90f53e7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_shield.png
deleted file mode 100644
index 7274d87..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/copper_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/diamond_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/diamond_cleaver_effect.png
deleted file mode 100644
index c098b53..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/diamond_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/emerald_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/emerald_cleaver_effect.png
deleted file mode 100644
index 2884722..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/emerald_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_guard.png
deleted file mode 100644
index 3e283e1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_handle.png
deleted file mode 100644
index 17c6059..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head.png
deleted file mode 100644
index c435f52..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head_broken.png
deleted file mode 100644
index b02b224..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_shield.png
deleted file mode 100644
index 9f5613c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flint_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flux_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flux_cleaver_effect.png
deleted file mode 100644
index d2f7345..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/flux_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ice_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ice_cleaver_effect.png
deleted file mode 100644
index b5f9c98..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/ice_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_guard.png
deleted file mode 100644
index 05243b3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_handle.png
deleted file mode 100644
index 8162a7d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head.png
deleted file mode 100644
index 96badfc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head_broken.png
deleted file mode 100644
index 8417ac5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_shield.png
deleted file mode 100644
index a9d7a59..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/iron_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lapis_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lapis_cleaver_effect.png
deleted file mode 100644
index 750dd8a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lapis_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lava_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lava_cleaver_effect.png
deleted file mode 100644
index a69f79c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/lava_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_guard.png
deleted file mode 100644
index 48d2df8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_handle.png
deleted file mode 100644
index 9b24d18..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head.png
deleted file mode 100644
index e5da5c8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head_broken.png
deleted file mode 100644
index dce03d9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_shield.png
deleted file mode 100644
index 375d4e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/manyullyn_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/moss_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/moss_cleaver_effect.png
deleted file mode 100644
index 78c46cb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/moss_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/necrotic_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/necrotic_cleaver_effect.png
deleted file mode 100644
index b71a457..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/necrotic_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_guard.png
deleted file mode 100644
index f9dfdde..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_handle.png
deleted file mode 100644
index da5e909..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head.png
deleted file mode 100644
index af84116..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head_broken.png
deleted file mode 100644
index 7800b21..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_shield.png
deleted file mode 100644
index f7783c1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/netherrack_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_guard.png
deleted file mode 100644
index bc68c0d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_handle.png
deleted file mode 100644
index e790af7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head.png
deleted file mode 100644
index 4f5aca3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head_broken.png
deleted file mode 100644
index 133a447..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_shield.png
deleted file mode 100644
index 0bc63ac..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/obsidian_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_guard.png
deleted file mode 100644
index f43c673..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_handle.png
deleted file mode 100644
index 6ad5475..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head.png
deleted file mode 100644
index 3b3f129..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head_broken.png
deleted file mode 100644
index e3ee4f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_shield.png
deleted file mode 100644
index f279717..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/paper_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_guard.png
deleted file mode 100644
index 86dc0e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_handle.png
deleted file mode 100644
index 8c9a917..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head.png
deleted file mode 100644
index 87d10b0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head_broken.png
deleted file mode 100644
index baa1340..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_shield.png
deleted file mode 100644
index 04cb141..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/pigiron_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/piston_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/piston_cleaver_effect.png
deleted file mode 100644
index 9619c9d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/piston_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/quartz_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/quartz_cleaver_effect.png
deleted file mode 100644
index 97f3254..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/quartz_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/redstone_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/redstone_cleaver_effect.png
deleted file mode 100644
index 39e56f2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/redstone_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/reinforced_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/reinforced_cleaver_effect.png
deleted file mode 100644
index c4e6dc0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/reinforced_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/silk_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/silk_cleaver_effect.png
deleted file mode 100644
index a0fb3d6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/silk_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_guard.png
deleted file mode 100644
index a3904d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_handle.png
deleted file mode 100644
index 5036d64..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head.png
deleted file mode 100644
index a8e2a31..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head_broken.png
deleted file mode 100644
index 7b8b8c2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_shield.png
deleted file mode 100644
index f3fec93..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/slime_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/smite_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/smite_cleaver_effect.png
deleted file mode 100644
index efbad58..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/smite_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/spider_cleaver_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/spider_cleaver_effect.png
deleted file mode 100644
index e2bd375..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/spider_cleaver_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_guard.png
deleted file mode 100644
index dd5703a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_handle.png
deleted file mode 100644
index 3fdf621..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head.png
deleted file mode 100644
index 3d8bb00..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head_broken.png
deleted file mode 100644
index fd21978..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_shield.png
deleted file mode 100644
index baa6778..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/steel_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_guard.png
deleted file mode 100644
index 5a3a53b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_handle.png
deleted file mode 100644
index 65f3b02..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head.png
deleted file mode 100644
index 7346d48..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head_broken.png
deleted file mode 100644
index 6dd9e71..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_shield.png
deleted file mode 100644
index 950485d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/stone_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_guard.png
deleted file mode 100644
index a7a84bd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_handle.png
deleted file mode 100644
index a068f81..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head.png
deleted file mode 100644
index 6ec2ed5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head_broken.png
deleted file mode 100644
index f6c9532..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_shield.png
deleted file mode 100644
index 0b8eaf3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/thaumium_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_guard.png
deleted file mode 100644
index 6b27049..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_handle.png
deleted file mode 100644
index d8afa74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head.png
deleted file mode 100644
index f1e6143..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head_broken.png
deleted file mode 100644
index 9cf5aa9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_shield.png
deleted file mode 100644
index 5b31282..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/wood_cleaver_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow.xcf
deleted file mode 100644
index baecc71..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_1.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_1.xcf
deleted file mode 100644
index 9de2a1d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_1.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_2.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_2.xcf
deleted file mode 100644
index 4aedfb9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_2.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3.xcf
deleted file mode 100644
index 2f7782f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3_meh.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3_meh.xcf
deleted file mode 100644
index a233243..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_3_meh.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_binding.png
deleted file mode 100644
index e4ffa75..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_body.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_body.png
deleted file mode 100644
index 810abf2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_body.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow.png
deleted file mode 100644
index e7e9d89..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_1.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_1.png
deleted file mode 100644
index 5470231..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_2.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_2.png
deleted file mode 100644
index de61cb1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_3.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_3.png
deleted file mode 100644
index cbb09ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_bow_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string.png
deleted file mode 100644
index a3b4490..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_1.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_1.png
deleted file mode 100644
index 220e6be..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_2.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_2.png
deleted file mode 100644
index 8826593..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_3.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_3.png
deleted file mode 100644
index e2b8742..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/_crossbow_string_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/beheading_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/beheading_crossbow_effect.png
deleted file mode 100644
index 18b1650..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/beheading_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete.xcf
deleted file mode 100644
index 0c5e75b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_1.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_1.xcf
deleted file mode 100644
index 58524bc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_1.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_2.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_2.xcf
deleted file mode 100644
index abb5709..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_2.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_3.xcf b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_3.xcf
deleted file mode 100644
index 3517fb2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/complete_3.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/diamond_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/diamond_crossbow_effect.png
deleted file mode 100644
index 6da1a0d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/diamond_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect.png
deleted file mode 100644
index 7e1af10..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_1.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_1.png
deleted file mode 100644
index 84376d9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_2.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_2.png
deleted file mode 100644
index 2c8dc2b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_3.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_3.png
deleted file mode 100644
index 7a086ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/emerald_crossbow_effect_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/flux_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/flux_crossbow_effect.png
deleted file mode 100644
index 4d258a7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/flux_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lapis_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lapis_crossbow_effect.png
deleted file mode 100644
index 478f04a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lapis_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lava_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lava_crossbow_effect.png
deleted file mode 100644
index 2ff8e39..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/lava_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/necrotic_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/necrotic_crossbow_effect.png
deleted file mode 100644
index 9edc57e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/necrotic_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/piston_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/piston_crossbow_effect.png
deleted file mode 100644
index 5d48bb5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/piston_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect.png
deleted file mode 100644
index 6ab7c23..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_1.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_1.png
deleted file mode 100644
index 9dd3776..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_2.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_2.png
deleted file mode 100644
index 898f402..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_3.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_3.png
deleted file mode 100644
index dc9f5b7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/quartz_crossbow_effect_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect.png
deleted file mode 100644
index ebff98e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_1.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_1.png
deleted file mode 100644
index e36d697..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_2.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_2.png
deleted file mode 100644
index 5d6b61d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_3.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_3.png
deleted file mode 100644
index a34f368..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/redstone_crossbow_effect_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/reinforced_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/reinforced_crossbow_effect.png
deleted file mode 100644
index e722b76..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/reinforced_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/silk_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/silk_crossbow_effect.png
deleted file mode 100644
index 2b3faf1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/silk_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/smite_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/smite_crossbow_effect.png
deleted file mode 100644
index 12722c5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/smite_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/spider_crossbow_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/crossbow/spider_crossbow_effect.png
deleted file mode 100644
index 66bb964..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/crossbow/spider_crossbow_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_guard_basket.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_basket.png
index acb765b..acb765b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_guard_basket.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_basket.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_guard_small.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_small.png
index 5950960..5950960 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_guard_small.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_small.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade.png
deleted file mode 100644
index 9403052..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade_broken.png
deleted file mode 100644
index 8afa7e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_guard.png
deleted file mode 100644
index 15c93a0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_handle.png
deleted file mode 100644
index fb570ff..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_blade_machete.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_machete.png
index 8bd27e1..8bd27e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_blade_machete.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_machete.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_blade_saber.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_saber.png
index dbb6ead..dbb6ead 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_blade_saber.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_saber.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade.png
deleted file mode 100644
index a5f2868..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade_broken.png
deleted file mode 100644
index 9138f8a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_guard.png
deleted file mode 100644
index a94358b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_handle.png
deleted file mode 100644
index 59be913..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/alumite_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade.png
deleted file mode 100644
index c3cbb87..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade_broken.png
deleted file mode 100644
index 91e89e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_guard.png
deleted file mode 100644
index 09b2d75..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_handle.png
deleted file mode 100644
index 224436b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ardite_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/beheading_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/beheading_cutlass_effect.png
deleted file mode 100644
index 9e22792..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/beheading_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blaze_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blaze_cutlass_effect.png
deleted file mode 100644
index bc4fcf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blaze_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade.png
deleted file mode 100644
index 8044cdb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade_broken.png
deleted file mode 100644
index 63dbeec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_guard.png
deleted file mode 100644
index 18563fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_handle.png
deleted file mode 100644
index 6c7b785..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/blueslime_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade.png
deleted file mode 100644
index f23604e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade_broken.png
deleted file mode 100644
index 66c8a7c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_guard.png
deleted file mode 100644
index 87c7a16..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_handle.png
deleted file mode 100644
index 877b058..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bone_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade.png
deleted file mode 100644
index 5f2c9e5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade_broken.png
deleted file mode 100644
index b080fad..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_guard.png
deleted file mode 100644
index 713e601..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_handle.png
deleted file mode 100644
index c6c6c80..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/bronze_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade.png
deleted file mode 100644
index ad4e660..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade_broken.png
deleted file mode 100644
index d1174cd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_guard.png
deleted file mode 100644
index a5db267..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_handle.png
deleted file mode 100644
index b2136c7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cactus_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade.png
deleted file mode 100644
index 30f8119..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade_broken.png
deleted file mode 100644
index f1924b4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_guard.png
deleted file mode 100644
index 2e2c4f7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_handle.png
deleted file mode 100644
index 977590e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cobalt_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade.png
deleted file mode 100644
index 909a1b2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade_broken.png
deleted file mode 100644
index 8be9973..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_guard.png
deleted file mode 100644
index 16b835b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_handle.png
deleted file mode 100644
index 7738236..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/copper_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cutlass.xcf b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cutlass.xcf
deleted file mode 100644
index 4270693..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/cutlass.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/diamond_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/diamond_cutlass_effect.png
deleted file mode 100644
index 244bc41..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/diamond_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/emerald_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/emerald_cutlass_effect.png
deleted file mode 100644
index a37dfef..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/emerald_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade.png
deleted file mode 100644
index 41c5e12..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade_broken.png
deleted file mode 100644
index d1653e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_guard.png
deleted file mode 100644
index 8e90d3b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_handle.png
deleted file mode 100644
index 1da696b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flint_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flux_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flux_cutlass_effect.png
deleted file mode 100644
index 03690df..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/flux_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ice_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ice_cutlass_effect.png
deleted file mode 100644
index c1bd5a7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/ice_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade.png
deleted file mode 100644
index 8138410..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade_broken.png
deleted file mode 100644
index f91cbf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_guard.png
deleted file mode 100644
index 8e90d3b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_handle.png
deleted file mode 100644
index c879f3e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/iron_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lapis_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lapis_cutlass_effect.png
deleted file mode 100644
index da43fe6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lapis_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lava_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lava_cutlass_effect.png
deleted file mode 100644
index 89b6d39..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/lava_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade.png
deleted file mode 100644
index a0cbb89..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade_broken.png
deleted file mode 100644
index 63879e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_guard.png
deleted file mode 100644
index 2647f3b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_handle.png
deleted file mode 100644
index 3d030db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/manyullyn_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/moss_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/moss_cutlass_effect.png
deleted file mode 100644
index f69aaed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/moss_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/necrotic_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/necrotic_cutlass_effect.png
deleted file mode 100644
index 8732995..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/necrotic_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade.png
deleted file mode 100644
index 632b811..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade_broken.png
deleted file mode 100644
index 4bddd44..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_guard.png
deleted file mode 100644
index 21dab54..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_handle.png
deleted file mode 100644
index 21018d6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/netherrack_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade.png
deleted file mode 100644
index dee7619..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade_broken.png
deleted file mode 100644
index d37dc06..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_guard.png
deleted file mode 100644
index cac3ee7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_handle.png
deleted file mode 100644
index 84ed540..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/obsidian_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade.png
deleted file mode 100644
index b2a386e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade_broken.png
deleted file mode 100644
index 3f0eb74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_guard.png
deleted file mode 100644
index 848b563..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_handle.png
deleted file mode 100644
index ad24c44..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/paper_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade.png
deleted file mode 100644
index 8975a98..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade_broken.png
deleted file mode 100644
index f37ce51..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_guard.png
deleted file mode 100644
index 57286d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_handle.png
deleted file mode 100644
index 547d372..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/pigiron_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/piston_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/piston_cutlass_effect.png
deleted file mode 100644
index b843b68..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/piston_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/quartz_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/quartz_cutlass_effect.png
deleted file mode 100644
index 068d004..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/quartz_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/redstone_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/redstone_cutlass_effect.png
deleted file mode 100644
index 39cd2fa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/redstone_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/reinforced_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/reinforced_cutlass_effect.png
deleted file mode 100644
index 5fa30db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/reinforced_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/silk_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/silk_cutlass_effect.png
deleted file mode 100644
index 1804bd1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/silk_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade.png
deleted file mode 100644
index 8bee09b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade_broken.png
deleted file mode 100644
index fe6e6ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_guard.png
deleted file mode 100644
index 981f542..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_handle.png
deleted file mode 100644
index a08fd1b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/slime_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/smite_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/smite_cutlass_effect.png
deleted file mode 100644
index eed4486..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/smite_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/spider_cutlass_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/spider_cutlass_effect.png
deleted file mode 100644
index 52adf36..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/spider_cutlass_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade.png
deleted file mode 100644
index 0e363b5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade_broken.png
deleted file mode 100644
index 83ad240..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_guard.png
deleted file mode 100644
index c16671d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_handle.png
deleted file mode 100644
index 73ee660..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/steel_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade.png
deleted file mode 100644
index 6b3c0a9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade_broken.png
deleted file mode 100644
index b89686e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_guard.png
deleted file mode 100644
index 2408838..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_handle.png
deleted file mode 100644
index 5208b13..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/stone_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade.png
deleted file mode 100644
index 58cbfb6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade_broken.png
deleted file mode 100644
index e52635d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_guard.png
deleted file mode 100644
index 192ae7f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_handle.png
deleted file mode 100644
index 7c39607..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/thaumium_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade.png
deleted file mode 100644
index ffc3d29..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade_broken.png
deleted file mode 100644
index 3b30d54..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_guard.png
deleted file mode 100644
index 1b0b5fa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_guard.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_handle.png
deleted file mode 100644
index 9dc620c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/wood_cutlass_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_accessory.png
deleted file mode 100644
index da41e70..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade.png
deleted file mode 100644
index e6393ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade_broken.png
deleted file mode 100644
index 539c51d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_handle.png
deleted file mode 100644
index d3b8c00..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_bulbous.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_bulbous.png
index b5ace80..b5ace80 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_bulbous.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_bulbous.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_stiletto.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_stiletto.png
index 7623ee6..7623ee6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_stiletto.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_stiletto.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_wide.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_wide.png
index 97be92d..97be92d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_blade_wide.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_accessory.png
deleted file mode 100644
index abdea45..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade.png
deleted file mode 100644
index 71a7902..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade_broken.png
deleted file mode 100644
index 745053c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_handle.png
deleted file mode 100644
index 3d73dba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/alumite_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_accessory.png
deleted file mode 100644
index 56b38ef..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade.png
deleted file mode 100644
index c10b432..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade_broken.png
deleted file mode 100644
index 1e920e7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_handle.png
deleted file mode 100644
index 0b7d6db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ardite_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/beheading_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/beheading_dagger_effect.png
deleted file mode 100644
index a9a085a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/beheading_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blaze_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/blaze_dagger_effect.png
deleted file mode 100644
index e362515..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blaze_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_accessory.png
deleted file mode 100644
index 5d9748d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade.png
deleted file mode 100644
index eec548f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade_broken.png
deleted file mode 100644
index dbf8499..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_handle.png
deleted file mode 100644
index c61f124..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/blueslime_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_accessory.png
deleted file mode 100644
index 72926bd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade.png
deleted file mode 100644
index afe4dbb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade_broken.png
deleted file mode 100644
index 5f9b7e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_handle.png
deleted file mode 100644
index 0d774fe..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bone_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_accessory.png
deleted file mode 100644
index 051fc1a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade.png
deleted file mode 100644
index c347cad..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade_broken.png
deleted file mode 100644
index 7b728eb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_handle.png
deleted file mode 100644
index c94dd45..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/bronze_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_accessory.png
deleted file mode 100644
index d571b31..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade.png
deleted file mode 100644
index 1fc78ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade_broken.png
deleted file mode 100644
index c6d55e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_handle.png
deleted file mode 100644
index 1f5547e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cactus_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_accessory.png
deleted file mode 100644
index c9cb988..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade.png
deleted file mode 100644
index 3a4e2b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade_broken.png
deleted file mode 100644
index 7369392..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_handle.png
deleted file mode 100644
index c9edb82..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/cobalt_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_accessory.png
deleted file mode 100644
index 4db4526..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade.png
deleted file mode 100644
index 1c1882a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade_broken.png
deleted file mode 100644
index 3d8eca6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_handle.png
deleted file mode 100644
index 4372d85..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/copper_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/dagger.xcf b/src/main/resources/assets/tinkersdefense/textures/items/dagger/dagger.xcf
deleted file mode 100644
index 853d699..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/dagger.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/diamond_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/diamond_dagger_effect.png
deleted file mode 100644
index 0c7f9d7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/diamond_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/emerald_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/emerald_dagger_effect.png
deleted file mode 100644
index 496edf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/emerald_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_accessory.png
deleted file mode 100644
index c544a25..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade.png
deleted file mode 100644
index b527bb7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade_broken.png
deleted file mode 100644
index 95a4cbe..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_handle.png
deleted file mode 100644
index d63f196..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flint_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flux_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/flux_dagger_effect.png
deleted file mode 100644
index d8fc37d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/flux_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/glowstone_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/glowstone_dagger_effect.png
deleted file mode 100644
index 13fc6e0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/glowstone_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ice_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/ice_dagger_effect.png
deleted file mode 100644
index badae5a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/ice_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_accessory.png
deleted file mode 100644
index cc08951..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade.png
deleted file mode 100644
index 76da8a1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade_broken.png
deleted file mode 100644
index 904e55c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_handle.png
deleted file mode 100644
index fc15816..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/iron_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/lapis_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/lapis_dagger_effect.png
deleted file mode 100644
index 66ec837..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/lapis_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/lava_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/lava_dagger_effect.png
deleted file mode 100644
index e6b9147..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/lava_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_accessory.png
deleted file mode 100644
index 46fabaf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade.png
deleted file mode 100644
index ff8aedd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade_broken.png
deleted file mode 100644
index 3043fe9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_handle.png
deleted file mode 100644
index 4788fe2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/manyullyn_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/moss_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/moss_dagger_effect.png
deleted file mode 100644
index 0703598..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/moss_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/necrotic_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/necrotic_dagger_effect.png
deleted file mode 100644
index c506cd0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/necrotic_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_accessory.png
deleted file mode 100644
index 8226bd4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade.png
deleted file mode 100644
index dca3ecd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade_broken.png
deleted file mode 100644
index 179a41a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_handle.png
deleted file mode 100644
index 52267c1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/netherrack_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_accessory.png
deleted file mode 100644
index 7db2dce..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade.png
deleted file mode 100644
index a83576a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade_broken.png
deleted file mode 100644
index 50598df..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_handle.png
deleted file mode 100644
index 9107efd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/obsidian_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_accessory.png
deleted file mode 100644
index 851792b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade.png
deleted file mode 100644
index 07be11c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade_broken.png
deleted file mode 100644
index a608ca3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_handle.png
deleted file mode 100644
index 78d20cb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/paper_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_accessory.png
deleted file mode 100644
index 2f45e10..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade.png
deleted file mode 100644
index c1ff2fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade_broken.png
deleted file mode 100644
index f495d9c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_handle.png
deleted file mode 100644
index 039aea7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/pigiron_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/piston_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/piston_dagger_effect.png
deleted file mode 100644
index b5fa9b5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/piston_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/quartz_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/quartz_dagger_effect.png
deleted file mode 100644
index 1f2a8d2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/quartz_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/redstone_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/redstone_dagger_effect.png
deleted file mode 100644
index 037f28b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/redstone_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/reinforced_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/reinforced_dagger_effect.png
deleted file mode 100644
index bce85a5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/reinforced_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/silk_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/silk_dagger_effect.png
deleted file mode 100644
index bd6af86..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/silk_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_accessory.png
deleted file mode 100644
index 7d14577..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade.png
deleted file mode 100644
index 2fb15ba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade_broken.png
deleted file mode 100644
index e8c3f18..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_handle.png
deleted file mode 100644
index 0212906..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/slime_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/smite_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/smite_dagger_effect.png
deleted file mode 100644
index 6e8a438..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/smite_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/spider_dagger_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/spider_dagger_effect.png
deleted file mode 100644
index 1769ffa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/spider_dagger_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_accessory.png
deleted file mode 100644
index 562dc7d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade.png
deleted file mode 100644
index 3a13d6b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade_broken.png
deleted file mode 100644
index 792715f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_handle.png
deleted file mode 100644
index 37cfdb7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/steel_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_accessory.png
deleted file mode 100644
index 1ff61a5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade.png
deleted file mode 100644
index c346eb0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade_broken.png
deleted file mode 100644
index 91c168a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_handle.png
deleted file mode 100644
index 10774ff..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/stone_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_accessory.png
deleted file mode 100644
index 5759320..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade.png
deleted file mode 100644
index 4dbabcf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade_broken.png
deleted file mode 100644
index cd2243d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_handle.png
deleted file mode 100644
index a23e171..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/thaumium_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_accessory.png
deleted file mode 100644
index e2fa701..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade.png
deleted file mode 100644
index 1b9be5c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade_broken.png
deleted file mode 100644
index 5e9ac41..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_handle.png
deleted file mode 100644
index 49cfd4b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/wood_dagger_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/Pasted Layer.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/Pasted Layer.png
deleted file mode 100644
index 4b35dba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/Pasted Layer.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_binding_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_binding_plate.png
deleted file mode 100644
index 04b3473..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_binding_plate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_binding.png
deleted file mode 100644
index 0e57f31..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_grip.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_grip.png
deleted file mode 100644
index e83ad8f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_grip.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_handle.png
deleted file mode 100644
index 029162f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head.png
deleted file mode 100644
index a381db2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head_broken.png
deleted file mode 100644
index d00c62b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_excavator_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_accessory.png
deleted file mode 100644
index 4bda33d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_handle.png
deleted file mode 100644
index 978e341..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head.png
deleted file mode 100644
index 4c625f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head_broken.png
deleted file mode 100644
index 733ce65..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/alumite_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_handle.png
deleted file mode 100644
index 1611844..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head.png
deleted file mode 100644
index 3c8a80c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head_broken.png
deleted file mode 100644
index 1997a5f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ardite_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/beheading_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/beheading_frypan_effect.png
deleted file mode 100644
index de0af38..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/beheading_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blaze_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/blaze_frypan_effect.png
deleted file mode 100644
index 8de25d4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blaze_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_handle.png
deleted file mode 100644
index f8f190a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head.png
deleted file mode 100644
index d5e8f41..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head_broken.png
deleted file mode 100644
index 1be73b9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/blueslime_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_handle.png
deleted file mode 100644
index 125afa0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head.png
deleted file mode 100644
index d206ee5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head_broken.png
deleted file mode 100644
index 15af223..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bone_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_handle.png
deleted file mode 100644
index 59fc6ad..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head.png
deleted file mode 100644
index ab3e855..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head_broken.png
deleted file mode 100644
index 880f053..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/bronze_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_handle.png
deleted file mode 100644
index f35d2f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head.png
deleted file mode 100644
index b33b33d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head_broken.png
deleted file mode 100644
index 6ac8b0f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cactus_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_handle.png
deleted file mode 100644
index 3113f55..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head.png
deleted file mode 100644
index cc1a954..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head_broken.png
deleted file mode 100644
index 4c15463..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/cobalt_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_handle.png
deleted file mode 100644
index eba4b2e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head.png
deleted file mode 100644
index dc63952..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head_broken.png
deleted file mode 100644
index 2c61fb6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/copper_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/diamond_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/diamond_frypan_effect.png
deleted file mode 100644
index 281b4ae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/diamond_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/emerald_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/emerald_frypan_effect.png
deleted file mode 100644
index 6e96329..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/emerald_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_handle.png
deleted file mode 100644
index 54db593..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head.png
deleted file mode 100644
index 6009cf9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head_broken.png
deleted file mode 100644
index 2272c43..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flint_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flux_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/flux_frypan_effect.png
deleted file mode 100644
index 6aa7d5c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/flux_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/glowstone_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/glowstone_frypan_effect.png
deleted file mode 100644
index 6a7e9dd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/glowstone_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ice_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/ice_frypan_effect.png
deleted file mode 100644
index f5d61ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/ice_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_handle.png
deleted file mode 100644
index a3e992d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head.png
deleted file mode 100644
index f85920d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head_broken.png
deleted file mode 100644
index 7217278..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/iron_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/lapis_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/lapis_frypan_effect.png
deleted file mode 100644
index 007b8ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/lapis_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/lava_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/lava_frypan_effect.png
deleted file mode 100644
index 3f9e658..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/lava_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_handle.png
deleted file mode 100644
index e370ff6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head.png
deleted file mode 100644
index 1f238d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head_broken.png
deleted file mode 100644
index 47fc73e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/manyullyn_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/moss_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/moss_frypan_effect.png
deleted file mode 100644
index bc3758e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/moss_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/necrotic_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/necrotic_frypan_effect.png
deleted file mode 100644
index 6e5c143..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/necrotic_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_handle.png
deleted file mode 100644
index 64acc53..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head.png
deleted file mode 100644
index 4385784..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head_broken.png
deleted file mode 100644
index 59b3cb8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/netherrack_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_handle.png
deleted file mode 100644
index 679ece5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head.png
deleted file mode 100644
index b2b11c7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head_broken.png
deleted file mode 100644
index aaedc27..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/obsidian_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_handle.png
deleted file mode 100644
index 3cc4c9d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head.png
deleted file mode 100644
index baa357f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head_broken.png
deleted file mode 100644
index 4426a9e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/paper_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_handle.png
deleted file mode 100644
index 27f7a7f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head.png
deleted file mode 100644
index e4e04db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head_broken.png
deleted file mode 100644
index 5e39069..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/pigiron_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/piston_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/piston_frypan_effect.png
deleted file mode 100644
index f8cbfe7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/piston_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/quartz_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/quartz_frypan_effect.png
deleted file mode 100644
index 93e7919..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/quartz_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/redstone_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/redstone_frypan_effect.png
deleted file mode 100644
index 6a7e9dd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/redstone_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/reinforced_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/reinforced_frypan_effect.png
deleted file mode 100644
index da4692e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/reinforced_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/silk_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/silk_frypan_effect.png
deleted file mode 100644
index 1f286e9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/silk_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_handle.png
deleted file mode 100644
index 5911fe8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head.png
deleted file mode 100644
index 3ecd2ba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head_broken.png
deleted file mode 100644
index ae1dbfa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/slime_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/smite_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/smite_frypan_effect.png
deleted file mode 100644
index 8a4c7f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/smite_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/spider_frypan_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/spider_frypan_effect.png
deleted file mode 100644
index 54a31c9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/spider_frypan_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_handle.png
deleted file mode 100644
index 711544c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head.png
deleted file mode 100644
index 34e1d06..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head_broken.png
deleted file mode 100644
index cd65f57..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/steel_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_handle.png
deleted file mode 100644
index 29031da..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head.png
deleted file mode 100644
index 1c5033f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head_broken.png
deleted file mode 100644
index d786d7b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/stone_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_handle.png
deleted file mode 100644
index e016c84..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head.png
deleted file mode 100644
index a63dbfa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head_broken.png
deleted file mode 100644
index 4393366..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/thaumium_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_handle.png
deleted file mode 100644
index bdd1f5d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head.png
deleted file mode 100644
index 6c291aa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head_broken.png
deleted file mode 100644
index 5e4e508..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/wood_frypan_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_front_spiked.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_spiked.png
index aeee725..aeee725 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_front_spiked.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_spiked.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_front_taper.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_taper.png
index 74fe2ea..74fe2ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_front_taper.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_back_spiked.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_spiked.png
index bf39cbc..bf39cbc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_back_spiked.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_spiked.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_back_taper.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_taper.png
index 8d647c6..8d647c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_back_taper.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_back.png
deleted file mode 100644
index 6a698cc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_front.png
deleted file mode 100644
index ce18cc1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle.png
deleted file mode 100644
index 50cea42..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle_broken.png
deleted file mode 100644
index 7fa2fbc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_head.png
deleted file mode 100644
index 77bd20e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_back.png
deleted file mode 100644
index 6b07178..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_front.png
deleted file mode 100644
index fdb4bfd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle.png
deleted file mode 100644
index 099a017..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle_broken.png
deleted file mode 100644
index 9f57807..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_head.png
deleted file mode 100644
index d716c47..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/alumite_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_back.png
deleted file mode 100644
index 4a28387..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_front.png
deleted file mode 100644
index f551d75..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle.png
deleted file mode 100644
index 9944e4a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle_broken.png
deleted file mode 100644
index 04239b4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_head.png
deleted file mode 100644
index cd7b7ed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ardite_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/beheading_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/beheading_hammer_effect.png
deleted file mode 100644
index 70cf295..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/beheading_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blaze_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blaze_hammer_effect.png
deleted file mode 100644
index 6dee26d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blaze_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_back.png
deleted file mode 100644
index 0631088..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_front.png
deleted file mode 100644
index 9f27b40..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle.png
deleted file mode 100644
index e3475c9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle_broken.png
deleted file mode 100644
index e2f6bc1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_head.png
deleted file mode 100644
index e62eaf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/blueslime_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_back.png
deleted file mode 100644
index 280767e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_front.png
deleted file mode 100644
index decf55d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle.png
deleted file mode 100644
index d5f99cf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle_broken.png
deleted file mode 100644
index 7e39034..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_head.png
deleted file mode 100644
index b07ff17..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bone_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_back.png
deleted file mode 100644
index b5bfee1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_front.png
deleted file mode 100644
index e5e6a65..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle.png
deleted file mode 100644
index 85607bb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle_broken.png
deleted file mode 100644
index 0772347..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_head.png
deleted file mode 100644
index 5b652f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/bronze_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_back.png
deleted file mode 100644
index 5ed473f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_front.png
deleted file mode 100644
index c71d56b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle.png
deleted file mode 100644
index 6646c36..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle_broken.png
deleted file mode 100644
index 75d0aa5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_head.png
deleted file mode 100644
index 86bdce8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cactus_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_back.png
deleted file mode 100644
index 084e1bc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_front.png
deleted file mode 100644
index 7c8c816..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle.png
deleted file mode 100644
index 8cd6b24..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle_broken.png
deleted file mode 100644
index 3301845..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_head.png
deleted file mode 100644
index 90224b5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/cobalt_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_back.png
deleted file mode 100644
index 91e5e59..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_front.png
deleted file mode 100644
index 5d13bce..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle.png
deleted file mode 100644
index a3dec1e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle_broken.png
deleted file mode 100644
index 754cc94..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_head.png
deleted file mode 100644
index 64fdfc4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/copper_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/diamond_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/diamond_hammer_effect.png
deleted file mode 100644
index e320de5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/diamond_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/emerald_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/emerald_hammer_effect.png
deleted file mode 100644
index 2ffec16..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/emerald_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_back.png
deleted file mode 100644
index f89278b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_front.png
deleted file mode 100644
index 3343e94..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle.png
deleted file mode 100644
index 4e46036..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle_broken.png
deleted file mode 100644
index 950b7ee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_head.png
deleted file mode 100644
index 76708ce..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flint_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flux_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/flux_hammer_effect.png
deleted file mode 100644
index bf52941..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/flux_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/hammer.xcf b/src/main/resources/assets/tinkersdefense/textures/items/hammer/hammer.xcf
deleted file mode 100644
index 776c66d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/hammer.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ice_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/ice_hammer_effect.png
deleted file mode 100644
index feedb8a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/ice_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_back.png
deleted file mode 100644
index f933e5d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_front.png
deleted file mode 100644
index ed3db49..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle.png
deleted file mode 100644
index f985f9e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle_broken.png
deleted file mode 100644
index b6570da..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_head.png
deleted file mode 100644
index 9c46ba2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/iron_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/lapis_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/lapis_hammer_effect.png
deleted file mode 100644
index ac1e833..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/lapis_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/lava_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/lava_hammer_effect.png
deleted file mode 100644
index ee62bf3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/lava_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_back.png
deleted file mode 100644
index a792af9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_front.png
deleted file mode 100644
index fb84138..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle.png
deleted file mode 100644
index 1767e1c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle_broken.png
deleted file mode 100644
index 22caae6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_head.png
deleted file mode 100644
index 5f237bd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/manyullyn_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/moss_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/moss_hammer_effect.png
deleted file mode 100644
index 9d330cb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/moss_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/necrotic_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/necrotic_hammer_effect.png
deleted file mode 100644
index 6955c3f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/necrotic_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_back.png
deleted file mode 100644
index cab6a8a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_front.png
deleted file mode 100644
index 7f579e3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle.png
deleted file mode 100644
index b47e1f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle_broken.png
deleted file mode 100644
index 61a41ae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_head.png
deleted file mode 100644
index d8e9dae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/netherrack_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_back.png
deleted file mode 100644
index 3bcd5a5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_front.png
deleted file mode 100644
index 4c864a6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle.png
deleted file mode 100644
index a29a410..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle_broken.png
deleted file mode 100644
index 025d430..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_head.png
deleted file mode 100644
index d43ac74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/obsidian_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_back.png
deleted file mode 100644
index 54900af..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_front.png
deleted file mode 100644
index dcb9464..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle.png
deleted file mode 100644
index 10985cd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle_broken.png
deleted file mode 100644
index bf0e793..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_head.png
deleted file mode 100644
index 483c021..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/paper_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_back.png
deleted file mode 100644
index c626d60..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_front.png
deleted file mode 100644
index 75f4106..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle.png
deleted file mode 100644
index b0cf561..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle_broken.png
deleted file mode 100644
index 6d7d155..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_head.png
deleted file mode 100644
index af69851..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/pigiron_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/piston_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/piston_hammer_effect.png
deleted file mode 100644
index b58856e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/piston_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/quartz_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/quartz_hammer_effect.png
deleted file mode 100644
index e48c548..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/quartz_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/redstone_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/redstone_hammer_effect.png
deleted file mode 100644
index ed3acda..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/redstone_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/reinforced_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/reinforced_hammer_effect.png
deleted file mode 100644
index 9870de8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/reinforced_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/silk_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/silk_hammer_effect.png
deleted file mode 100644
index c3cdc36..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/silk_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_back.png
deleted file mode 100644
index 24c9279..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_front.png
deleted file mode 100644
index 463d9d6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle.png
deleted file mode 100644
index 96ff38e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle_broken.png
deleted file mode 100644
index 2c417bc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_head.png
deleted file mode 100644
index e075495..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/slime_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/smite_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/smite_hammer_effect.png
deleted file mode 100644
index 32ab63b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/smite_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/spider_hammer_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/spider_hammer_effect.png
deleted file mode 100644
index 9b53700..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/spider_hammer_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_back.png
deleted file mode 100644
index 03148b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_front.png
deleted file mode 100644
index 4a463e2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle.png
deleted file mode 100644
index 6566430..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle_broken.png
deleted file mode 100644
index 395007d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_head.png
deleted file mode 100644
index fa98704..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/steel_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_back.png
deleted file mode 100644
index c90ec37..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_front.png
deleted file mode 100644
index e4603ee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle.png
deleted file mode 100644
index 844689d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle_broken.png
deleted file mode 100644
index b4a0147..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_head.png
deleted file mode 100644
index 59cfb3d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/stone_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_back.png
deleted file mode 100644
index f3576c3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_front.png
deleted file mode 100644
index f3ceddf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle.png
deleted file mode 100644
index e6bb2ce..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle_broken.png
deleted file mode 100644
index e149a4a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_head.png
deleted file mode 100644
index 1d6f25f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/thaumium_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_back.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_back.png
deleted file mode 100644
index d683fc6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_back.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_front.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_front.png
deleted file mode 100644
index 42fb628..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_front.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle.png
deleted file mode 100644
index baedada..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle_broken.png
deleted file mode 100644
index 19c5f66..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_handle_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_head.png b/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_head.png
deleted file mode 100644
index a465306..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/wood_hammer_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_accessory.png
index faa4249..faa4249 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_accessory.png
index 286c249..286c249 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_accessory.png
index 6e98c81..6e98c81 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_accessory.png
index 1e07e28..1e07e28 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_accessory.png
index 36c7b66..36c7b66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_accessory.png
index 0f50826..0f50826 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_accessory.png
index ae977ae..ae977ae 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_handle.png
index 638365a..638365a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png
deleted file mode 100644
index 9a534ea..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_accessory.png
index 055cf9c..055cf9c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_extra.png
index d617d1c..d617d1c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_extra.png
index 2c700c4..2c700c4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_head.png
index 5455d91..5455d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png
deleted file mode 100644
index 5e1f4b9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_handle.png
index 27d6ae3..27d6ae3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_extra.png
index d5f8ed4..d5f8ed4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_head.png
index 4175fac..4175fac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_head.png
index f06ae5c..f06ae5c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_extra.png
index d2a7168..d2a7168 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_extra.png
index 4e52d91..4e52d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_extra.png
index 193a9fb..193a9fb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_extra.png
index ac67e66..ac67e66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_extra.png
index 01666c2..01666c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_head.png
index a2c7402..a2c7402 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_head.png
index e23e4ff..e23e4ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_extra.png
index e01d7eb..e01d7eb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_extra.png
index f146eb8..f146eb8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_extra.png
index 9df4e09..9df4e09 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_extra.png
index e987416..e987416 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_head.png
index 4be2b26..4be2b26 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_handle.png
index e5a6304..e5a6304 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png
deleted file mode 100644
index a2ba90c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_head.png
index e45695b..e45695b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_head.png
index 607aae7..607aae7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_extra.png
index 91a1cdf..91a1cdf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_head.png
index e676e44..e676e44 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_extra.png
index 528ed50..528ed50 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_extra.png
index 5f641f1..5f641f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/effects.xcf b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/effects.xcf
deleted file mode 100644
index f68d207..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/effects.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShield.xcf b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShield.xcf
deleted file mode 100644
index 8f9a814..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShield.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShieldx32.xcf b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShieldx32.xcf
deleted file mode 100644
index 9377b84..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heaterShieldx32.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png
deleted file mode 100644
index 4bfa8c3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_accessory.png
deleted file mode 100644
index 65820ac..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_handle.png
deleted file mode 100644
index 1952f2f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head.png
deleted file mode 100644
index 81d2a97..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head_broken.png
deleted file mode 100644
index 116f748..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/_javelin_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/beheading_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/beheading_javelin_effect.png
deleted file mode 100644
index 8d0371a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/beheading_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/blaze_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/blaze_javelin_effect.png
deleted file mode 100644
index 8339010..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/blaze_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/complete.xcf b/src/main/resources/assets/tinkersdefense/textures/items/javelin/complete.xcf
deleted file mode 100644
index db4373e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/complete.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/diamond_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/diamond_javelin_effect.png
deleted file mode 100644
index 133d426..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/diamond_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/emerald_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/emerald_javelin_effect.png
deleted file mode 100644
index 061e97d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/emerald_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/lapis_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/lapis_javelin_effect.png
deleted file mode 100644
index eb932c5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/lapis_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/lava_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/lava_javelin_effect.png
deleted file mode 100644
index e8b98ed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/lava_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/moss_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/moss_javelin_effect.png
deleted file mode 100644
index 984b408..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/moss_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/necrotic_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/necrotic_javelin_effect.png
deleted file mode 100644
index bedeb37..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/necrotic_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/pigiron_javelin_head.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/pigiron_javelin_head.png
deleted file mode 100644
index 2eb0333..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/pigiron_javelin_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/piston_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/piston_javelin_effect.png
deleted file mode 100644
index d14a2e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/piston_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/quartz_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/quartz_javelin_effect.png
deleted file mode 100644
index 1e24867..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/quartz_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/reinforced_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/reinforced_javelin_effect.png
deleted file mode 100644
index a5dea6c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/reinforced_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/silk_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/silk_javelin_effect.png
deleted file mode 100644
index 991cc3f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/silk_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/smite_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/smite_javelin_effect.png
deleted file mode 100644
index 468821c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/smite_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/javelin/spider_javelin_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/javelin/spider_javelin_effect.png
deleted file mode 100644
index 9c8fbc7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/javelin/spider_javelin_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/Pasted Layer.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/Pasted Layer.png
deleted file mode 100644
index a629fb4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/Pasted Layer.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom.png
deleted file mode 100644
index 0fb1417..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_1.png
deleted file mode 100644
index e10febd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_2.png
deleted file mode 100644
index b01cd43..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_3.png
deleted file mode 100644
index 3d0832f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_bottom_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_grip.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_grip.png
deleted file mode 100644
index 188c11b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_grip.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top.png
deleted file mode 100644
index d787032..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_1.png
deleted file mode 100644
index 6a77ec5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_2.png
deleted file mode 100644
index dadb2ab..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_3.png
deleted file mode 100644
index e563cee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bow_top_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring.png
deleted file mode 100644
index d4e08f3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_1.png
deleted file mode 100644
index 099bca2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_2.png
deleted file mode 100644
index d6681c6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_3.png
deleted file mode 100644
index 8ea1527..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_broken.png
deleted file mode 100644
index 70cb036..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_bowstring_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_1.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_2.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_3.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_accessory_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra.png
deleted file mode 100644
index aa0c95a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_1.png
deleted file mode 100644
index aa0c95a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_2.png
deleted file mode 100644
index aa0c95a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_3.png
deleted file mode 100644
index aa0c95a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_extra_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle.png
deleted file mode 100644
index b7a00d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_1.png
deleted file mode 100644
index 22eee25..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_2.png
deleted file mode 100644
index e9fc587..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_3.png
deleted file mode 100644
index b2264be..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_handle_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_1.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_1.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_2.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_2.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_3.png b/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_3.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longbow/_m5copper_head_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_accessory.png
deleted file mode 100644
index 58fb4d1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade.png
deleted file mode 100644
index 6aea58a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade_broken.png
deleted file mode 100644
index 2840cf8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_handle.png
deleted file mode 100644
index 8cad438..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_accessory.png
deleted file mode 100644
index 62777ee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade.png
deleted file mode 100644
index 4452b69..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade_broken.png
deleted file mode 100644
index 25c0f5a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_handle.png
deleted file mode 100644
index a9b2b27..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/alumite_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_accessory.png
deleted file mode 100644
index 62c208a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade.png
deleted file mode 100644
index 23662a8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade_broken.png
deleted file mode 100644
index 597f666..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_handle.png
deleted file mode 100644
index fdcea39..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ardite_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/beheading_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/beheading_longsword_effect.png
deleted file mode 100644
index 040131c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/beheading_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blaze_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/blaze_longsword_effect.png
deleted file mode 100644
index 8f1348f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blaze_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_accessory.png
deleted file mode 100644
index aef3133..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade.png
deleted file mode 100644
index c659283..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade_broken.png
deleted file mode 100644
index a5340fe..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_handle.png
deleted file mode 100644
index 18c7af0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/blueslime_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_accessory.png
deleted file mode 100644
index 934deae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade.png
deleted file mode 100644
index cb61277..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade_broken.png
deleted file mode 100644
index 29161b5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_handle.png
deleted file mode 100644
index 0e04e2c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bone_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_accessory.png
deleted file mode 100644
index 32459c2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade.png
deleted file mode 100644
index e5217d3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade_broken.png
deleted file mode 100644
index 868d2f4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_handle.png
deleted file mode 100644
index 58e8e96..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/bronze_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_accessory.png
deleted file mode 100644
index 5faaaa9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade.png
deleted file mode 100644
index 203e87b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade_broken.png
deleted file mode 100644
index 5e3c4a1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_handle.png
deleted file mode 100644
index f43b229..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cactus_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_accessory.png
deleted file mode 100644
index 09822e2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade.png
deleted file mode 100644
index d656fd5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade_broken.png
deleted file mode 100644
index cfab553..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_handle.png
deleted file mode 100644
index 16e1834..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/cobalt_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_accessory.png
deleted file mode 100644
index 5d643d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade.png
deleted file mode 100644
index e6e5d7c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade_broken.png
deleted file mode 100644
index bb5276e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_handle.png
deleted file mode 100644
index 674dd52..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/copper_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/diamond_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/diamond_longsword_effect.png
deleted file mode 100644
index e101b4d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/diamond_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/emerald_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/emerald_longsword_effect.png
deleted file mode 100644
index d2ae8d5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/emerald_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_accessory.png
deleted file mode 100644
index 15b0a31..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade.png
deleted file mode 100644
index 7fc7e07..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade_broken.png
deleted file mode 100644
index 137e0ca..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_handle.png
deleted file mode 100644
index f0e650d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flint_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flux_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/flux_longsword_effect.png
deleted file mode 100644
index d248244..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/flux_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/glowstone_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/glowstone_longsword_effect.png
deleted file mode 100644
index 8db1d79..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/glowstone_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ice_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/ice_longsword_effect.png
deleted file mode 100644
index 8ad82be..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/ice_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_accessory.png
deleted file mode 100644
index 1d08caa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade.png
deleted file mode 100644
index 8a3e99d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade_broken.png
deleted file mode 100644
index f63301d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_handle.png
deleted file mode 100644
index 36bba9f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/iron_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/lapis_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/lapis_longsword_effect.png
deleted file mode 100644
index a612ad5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/lapis_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/lava_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/lava_longsword_effect.png
deleted file mode 100644
index 3095782..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/lava_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/longsword.xcf b/src/main/resources/assets/tinkersdefense/textures/items/longsword/longsword.xcf
deleted file mode 100644
index be3d740..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/longsword.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_accessory.png
deleted file mode 100644
index a3619c9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade.png
deleted file mode 100644
index bf9e5d2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade_broken.png
deleted file mode 100644
index 2e38111..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_handle.png
deleted file mode 100644
index d7e3cb3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/manyullyn_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/moss_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/moss_longsword_effect.png
deleted file mode 100644
index 3841e21..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/moss_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/necrotic_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/necrotic_longsword_effect.png
deleted file mode 100644
index b87ec94..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/necrotic_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_accessory.png
deleted file mode 100644
index 2a5e091..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade.png
deleted file mode 100644
index 1258ee0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade_broken.png
deleted file mode 100644
index 90dc717..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_handle.png
deleted file mode 100644
index f47198c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/netherrack_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_accessory.png
deleted file mode 100644
index 68b4b45..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade.png
deleted file mode 100644
index 522370d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade_broken.png
deleted file mode 100644
index a582555..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_handle.png
deleted file mode 100644
index d5be789..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/obsidian_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_accessory.png
deleted file mode 100644
index 976a39c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade.png
deleted file mode 100644
index bc0df74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade_broken.png
deleted file mode 100644
index b32e1f4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_handle.png
deleted file mode 100644
index 99fc5cf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/paper_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_accessory.png
deleted file mode 100644
index 2e8c37a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade.png
deleted file mode 100644
index 889c0b2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade_broken.png
deleted file mode 100644
index 914a335..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_handle.png
deleted file mode 100644
index 457a1c8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/pigiron_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/piston_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/piston_longsword_effect.png
deleted file mode 100644
index 6c010d5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/piston_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/quartz_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/quartz_longsword_effect.png
deleted file mode 100644
index a2a5364..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/quartz_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/redstone_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/redstone_longsword_effect.png
deleted file mode 100644
index 57f6719..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/redstone_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/reinforced_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/reinforced_longsword_effect.png
deleted file mode 100644
index 7f2f942..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/reinforced_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/silk_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/silk_longsword_effect.png
deleted file mode 100644
index 1f501cf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/silk_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_accessory.png
deleted file mode 100644
index b05b42c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade.png
deleted file mode 100644
index d23bee3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade_broken.png
deleted file mode 100644
index 3ae972f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_handle.png
deleted file mode 100644
index 275809d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/slime_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/smite_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/smite_longsword_effect.png
deleted file mode 100644
index edac40f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/smite_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/spider_longsword_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/spider_longsword_effect.png
deleted file mode 100644
index a6f8004..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/spider_longsword_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_accessory.png
deleted file mode 100644
index 5125c61..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade.png
deleted file mode 100644
index 0be314f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade_broken.png
deleted file mode 100644
index 69a7f8b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_handle.png
deleted file mode 100644
index d63b2d2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/steel_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_accessory.png
deleted file mode 100644
index 63d86af..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade.png
deleted file mode 100644
index a71d587..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade_broken.png
deleted file mode 100644
index f657dc7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_handle.png
deleted file mode 100644
index 2f1de10..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/stone_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_accessory.png
deleted file mode 100644
index 6b3fa0c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade.png
deleted file mode 100644
index d1d230e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade_broken.png
deleted file mode 100644
index 97e06e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_handle.png
deleted file mode 100644
index 945078a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/thaumium_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_accessory.png
deleted file mode 100644
index d6976c7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade.png
deleted file mode 100644
index 26c3b17..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade_broken.png
deleted file mode 100644
index fc8c40b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_handle.png
deleted file mode 100644
index 27c0b26..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/wood_longsword_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_binding_wrap.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_extra_wrap.png
index fd7b01f..fd7b01f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_binding_wrap.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_extra_wrap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_binding.png
deleted file mode 100644
index a33bc2b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_handle.png
deleted file mode 100644
index 23f2aa9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head.png
deleted file mode 100644
index fc0ec76..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head_broken.png
deleted file mode 100644
index 98afdf7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_shield.png
deleted file mode 100644
index 205ec30..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_shield_small.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_shield_small.png
deleted file mode 100644
index bff88f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_shield_small.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_binding.png
deleted file mode 100644
index 2ca79fb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_handle.png
deleted file mode 100644
index efe665d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head.png
deleted file mode 100644
index 0644091..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head_broken.png
deleted file mode 100644
index d9957c2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_shield.png
deleted file mode 100644
index c0c1899..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/alumite_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_binding.png
deleted file mode 100644
index 151568b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_handle.png
deleted file mode 100644
index 57d8ad9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head.png
deleted file mode 100644
index de82521..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head_broken.png
deleted file mode 100644
index aa79c36..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_shield.png
deleted file mode 100644
index fedbe6f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ardite_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/beheading_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/beheading_lumberaxe_effect.png
deleted file mode 100644
index d7c587b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/beheading_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blaze_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blaze_lumberaxe_effect.png
deleted file mode 100644
index 3b6573d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blaze_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_binding.png
deleted file mode 100644
index 85ffd52..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_handle.png
deleted file mode 100644
index 3f98ea9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head.png
deleted file mode 100644
index fb5bf3e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head_broken.png
deleted file mode 100644
index 514fd97..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_shield.png
deleted file mode 100644
index 3bb7290..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/blueslime_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_binding.png
deleted file mode 100644
index e79274a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_handle.png
deleted file mode 100644
index f0eee83..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head.png
deleted file mode 100644
index 4f03497..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head_broken.png
deleted file mode 100644
index 3e5d3d7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_shield.png
deleted file mode 100644
index 4709cb5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bone_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_binding.png
deleted file mode 100644
index 4728643..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_handle.png
deleted file mode 100644
index a5def96..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head.png
deleted file mode 100644
index 57e68e6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head_broken.png
deleted file mode 100644
index 0d08b8e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_shield.png
deleted file mode 100644
index 1a9df33..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/bronze_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_binding.png
deleted file mode 100644
index 9d7959d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_handle.png
deleted file mode 100644
index eee44c1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head.png
deleted file mode 100644
index 85207cd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head_broken.png
deleted file mode 100644
index a8cb1fb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_shield.png
deleted file mode 100644
index fc1d9f9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cactus_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_binding.png
deleted file mode 100644
index 0659773..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_handle.png
deleted file mode 100644
index 369043d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head.png
deleted file mode 100644
index 525d3b6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head_broken.png
deleted file mode 100644
index 0c74926..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_shield.png
deleted file mode 100644
index f02a06d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/cobalt_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_binding.png
deleted file mode 100644
index 80740d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_handle.png
deleted file mode 100644
index 1e5ecc1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head.png
deleted file mode 100644
index 52d622d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head_broken.png
deleted file mode 100644
index 6a77fc8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_shield.png
deleted file mode 100644
index 23d9f6c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/copper_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/diamond_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/diamond_lumberaxe_effect.png
deleted file mode 100644
index b734d6e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/diamond_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/emerald_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/emerald_lumberaxe_effect.png
deleted file mode 100644
index 1ebe5fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/emerald_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_binding.png
deleted file mode 100644
index 37b345e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_handle.png
deleted file mode 100644
index b81e610..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head.png
deleted file mode 100644
index ac956d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head_broken.png
deleted file mode 100644
index 05ab2b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_shield.png
deleted file mode 100644
index a867760..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flint_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flux_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flux_lumberaxe_effect.png
deleted file mode 100644
index b9b6d23..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/flux_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ice_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ice_lumberaxe_effect.png
deleted file mode 100644
index 838c0af..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/ice_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_binding.png
deleted file mode 100644
index 20ec320..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_handle.png
deleted file mode 100644
index aedf5f4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head.png
deleted file mode 100644
index beafd5f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head_broken.png
deleted file mode 100644
index 79b0cc1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_shield.png
deleted file mode 100644
index 5170d32..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/iron_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lapis_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lapis_lumberaxe_effect.png
deleted file mode 100644
index f6b1a07..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lapis_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lava_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lava_lumberaxe_effect.png
deleted file mode 100644
index 3f39455..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lava_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lumberaxe.xcf b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lumberaxe.xcf
deleted file mode 100644
index 58ee775..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/lumberaxe.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_binding.png
deleted file mode 100644
index d028ef4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_handle.png
deleted file mode 100644
index 2901dfb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head.png
deleted file mode 100644
index 7a7b973..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head_broken.png
deleted file mode 100644
index fb3716d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_shield.png
deleted file mode 100644
index 167d3d2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/manyullyn_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/moss_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/moss_lumberaxe_effect.png
deleted file mode 100644
index 5f75a26..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/moss_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/necrotic_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/necrotic_lumberaxe_effect.png
deleted file mode 100644
index 717711c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/necrotic_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_binding.png
deleted file mode 100644
index ecaec56..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_handle.png
deleted file mode 100644
index b86bb64..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head.png
deleted file mode 100644
index 9126f4b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head_broken.png
deleted file mode 100644
index 1eb7d69..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_shield.png
deleted file mode 100644
index 56d1a11..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/netherrack_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_binding.png
deleted file mode 100644
index 22d2ca8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_handle.png
deleted file mode 100644
index 4fc4a92..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head.png
deleted file mode 100644
index fa23c56..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head_broken.png
deleted file mode 100644
index 9ff4db5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_shield.png
deleted file mode 100644
index 98e85c9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/obsidian_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_binding.png
deleted file mode 100644
index ac6ff7d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_handle.png
deleted file mode 100644
index eae7f33..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head.png
deleted file mode 100644
index 45fcbb0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head_broken.png
deleted file mode 100644
index d0b2fd7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_shield.png
deleted file mode 100644
index e525d46..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/paper_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_binding.png
deleted file mode 100644
index 860a8ff..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_handle.png
deleted file mode 100644
index e7d67b7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head.png
deleted file mode 100644
index db77491..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head_broken.png
deleted file mode 100644
index b6466c2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_shield.png
deleted file mode 100644
index 5d84847..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/pigiron_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/piston_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/piston_lumberaxe_effect.png
deleted file mode 100644
index 694069f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/piston_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/quartz_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/quartz_lumberaxe_effect.png
deleted file mode 100644
index 8c41cd0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/quartz_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/redstone_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/redstone_lumberaxe_effect.png
deleted file mode 100644
index 47f7602..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/redstone_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/reinforced_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/reinforced_lumberaxe_effect.png
deleted file mode 100644
index ac8a72c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/reinforced_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/silk_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/silk_lumberaxe_effect.png
deleted file mode 100644
index 540aca3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/silk_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_binding.png
deleted file mode 100644
index f3554c1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_handle.png
deleted file mode 100644
index 21fd7f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head.png
deleted file mode 100644
index 751a5b5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head_broken.png
deleted file mode 100644
index e9e508a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_shield.png
deleted file mode 100644
index ac4a377..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/slime_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/smite_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/smite_lumberaxe_effect.png
deleted file mode 100644
index 42e39fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/smite_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/spider_lumberaxe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/spider_lumberaxe_effect.png
deleted file mode 100644
index c73e9d7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/spider_lumberaxe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_binding.png
deleted file mode 100644
index 9db8aed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_handle.png
deleted file mode 100644
index 863dcae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head.png
deleted file mode 100644
index 9747ced..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head_broken.png
deleted file mode 100644
index 0a86704..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_shield.png
deleted file mode 100644
index fb013b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/steel_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_binding.png
deleted file mode 100644
index 5b8ed04..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_handle.png
deleted file mode 100644
index 7a53a0c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head.png
deleted file mode 100644
index ff6da3a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head_broken.png
deleted file mode 100644
index 3b7da96..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_shield.png
deleted file mode 100644
index cc553ed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/stone_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_binding.png
deleted file mode 100644
index aae7bf9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_handle.png
deleted file mode 100644
index 7a15968..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head.png
deleted file mode 100644
index b4c4525..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png
deleted file mode 100644
index f129c6a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_shield.png
deleted file mode 100644
index 1a139dd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/thaumium_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_binding.png
deleted file mode 100644
index 0f1cb41..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_handle.png
deleted file mode 100644
index 185cbce..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head.png
deleted file mode 100644
index de7571d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head_broken.png
deleted file mode 100644
index b281031..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_shield.png
deleted file mode 100644
index d46f03f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/wood_lumberaxe_shield.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/Pasted Layer.png b/src/main/resources/assets/tinkersdefense/textures/items/mattock/Pasted Layer.png
deleted file mode 100644
index 1f2821a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/Pasted Layer.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_back_straight.png b/src/main/resources/assets/tinkersdefense/textures/items/mattock/_accessory_straight.png
index 7dc0389..7dc0389 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_back_straight.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/mattock/_accessory_straight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_accessory.png
deleted file mode 100644
index f1052c5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_head.png b/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_head.png
deleted file mode 100644
index 5de7649..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5lead_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/mattock.xcf b/src/main/resources/assets/tinkersdefense/textures/items/mattock/mattock.xcf
deleted file mode 100644
index 10eb78b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/mattock.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/Pasted Layer.png b/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/Pasted Layer.png
deleted file mode 100644
index 3e9b907..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/Pasted Layer.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate_offset.png b/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate_offset.png
new file mode 100644
index 0000000..8bf84a6
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate_offset.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle_offset.png b/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle_offset.png
new file mode 100644
index 0000000..f211e13
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle_offset.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_safety.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_safety.png
index fbf27e1..fbf27e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_safety.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_safety.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_sai.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_sai.png
index a2d0aa1..a2d0aa1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_sai.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_sai.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_taper.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_taper.png
index 06461f7..06461f7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_blade_taper.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_accessory.png
deleted file mode 100644
index 9138fe3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade.png
deleted file mode 100644
index 25950a5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade_broken.png
deleted file mode 100644
index 46a37c6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_handle.png
deleted file mode 100644
index d078064..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_accessory.png
deleted file mode 100644
index e22afe9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade.png
deleted file mode 100644
index 9e43e72..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade_broken.png
deleted file mode 100644
index 0608514..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_handle.png
deleted file mode 100644
index 0dfb04c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/alumite_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_accessory.png
deleted file mode 100644
index 6b2220b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade.png
deleted file mode 100644
index 352f263..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade_broken.png
deleted file mode 100644
index 5bca5d5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_handle.png
deleted file mode 100644
index 11f8f14..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ardite_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/beheading_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/beheading_rapier_effect.png
deleted file mode 100644
index c352ee1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/beheading_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blaze_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/blaze_rapier_effect.png
deleted file mode 100644
index ca81073..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blaze_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_accessory.png
deleted file mode 100644
index a3f7218..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade.png
deleted file mode 100644
index bac98fd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade_broken.png
deleted file mode 100644
index 84df826..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_handle.png
deleted file mode 100644
index 9585a23..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/blueslime_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_accessory.png
deleted file mode 100644
index 1def887..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade.png
deleted file mode 100644
index 0732793..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade_broken.png
deleted file mode 100644
index 9777344..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_handle.png
deleted file mode 100644
index 48ee00f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bone_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_accessory.png
deleted file mode 100644
index f9bf949..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade.png
deleted file mode 100644
index 8562e6b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade_broken.png
deleted file mode 100644
index 36a2d91..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_handle.png
deleted file mode 100644
index 9f3ff50..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/bronze_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_accessory.png
deleted file mode 100644
index 999e4d4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade.png
deleted file mode 100644
index 5f47d16..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade_broken.png
deleted file mode 100644
index 2a31cba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_handle.png
deleted file mode 100644
index 64ed527..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cactus_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_accessory.png
deleted file mode 100644
index 9bd0f7e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade.png
deleted file mode 100644
index d3167d9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade_broken.png
deleted file mode 100644
index 27d37a9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_handle.png
deleted file mode 100644
index 22a1775..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/cobalt_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_accessory.png
deleted file mode 100644
index f2bfd21..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade.png
deleted file mode 100644
index 72bc399..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade_broken.png
deleted file mode 100644
index 8717030..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_handle.png
deleted file mode 100644
index d4f017e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/copper_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/diamond_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/diamond_rapier_effect.png
deleted file mode 100644
index 525e944..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/diamond_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/emerald_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/emerald_rapier_effect.png
deleted file mode 100644
index 6a82213..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/emerald_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_accessory.png
deleted file mode 100644
index 1bead7a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade.png
deleted file mode 100644
index 44a4fd7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade_broken.png
deleted file mode 100644
index f57f2e9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_handle.png
deleted file mode 100644
index 5fac720..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flint_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flux_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/flux_rapier_effect.png
deleted file mode 100644
index 2517b40..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/flux_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/glowstone_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/glowstone_rapier_effect.png
deleted file mode 100644
index 35e88b0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/glowstone_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ice_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/ice_rapier_effect.png
deleted file mode 100644
index 129b5b8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/ice_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_accessory.png
deleted file mode 100644
index 60c6d0b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade.png
deleted file mode 100644
index 175c7d3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade_broken.png
deleted file mode 100644
index bd0a3b2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_handle.png
deleted file mode 100644
index 36c05ff..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/iron_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/lapis_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/lapis_rapier_effect.png
deleted file mode 100644
index 07fffcc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/lapis_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/lava_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/lava_rapier_effect.png
deleted file mode 100644
index 5049332..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/lava_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_accessory.png
deleted file mode 100644
index ebfa83d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade.png
deleted file mode 100644
index 834831b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade_broken.png
deleted file mode 100644
index c98d7e6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_handle.png
deleted file mode 100644
index 763f72b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/manyullyn_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/moss_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/moss_rapier_effect.png
deleted file mode 100644
index 9c8ddae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/moss_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/necrotic_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/necrotic_rapier_effect.png
deleted file mode 100644
index 7806af0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/necrotic_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_accessory.png
deleted file mode 100644
index 0d0432e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade.png
deleted file mode 100644
index 6fe1aed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade_broken.png
deleted file mode 100644
index f038c5b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_handle.png
deleted file mode 100644
index ea48445..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/netherrack_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_accessory.png
deleted file mode 100644
index 2bff987..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade.png
deleted file mode 100644
index feb9577..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade_broken.png
deleted file mode 100644
index 458ae46..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_handle.png
deleted file mode 100644
index 840e281..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/obsidian_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_accessory.png
deleted file mode 100644
index b103e64..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade.png
deleted file mode 100644
index 40dd001..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade_broken.png
deleted file mode 100644
index 7c4fbf4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_handle.png
deleted file mode 100644
index 0847dfa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/paper_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_accessory.png
deleted file mode 100644
index 6a49530..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade.png
deleted file mode 100644
index 0794ad3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade_broken.png
deleted file mode 100644
index 4dc240f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_handle.png
deleted file mode 100644
index d952783..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/pigiron_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/piston_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/piston_rapier_effect.png
deleted file mode 100644
index a3d8b90..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/piston_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/quartz_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/quartz_rapier_effect.png
deleted file mode 100644
index 8479758..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/quartz_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/rapier.xcf b/src/main/resources/assets/tinkersdefense/textures/items/rapier/rapier.xcf
deleted file mode 100644
index 98ab663..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/rapier.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/redstone_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/redstone_rapier_effect.png
deleted file mode 100644
index f588792..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/redstone_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/reinforced_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/reinforced_rapier_effect.png
deleted file mode 100644
index e7f78cc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/reinforced_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/silk_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/silk_rapier_effect.png
deleted file mode 100644
index 79352aa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/silk_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_accessory.png
deleted file mode 100644
index 4d3be67..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade.png
deleted file mode 100644
index 9216b05..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade_broken.png
deleted file mode 100644
index 5e53129..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_handle.png
deleted file mode 100644
index cbaaf82..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/slime_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/smite_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/smite_rapier_effect.png
deleted file mode 100644
index b36fc10..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/smite_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/spider_rapier_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/spider_rapier_effect.png
deleted file mode 100644
index 72460d2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/spider_rapier_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_accessory.png
deleted file mode 100644
index 7213d5f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade.png
deleted file mode 100644
index bcd0e55..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade_broken.png
deleted file mode 100644
index d315851..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_handle.png
deleted file mode 100644
index 01d769b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/steel_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_accessory.png
deleted file mode 100644
index 8a9959c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade.png
deleted file mode 100644
index e02c6ca..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade_broken.png
deleted file mode 100644
index eeeb577..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_handle.png
deleted file mode 100644
index ca790d4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/stone_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_accessory.png
deleted file mode 100644
index a383a5f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade.png
deleted file mode 100644
index 95d44c4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade_broken.png
deleted file mode 100644
index cdc0b7d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_handle.png
deleted file mode 100644
index fdaf47e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/thaumium_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_accessory.png
deleted file mode 100644
index 9ff7592..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade.png
deleted file mode 100644
index 767b35c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade_broken.png
deleted file mode 100644
index 92b6b3f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_blade_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_handle.png
deleted file mode 100644
index 5bb337b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/wood_rapier_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_binding_teeth.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_teeth.png
index 8401d41..8401d41 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_binding_teeth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_teeth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_binding_wideblade.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_wideblade.png
index bcf9e6b..bcf9e6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_binding_wideblade.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_wideblade.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_accessory.png
deleted file mode 100644
index ae901d3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_binding.png
deleted file mode 100644
index 88bc26b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_handle.png
deleted file mode 100644
index dec3feb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head.png
deleted file mode 100644
index 166b08c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head_broken.png
deleted file mode 100644
index 519fa08..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_accessory.png
deleted file mode 100644
index 4b653de..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_binding.png
deleted file mode 100644
index f7ad4e2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_handle.png
deleted file mode 100644
index 908797d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head.png
deleted file mode 100644
index 78edf56..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head_broken.png
deleted file mode 100644
index 6d8fa4d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/alumite_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_accessory.png
deleted file mode 100644
index 5198fcf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_binding.png
deleted file mode 100644
index 4dfbda0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_handle.png
deleted file mode 100644
index 8247cc4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head.png
deleted file mode 100644
index 7a81ad9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head_broken.png
deleted file mode 100644
index a1ade74..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ardite_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/beheading_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/beheading_scythe_effect.png
deleted file mode 100644
index 090e07c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/beheading_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blaze_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blaze_scythe_effect.png
deleted file mode 100644
index ea191cf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blaze_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_accessory.png
deleted file mode 100644
index 1d51e06..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_binding.png
deleted file mode 100644
index 7c220fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_handle.png
deleted file mode 100644
index 0f14c21..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head.png
deleted file mode 100644
index 3fe25d9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head_broken.png
deleted file mode 100644
index ae167f8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/blueslime_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_accessory.png
deleted file mode 100644
index 862b1db..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_binding.png
deleted file mode 100644
index dbaa7c0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_handle.png
deleted file mode 100644
index 04dfc01..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head.png
deleted file mode 100644
index bc9b73f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head_broken.png
deleted file mode 100644
index edf0b25..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bone_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_accessory.png
deleted file mode 100644
index ad284e2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_binding.png
deleted file mode 100644
index 6b0f29e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_handle.png
deleted file mode 100644
index 08bcb9b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head.png
deleted file mode 100644
index 1fe4f3b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head_broken.png
deleted file mode 100644
index dd09542..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/bronze_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_accessory.png
deleted file mode 100644
index d4626de..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_binding.png
deleted file mode 100644
index b2f3023..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_handle.png
deleted file mode 100644
index 7cbd9b7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head.png
deleted file mode 100644
index d7b6725..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head_broken.png
deleted file mode 100644
index 115a1e4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cactus_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_accessory.png
deleted file mode 100644
index e185e4a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_binding.png
deleted file mode 100644
index 7fdf2b6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_handle.png
deleted file mode 100644
index 467e4a7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head.png
deleted file mode 100644
index a6141ed..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head_broken.png
deleted file mode 100644
index 9e55251..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/cobalt_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_accessory.png
deleted file mode 100644
index 95fcc19..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_binding.png
deleted file mode 100644
index e03b4f8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_handle.png
deleted file mode 100644
index e9410a0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head.png
deleted file mode 100644
index 1a17b5e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head_broken.png
deleted file mode 100644
index 019c6ba..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/copper_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/diamond_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/diamond_scythe_effect.png
deleted file mode 100644
index 21411fc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/diamond_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/emerald_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/emerald_scythe_effect.png
deleted file mode 100644
index 0af374b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/emerald_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_accessory.png
deleted file mode 100644
index 87d0a45..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_binding.png
deleted file mode 100644
index 25e50e8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_handle.png
deleted file mode 100644
index c6d41bd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head.png
deleted file mode 100644
index 24fa303..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head_broken.png
deleted file mode 100644
index b6a0a26..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flint_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flux_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/flux_scythe_effect.png
deleted file mode 100644
index 7628778..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/flux_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ice_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/ice_scythe_effect.png
deleted file mode 100644
index 96729e1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/ice_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_accessory.png
deleted file mode 100644
index eee7397..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_binding.png
deleted file mode 100644
index 340808e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_handle.png
deleted file mode 100644
index 0540d65..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head.png
deleted file mode 100644
index 498e729..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head_broken.png
deleted file mode 100644
index 8cf2569..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/iron_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/lapis_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/lapis_scythe_effect.png
deleted file mode 100644
index 863e321..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/lapis_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/lava_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/lava_scythe_effect.png
deleted file mode 100644
index c465c6b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/lava_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_accessory.png
deleted file mode 100644
index 7c4b0a8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_binding.png
deleted file mode 100644
index 4291193..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_handle.png
deleted file mode 100644
index 0672c89..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head.png
deleted file mode 100644
index 972f560..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head_broken.png
deleted file mode 100644
index b7241b6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/manyullyn_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/moss_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/moss_scythe_effect.png
deleted file mode 100644
index f5e8697..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/moss_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/necrotic_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/necrotic_scythe_effect.png
deleted file mode 100644
index 8673c58..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/necrotic_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_accessory.png
deleted file mode 100644
index e8a4aff..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_binding.png
deleted file mode 100644
index cab39f8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_handle.png
deleted file mode 100644
index c10da82..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head.png
deleted file mode 100644
index fa818c6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head_broken.png
deleted file mode 100644
index 59692a4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/netherrack_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_accessory.png
deleted file mode 100644
index e3f12ae..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_binding.png
deleted file mode 100644
index 1b10f56..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_handle.png
deleted file mode 100644
index 55bbf67..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head.png
deleted file mode 100644
index f17ee2e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head_broken.png
deleted file mode 100644
index 4bf7e1c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/obsidian_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_accessory.png
deleted file mode 100644
index a56659d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_binding.png
deleted file mode 100644
index 59fbcf2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_handle.png
deleted file mode 100644
index d487449..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head.png
deleted file mode 100644
index e57f834..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head_broken.png
deleted file mode 100644
index e71dbbb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/paper_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_accessory.png
deleted file mode 100644
index fa8c4f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_binding.png
deleted file mode 100644
index 0a76d3e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_handle.png
deleted file mode 100644
index c5d525c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head.png
deleted file mode 100644
index 2560d50..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head_broken.png
deleted file mode 100644
index c9e6b28..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/pigiron_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/piston_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/piston_scythe_effect.png
deleted file mode 100644
index cfab399..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/piston_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/quartz_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/quartz_scythe_effect.png
deleted file mode 100644
index 143bf66..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/quartz_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/redstone_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/redstone_scythe_effect.png
deleted file mode 100644
index 7edcf97..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/redstone_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/reinforced_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/reinforced_scythe_effect.png
deleted file mode 100644
index 4ce41da..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/reinforced_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/scythe.xcf b/src/main/resources/assets/tinkersdefense/textures/items/scythe/scythe.xcf
deleted file mode 100644
index 821133e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/scythe.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/silk_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/silk_scythe_effect.png
deleted file mode 100644
index c9e20cc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/silk_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_accessory.png
deleted file mode 100644
index f43c6f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_binding.png
deleted file mode 100644
index 7410cd4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_handle.png
deleted file mode 100644
index 454f0ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head.png
deleted file mode 100644
index f9b213e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head_broken.png
deleted file mode 100644
index ff03561..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/slime_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/smite_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/smite_scythe_effect.png
deleted file mode 100644
index 99055ea..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/smite_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/spider_scythe_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/spider_scythe_effect.png
deleted file mode 100644
index 2f02c2e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/spider_scythe_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_accessory.png
deleted file mode 100644
index 0a92fb4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_binding.png
deleted file mode 100644
index 8c609b4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_handle.png
deleted file mode 100644
index d14c934..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head.png
deleted file mode 100644
index aab95cd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head_broken.png
deleted file mode 100644
index b503d40..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/steel_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_accessory.png
deleted file mode 100644
index 1cae8b4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_binding.png
deleted file mode 100644
index d4cd776..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_handle.png
deleted file mode 100644
index 110c5c2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head.png
deleted file mode 100644
index 47650a9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head_broken.png
deleted file mode 100644
index fb71be9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/stone_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_accessory.png
deleted file mode 100644
index dd2d236..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_binding.png
deleted file mode 100644
index eb4b191..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_handle.png
deleted file mode 100644
index 7991c8b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head.png
deleted file mode 100644
index fbe0822..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head_broken.png
deleted file mode 100644
index 3f7f6ea..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/thaumium_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_accessory.png
deleted file mode 100644
index c3ab923..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_binding.png
deleted file mode 100644
index aefa466..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_binding.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_handle.png
deleted file mode 100644
index 8e53233..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head.png
deleted file mode 100644
index 594e4f7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head_broken.png
deleted file mode 100644
index 571a4c5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/wood_scythe_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_boss.png
index 8ae1f0e..8ae1f0e 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_edge.png
index a244a96..a244a96 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_boss.png
index 0f3a71a..0f3a71a 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_edge.png
index d359096..d359096 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_face.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_face.png
index 9982253..9982253 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_face.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_boss.png
index 8d5cdb1..8d5cdb1 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_shield.png
index 1db11c1..1db11c1 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_shield.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_boss.png
index f4e204d..f4e204d 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_edge.png
index ea39ba8..ea39ba8 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_face.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_face.png
index 084cfd1..084cfd1 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_face.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_boss.png
index 51f848c..51f848c 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_edge.png
index 9a7b2c4..9a7b2c4 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_boss.png
index 723a489..723a489 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_edge.png
index 3551d8c..3551d8c 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_boss.png
index 3f42899..3f42899 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_edge.png
index 1fc1b5e..1fc1b5e 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_boss.png
index 858f96f..858f96f 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_edge.png
index 0871efb..0871efb 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_boss.png
index 51c42de..51c42de 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_edge.png
index 131f870..131f870 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_boss.png
index 4434fd3..4434fd3 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_edge.png
index bd27fd5..bd27fd5 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_boss.png
index e2b3de4..e2b3de4 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_edge.png
index 541f5e1..541f5e1 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_boss.png
index ad4de8d..ad4de8d 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_edge.png
index 9bd5887..9bd5887 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_boss.png
index 14fcee8..14fcee8 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_edge.png
index 16989ed..16989ed 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_boss.png
index 2cf28a3..2cf28a3 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_edge.png
index dc1c106..dc1c106 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_boss.png
index c986e26..c986e26 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_edge.png
index aa0a0e6..aa0a0e6 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_boss.png
index cb177fa..cb177fa 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_edge.png
index afa4b02..afa4b02 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_boss.png
index 4052ddb..4052ddb 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_edge.png
index 948f699..948f699 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_boss.png
index a3e231a..a3e231a 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_edge.png
index 891760b..891760b 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_boss.png
index 02ee488..02ee488 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_edge.png
index 79bdcaa..79bdcaa 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_boss.png
index 39209c0..39209c0 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_edge.png
index f15da9d..f15da9d 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_boss.png
index c423014..c423014 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_edge.png
index a8627ac..a8627ac 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_boss.png
index 9626ddd..9626ddd 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_edge.png
index 6464b86..6464b86 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_edge.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_face.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face.png
index 96ab1c9..96ab1c9 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_face.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_face_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face_broken.png
index 188228a..188228a 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_face_broken.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom.png
deleted file mode 100644
index e10febd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_1.png
deleted file mode 100644
index e10febd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_2.png
deleted file mode 100644
index b01cd43..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_3.png
deleted file mode 100644
index 3d0832f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_bottom_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top.png
deleted file mode 100644
index 6a77ec5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_1.png
deleted file mode 100644
index 6a77ec5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_2.png
deleted file mode 100644
index dadb2ab..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_3.png
deleted file mode 100644
index e563cee..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bow_top_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring.png
deleted file mode 100644
index ff07f72..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_1.png
deleted file mode 100644
index f7ff4e5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_2.png
deleted file mode 100644
index e8ba2a2..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_3.png
deleted file mode 100644
index 8f76ed1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_broken.png
deleted file mode 100644
index 8ccc79d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_bowstring_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_1.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_2.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_3.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_accessory_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle.png
deleted file mode 100644
index b7a00d8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_1.png
deleted file mode 100644
index 22eee25..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_2.png
deleted file mode 100644
index e9fc587..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_3.png
deleted file mode 100644
index b2264be..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_handle_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head.png
deleted file mode 100644
index 7dd724b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_1.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_1.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_1.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_2.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_2.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_2.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_3.png b/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_3.png
deleted file mode 100644
index a242429..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shortbow/_m5copper_head_3.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/Pasted Layer.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/Pasted Layer.png
deleted file mode 100644
index 20375e7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/Pasted Layer.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5lead_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5lead_head.png
deleted file mode 100644
index 031a065..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5lead_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_handle.png
deleted file mode 100644
index 3912054..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head.png
deleted file mode 100644
index 0de4f0a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head_broken.png
deleted file mode 100644
index 6853dfb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_handle.png
deleted file mode 100644
index df3beb4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head.png
deleted file mode 100644
index 68009a6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head_broken.png
deleted file mode 100644
index 5c03c70..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/alumite_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_handle.png
deleted file mode 100644
index 5ff7af7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head.png
deleted file mode 100644
index 2c51a93..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head_broken.png
deleted file mode 100644
index 45dfef0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ardite_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/beheading_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/beheading_shovel_effect.png
deleted file mode 100644
index 18a604c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/beheading_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blaze_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/blaze_shovel_effect.png
deleted file mode 100644
index 1d2fa54..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blaze_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_handle.png
deleted file mode 100644
index 04b1e98..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head.png
deleted file mode 100644
index d6dd0ea..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head_broken.png
deleted file mode 100644
index a922c7b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/blueslime_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_handle.png
deleted file mode 100644
index 8f83d4d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head.png
deleted file mode 100644
index 5404e7d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head_broken.png
deleted file mode 100644
index 8e94cdb..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bone_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_handle.png
deleted file mode 100644
index f471483..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head.png
deleted file mode 100644
index 7bfee5f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head_broken.png
deleted file mode 100644
index 59382ab..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/bronze_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_handle.png
deleted file mode 100644
index d8bc064..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head.png
deleted file mode 100644
index 099b771..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head_broken.png
deleted file mode 100644
index 7dce6a5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cactus_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_handle.png
deleted file mode 100644
index 8f7ff03..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head.png
deleted file mode 100644
index 4681242..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head_broken.png
deleted file mode 100644
index 947dec0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/cobalt_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_handle.png
deleted file mode 100644
index 2b58311..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head.png
deleted file mode 100644
index 8979486..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head_broken.png
deleted file mode 100644
index c211152..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/copper_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/diamond_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/diamond_shovel_effect.png
deleted file mode 100644
index 86bc078..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/diamond_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/emerald_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/emerald_shovel_effect.png
deleted file mode 100644
index b9f6e30..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/emerald_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_handle.png
deleted file mode 100644
index 58d7bf5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head.png
deleted file mode 100644
index 09dc9f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head_broken.png
deleted file mode 100644
index 9116924..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flint_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flux_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/flux_shovel_effect.png
deleted file mode 100644
index ca254a6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/flux_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/glowstone_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/glowstone_shovel_effect.png
deleted file mode 100644
index 48dbf33..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/glowstone_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ice_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/ice_shovel_effect.png
deleted file mode 100644
index a31e57a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/ice_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_handle.png
deleted file mode 100644
index 1e3dd23..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head.png
deleted file mode 100644
index 90a307c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head_broken.png
deleted file mode 100644
index 2629b12..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/iron_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/lapis_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/lapis_shovel_effect.png
deleted file mode 100644
index f6054c0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/lapis_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/lava_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/lava_shovel_effect.png
deleted file mode 100644
index a93aa51..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/lava_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_handle.png
deleted file mode 100644
index 08f0c02..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head.png
deleted file mode 100644
index b7b8f73..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head_broken.png
deleted file mode 100644
index e4f1e06..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/manyullyn_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/moss_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/moss_shovel_effect.png
deleted file mode 100644
index 9e99949..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/moss_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/necrotic_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/necrotic_shovel_effect.png
deleted file mode 100644
index a851b38..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/necrotic_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_handle.png
deleted file mode 100644
index e644023..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head.png
deleted file mode 100644
index b97cf90..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head_broken.png
deleted file mode 100644
index e1cdcc0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/netherrack_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/nickelsteel.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/nickelsteel.png
deleted file mode 100644
index 9791922..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/nickelsteel.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_handle.png
deleted file mode 100644
index c68c0f0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head.png
deleted file mode 100644
index 252f228..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head_broken.png
deleted file mode 100644
index 43ee7dc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/obsidian_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_handle.png
deleted file mode 100644
index 96a47ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head.png
deleted file mode 100644
index e78bf34..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head_broken.png
deleted file mode 100644
index 9d74f60..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/paper_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_handle.png
deleted file mode 100644
index c4f4ff1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head.png
deleted file mode 100644
index ed862c5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head_broken.png
deleted file mode 100644
index 989bbd5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/pigiron_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/piston_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/piston_shovel_effect.png
deleted file mode 100644
index d8e68fd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/piston_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/quartz_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/quartz_shovel_effect.png
deleted file mode 100644
index 8ca62ef..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/quartz_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/redstone_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/redstone_shovel_effect.png
deleted file mode 100644
index e0ef523..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/redstone_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/reinforced_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/reinforced_shovel_effect.png
deleted file mode 100644
index 305c735..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/reinforced_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/shovel.xcf b/src/main/resources/assets/tinkersdefense/textures/items/shovel/shovel.xcf
deleted file mode 100644
index 76e9b33..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/shovel.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/silk_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/silk_shovel_effect.png
deleted file mode 100644
index d404940..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/silk_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_handle.png
deleted file mode 100644
index adef8f6..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head.png
deleted file mode 100644
index ad59b02..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head_broken.png
deleted file mode 100644
index 60e36bd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/slime_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/smite_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/smite_shovel_effect.png
deleted file mode 100644
index 41350f7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/smite_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/spider_shovel_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/spider_shovel_effect.png
deleted file mode 100644
index 56b5bc9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/spider_shovel_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_handle.png
deleted file mode 100644
index 415c7ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head.png
deleted file mode 100644
index 44a5608..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head_broken.png
deleted file mode 100644
index 4fbb39c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/steel_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_handle.png
deleted file mode 100644
index baf99e3..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head.png
deleted file mode 100644
index 8efdef8..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head_broken.png
deleted file mode 100644
index 1518d78..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/stone_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_handle.png
deleted file mode 100644
index d892c8c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head.png
deleted file mode 100644
index 93f8e68..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head_broken.png
deleted file mode 100644
index b4ce339..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/thaumium_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_handle.png
deleted file mode 100644
index d9a1e9e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head.png
deleted file mode 100644
index aef1c62..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head_broken.png
deleted file mode 100644
index ad60115..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/wood_shovel_head_broken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken - Kopie.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken - Kopie.png
deleted file mode 100644
index 20581f5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken - Kopie.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken.png
deleted file mode 100644
index e0e08ab..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/_shuriken.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/beheading_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/beheading_shuriken_effect.png
deleted file mode 100644
index 4512b6b..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/beheading_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/blaze_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/blaze_shuriken_effect.png
deleted file mode 100644
index b30e46f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/blaze_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.png
deleted file mode 100644
index 8cf8526..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.xcf b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.xcf
deleted file mode 100644
index 76cc35a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/complete.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/diamond_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/diamond_shuriken_effect.png
deleted file mode 100644
index 78dea30..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/diamond_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/emerald_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/emerald_shuriken_effect.png
deleted file mode 100644
index 2591a9c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/emerald_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lapis_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lapis_shuriken_effect.png
deleted file mode 100644
index 7423654..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lapis_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lava_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lava_shuriken_effect.png
deleted file mode 100644
index c00071a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/lava_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/moss_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/moss_shuriken_effect.png
deleted file mode 100644
index ec267b9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/moss_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/necrotic_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/necrotic_shuriken_effect.png
deleted file mode 100644
index ce3a0fd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/necrotic_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/piston_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/piston_shuriken_effect.png
deleted file mode 100644
index 7942da5..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/piston_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/quartz_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/quartz_shuriken_effect.png
deleted file mode 100644
index 518c35c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/quartz_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/reinforced_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/reinforced_shuriken_effect.png
deleted file mode 100644
index 059b078..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/reinforced_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/silk_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/silk_shuriken_effect.png
deleted file mode 100644
index 34bf94e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/silk_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/smite_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/smite_shuriken_effect.png
deleted file mode 100644
index 28d8327..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/smite_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/spider_shuriken_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/shuriken/spider_shuriken_effect.png
deleted file mode 100644
index 5e4e0d0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/shuriken/spider_shuriken_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_blade.png
deleted file mode 100644
index 3029b80..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_blade.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_handle.png
deleted file mode 100644
index 59cb124..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/_knife_handle.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/beheading_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/beheading_knife_effect.png
deleted file mode 100644
index 934c352..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/beheading_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/blaze_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/blaze_knife_effect.png
deleted file mode 100644
index e7468a7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/blaze_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.png
deleted file mode 100644
index 989898d..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.xcf b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.xcf
deleted file mode 100644
index a6726bf..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/complete.xcf
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/diamond_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/diamond_knife_effect.png
deleted file mode 100644
index a010b12..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/diamond_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/emerald_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/emerald_knife_effect.png
deleted file mode 100644
index 043abde..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/emerald_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lapis_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lapis_knife_effect.png
deleted file mode 100644
index 033fec0..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lapis_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lava_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lava_knife_effect.png
deleted file mode 100644
index 66f4634..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/lava_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/moss_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/moss_knife_effect.png
deleted file mode 100644
index 533cf71..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/moss_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/necrotic_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/necrotic_knife_effect.png
deleted file mode 100644
index 45aa51a..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/necrotic_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/piston_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/piston_knife_effect.png
deleted file mode 100644
index 211a066..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/piston_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/quartz_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/quartz_knife_effect.png
deleted file mode 100644
index e741004..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/quartz_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/reinforced_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/reinforced_knife_effect.png
deleted file mode 100644
index 10f2318..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/reinforced_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/silk_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/silk_knife_effect.png
deleted file mode 100644
index f9477cc..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/silk_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/smite_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/smite_knife_effect.png
deleted file mode 100644
index 6f206da..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/smite_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/spider_knife_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/spider_knife_effect.png
deleted file mode 100644
index b512455..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/throwingknife/spider_knife_effect.png
+++ /dev/null
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 204c744..6c3acc0 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,12 +3,12 @@
  "modid": "tinkersdefense",
  "name": "Tinkers' Defense",
  "description": "A defense related expansion for TConstruct",
- "version": "1.35a",
+ "version": "1.3.6",
  "mcversion": "1.7.10",
  "url": "",
  "authorList": ["Sir Lance"],
- "requiredMods": [ "Forge", "TConstruct" ],
- "dependencies": ["TConstruct"],
+ "requiredMods": [ "Forge", "TConstruct"],
+ "dependencies": ["TConstruct", "AWWayofTime", "Thaumcraft", "Botania", "battlegear2" ],
  "useDependencyInformation": "true"
 }
 ]