Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

3 files changed, 363 insertions, 352 deletions

diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
index 3e8bbbc64b..58afd0c52c 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
@@ -1,180 +1,189 @@
 package gtPlusPlus.xmod.thermalfoundation.block;
 
-import java.util.Random;
-
-import cofh.core.fluid.BlockFluidInteractive;
-import cofh.lib.util.BlockWrapper;
-import cofh.lib.util.helpers.DamageHelper;
-import cofh.lib.util.helpers.ServerHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+
+import java.util.Random;
+
 import net.minecraft.block.Block;
-import net.minecraft.block.material.*;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.material.MaterialLiquid;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.monster.*;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.init.Blocks;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+import cofh.core.fluid.BlockFluidInteractive;
+import cofh.lib.util.BlockWrapper;
+import cofh.lib.util.helpers.DamageHelper;
+import cofh.lib.util.helpers.ServerHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
 
-public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
-	public static final int			LEVELS					= 5;
-	public static final Material	materialFluidCryotheum	= new MaterialLiquid(MapColor.iceColor);
-	private static boolean			enableSourceFall		= true;
-	private static boolean			effect					= true;
-	Random							random					= new Random();
-
-	public TF_Block_Fluid_Cryotheum() {
-		super(CORE.MODID, TF_Fluids.fluidCryotheum, TF_Block_Fluid_Cryotheum.materialFluidCryotheum, "cryotheum");
-		this.setQuantaPerBlock(5);
-		this.setTickRate(15);
-
-		this.setHardness(1000.0F);
-		this.setLightOpacity(1);
-		this.setParticleColor(0.15F, 0.7F, 1.0F);
-	}
-
-	protected void checkForInteraction(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
-			return;
-		}
-		int i = paramInt1;
-		int j = paramInt2;
-		int k = paramInt3;
-		for (int m = 0; m < 6; m++) {
-			i = paramInt1 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][0];
-			j = paramInt2 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][1];
-			k = paramInt3 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][2];
-
-			this.interactWithBlock(paramWorld, i, j, k);
-		}
-		this.interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 - 1);
-		this.interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 + 1);
-		this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 - 1);
-		this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
-	}
-
-	@Override
-	public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		return TF_Fluids.fluidCryotheum.getLuminosity();
-	}
-
-	protected void interactWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
-		if (localBlock == Blocks.air || localBlock == this) {
-			return;
-		}
-		final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
-		if (this.hasInteraction(localBlock, i)) {
-			final BlockWrapper localBlockWrapper = this.getInteraction(localBlock, i);
-			paramWorld.setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata,
-					3);
-		}
-		else if (paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP)
-				&& paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3)) {
-			paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.snow_layer, 0, 3);
-		}
-	}
-
-	@Override
-	public void onEntityCollidedWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3, final Entity paramEntity) {
-		paramEntity.extinguish();
-		if (!TF_Block_Fluid_Cryotheum.effect) {
-			return;
-		}
-		if (paramEntity.motionY < -0.05D || paramEntity.motionY > 0.05D) {
-			paramEntity.motionY *= 0.05D;
-		}
-		if (paramEntity.motionZ < -0.05D || paramEntity.motionZ > 0.05D) {
-			paramEntity.motionZ *= 0.05D;
-		}
-		if (paramEntity.motionX < -0.05D || paramEntity.motionX > 0.05D) {
-			paramEntity.motionX *= 0.05D;
-		}
-		if (ServerHelper.isClientWorld(paramWorld)) {
-			return;
-		}
-		if (paramWorld.getTotalWorldTime() % 8L != 0L) {
-			return;
-		}
-		if (paramEntity instanceof EntityZombie || paramEntity instanceof EntityCreeper) {
-			final EntitySnowman localEntitySnowman = new EntitySnowman(paramWorld);
-			localEntitySnowman.setLocationAndAngles(paramEntity.posX, paramEntity.posY, paramEntity.posZ,
-					paramEntity.rotationYaw, paramEntity.rotationPitch);
-			paramWorld.spawnEntityInWorld(localEntitySnowman);
-
-			paramEntity.setDead();
-		}
-		else if (/* ((paramEntity instanceof EntityBlizz)) || */paramEntity instanceof EntitySnowman) {
-			((EntityLivingBase) paramEntity).addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 120, 0));
-			((EntityLivingBase) paramEntity).addPotionEffect(new PotionEffect(Potion.regeneration.id, 120, 0));
-		}
-		else if (paramEntity instanceof EntityBlaze) {
-			paramEntity.attackEntityFrom(DamageHelper.cryotheum, 10.0F);
-		}
-		else {
-			final boolean bool = paramEntity.velocityChanged;
-			paramEntity.attackEntityFrom(DamageHelper.cryotheum, 2.0F);
-			paramEntity.velocityChanged = bool;
-		}
-	}
-
-	@Override
-	public boolean preInit() {
-		GameRegistry.registerBlock(this, "FluidCryotheum");
-
-		this.addInteraction(Blocks.grass, Blocks.dirt);
-		this.addInteraction(Blocks.water, 0, Blocks.ice);
-		this.addInteraction(Blocks.water, Blocks.snow);
-		this.addInteraction(Blocks.flowing_water, 0, Blocks.ice);
-		this.addInteraction(Blocks.flowing_water, Blocks.snow);
-		this.addInteraction(Blocks.lava, 0, Blocks.obsidian);
-		this.addInteraction(Blocks.lava, Blocks.stone);
-		this.addInteraction(Blocks.flowing_lava, 0, Blocks.obsidian);
-		this.addInteraction(Blocks.flowing_lava, Blocks.stone);
-		this.addInteraction(Blocks.leaves, Blocks.air);
-		this.addInteraction(Blocks.tallgrass, Blocks.air);
-		this.addInteraction(Blocks.fire, Blocks.air);
-		// addInteraction(TFBlocks.blockFluidGlowstone, 0, Blocks.glowstone);
-
-		final String str1 = "Fluid.Cryotheum";
-		String str2 = "Enable this for Fluid Cryotheum to be worse than lava, except cold.";
-		TF_Block_Fluid_Cryotheum.effect = true;
-
-		str2 = "Enable this for Fluid Cryotheum Source blocks to gradually fall downwards.";
-		TF_Block_Fluid_Cryotheum.enableSourceFall = true;
-
-		return true;
-	}
-
-	protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-	}
-
-	@Override
-	public void updateTick(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
-			final Random paramRandom) {
-		if (TF_Block_Fluid_Cryotheum.effect) {
-			this.checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
-		}
-		if (TF_Block_Fluid_Cryotheum.enableSourceFall
-				&& paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3) == 0) {
-			final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2 + this.densityDir, paramInt3);
-			final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2 + this.densityDir, paramInt3);
-			if (localBlock == this && i != 0) {
-				paramWorld.setBlock(paramInt1, paramInt2 + this.densityDir, paramInt3, this, 0, 3);
-				paramWorld.setBlockToAir(paramInt1, paramInt2, paramInt3);
-				return;
-			}
-		}
-		super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
-	}
+public class TF_Block_Fluid_Cryotheum
+  extends BlockFluidInteractive
+{
+  Random random = new Random();
+  public static final int LEVELS = 5;
+  public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor);
+  private static boolean enableSourceFall = true;
+  private static boolean effect = true;
+  
+  public TF_Block_Fluid_Cryotheum()
+  {
+    super(CORE.MODID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum");
+    setQuantaPerBlock(5);
+    setTickRate(15);
+    
+    setHardness(1000.0F);
+    setLightOpacity(1);
+    setParticleColor(0.15F, 0.7F, 1.0F);
+  }
+  
+  public boolean preInit()
+  {
+    GameRegistry.registerBlock(this, "FluidCryotheum");
+    
+    addInteraction(Blocks.grass, Blocks.dirt);
+    addInteraction(Blocks.water, 0, Blocks.ice);
+    addInteraction(Blocks.water, Blocks.snow);
+    addInteraction(Blocks.flowing_water, 0, Blocks.ice);
+    addInteraction(Blocks.flowing_water, Blocks.snow);
+    addInteraction(Blocks.lava, 0, Blocks.obsidian);
+    addInteraction(Blocks.lava, Blocks.stone);
+    addInteraction(Blocks.flowing_lava, 0, Blocks.obsidian);
+    addInteraction(Blocks.flowing_lava, Blocks.stone);
+    addInteraction(Blocks.leaves, Blocks.air);
+    addInteraction(Blocks.tallgrass, Blocks.air);
+    addInteraction(Blocks.fire, Blocks.air);
+    //addInteraction(TFBlocks.blockFluidGlowstone, 0, Blocks.glowstone);
+    
+    String str1 = "Fluid.Cryotheum";
+    String str2 = "Enable this for Fluid Cryotheum to be worse than lava, except cold.";
+    effect = true;
+    
+    str2 = "Enable this for Fluid Cryotheum Source blocks to gradually fall downwards.";
+    enableSourceFall = true;
+    
+    return true;
+  }
+  
+  public void onEntityCollidedWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3, Entity paramEntity)
+  {
+    paramEntity.extinguish();
+    if (!effect) {
+      return;
+    }
+    if ((paramEntity.motionY < -0.05D) || (paramEntity.motionY > 0.05D)) {
+      paramEntity.motionY *= 0.05D;
+    }
+    if ((paramEntity.motionZ < -0.05D) || (paramEntity.motionZ > 0.05D)) {
+      paramEntity.motionZ *= 0.05D;
+    }
+    if ((paramEntity.motionX < -0.05D) || (paramEntity.motionX > 0.05D)) {
+      paramEntity.motionX *= 0.05D;
+    }
+    if (ServerHelper.isClientWorld(paramWorld)) {
+      return;
+    }
+    if (paramWorld.getTotalWorldTime() % 8L != 0L) {
+      return;
+    }
+    if (((paramEntity instanceof EntityZombie)) || ((paramEntity instanceof EntityCreeper)))
+    {
+      EntitySnowman localEntitySnowman = new EntitySnowman(paramWorld);
+      localEntitySnowman.setLocationAndAngles(paramEntity.posX, paramEntity.posY, paramEntity.posZ, paramEntity.rotationYaw, paramEntity.rotationPitch);
+      paramWorld.spawnEntityInWorld(localEntitySnowman);
+      
+      paramEntity.setDead();
+    }
+    else if (/*((paramEntity instanceof EntityBlizz)) ||*/((paramEntity instanceof EntitySnowman)))
+    {
+      ((EntityLivingBase)paramEntity).addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 120, 0));
+      ((EntityLivingBase)paramEntity).addPotionEffect(new PotionEffect(Potion.regeneration.id, 120, 0));
+    }
+    else if ((paramEntity instanceof EntityBlaze))
+    {
+      paramEntity.attackEntityFrom(DamageHelper.cryotheum, 10.0F);
+    }
+    else
+    {
+      boolean bool = paramEntity.velocityChanged;
+      paramEntity.attackEntityFrom(DamageHelper.cryotheum, 2.0F);
+      paramEntity.velocityChanged = bool;
+    }
+  }
+  
+  public int getLightValue(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3)
+  {
+    return TF_Fluids.fluidCryotheum.getLuminosity();
+  }
+  
+  public void updateTick(World paramWorld, int paramInt1, int paramInt2, int paramInt3, Random paramRandom)
+  {
+    if (effect) {
+      checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
+    }
+    if ((enableSourceFall) && (paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3) == 0))
+    {
+      Block localBlock = paramWorld.getBlock(paramInt1, paramInt2 + this.densityDir, paramInt3);
+      int i = paramWorld.getBlockMetadata(paramInt1, paramInt2 + this.densityDir, paramInt3);
+      if ((localBlock == this) && (i != 0))
+      {
+        paramWorld.setBlock(paramInt1, paramInt2 + this.densityDir, paramInt3, this, 0, 3);
+        paramWorld.setBlockToAir(paramInt1, paramInt2, paramInt3);
+        return;
+      }
+    }
+    super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
+  }
+  
+  protected void checkForInteraction(World paramWorld, int paramInt1, int paramInt2, int paramInt3)
+  {
+    if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
+      return;
+    }
+    int i = paramInt1;
+    int j = paramInt2;
+    int k = paramInt3;
+    for (int m = 0; m < 6; m++)
+    {
+      i = paramInt1 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][0];
+      j = paramInt2 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][1];
+      k = paramInt3 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][2];
+      
+      interactWithBlock(paramWorld, i, j, k);
+    }
+    interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 - 1);
+    interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 + 1);
+    interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 - 1);
+    interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
+  }
+  
+  protected void interactWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3)
+  {
+    Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
+    if ((localBlock == Blocks.air) || (localBlock == this)) {
+      return;
+    }
+    int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
+    if (hasInteraction(localBlock, i))
+    {
+      BlockWrapper localBlockWrapper = getInteraction(localBlock, i);
+      paramWorld.setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
+    }
+    else if ((paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP)) && (paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3)))
+    {
+      paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.snow_layer, 0, 3);
+    }
+  }
+  
+  protected void triggerInteractionEffects(World paramWorld, int paramInt1, int paramInt2, int paramInt3) {}
 }
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
index 72fd99f181..f45cc1d839 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
@@ -1,15 +1,14 @@
 package gtPlusPlus.xmod.thermalfoundation.block;
 
-import java.util.Random;
-
-import cofh.core.fluid.BlockFluidInteractive;
-import cofh.lib.util.BlockWrapper;
-import cofh.lib.util.helpers.ServerHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+
+import java.util.Random;
+
 import net.minecraft.block.Block;
-import net.minecraft.block.material.*;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.material.MaterialLiquid;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,167 +16,167 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+import cofh.core.fluid.BlockFluidInteractive;
+import cofh.lib.util.BlockWrapper;
+import cofh.lib.util.helpers.ServerHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
 
-public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
-	public static final int			LEVELS					= 5;
-	public static final Material	materialFluidPyrotheum	= new MaterialLiquid(MapColor.tntColor);
-	private static boolean			effect					= true;
-	private static boolean			enableSourceFall		= true;
-	Random							random					= new Random();
-
-	public TF_Block_Fluid_Pyrotheum() {
-		super(CORE.MODID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum");
-		this.setQuantaPerBlock(5);
-		this.setTickRate(10);
-
-		this.setHardness(1000.0F);
-		this.setLightOpacity(1);
-		this.setParticleColor(1.0F, 0.7F, 0.15F);
-	}
-
-	protected void checkForInteraction(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
-			return;
-		}
-		int i = paramInt1;
-		int j = paramInt2;
-		int k = paramInt3;
-		for (int m = 0; m < 6; m++) {
-			i = paramInt1 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][0];
-			j = paramInt2 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][1];
-			k = paramInt3 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][2];
-
-			this.interactWithBlock(paramWorld, i, j, k);
-		}
-		this.interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 - 1);
-		this.interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 + 1);
-		this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 - 1);
-		this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
-	}
-
-	@Override
-	public int getFireSpreadSpeed(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
-			final int paramInt3, final ForgeDirection paramForgeDirection) {
-		return TF_Block_Fluid_Pyrotheum.effect ? 800 : 0;
-	}
-
-	@Override
-	public int getFlammability(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
-			final int paramInt3, final ForgeDirection paramForgeDirection) {
-		return 0;
-	}
-
-	@Override
-	public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		return TF_Fluids.fluidPyrotheum.getLuminosity();
-	}
-
-	protected void interactWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
-		if (localBlock == Blocks.air || localBlock == this) {
-			return;
-		}
-		final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
-		if (this.hasInteraction(localBlock, i)) {
-			final BlockWrapper localBlockWrapper = this.getInteraction(localBlock, i);
-			paramWorld.setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata,
-					3);
-			this.triggerInteractionEffects(paramWorld, paramInt1, paramInt2, paramInt3);
-		}
-		else if (localBlock.isFlammable(paramWorld, paramInt1, paramInt2, paramInt3, ForgeDirection.UP)) {
-			paramWorld.setBlock(paramInt1, paramInt2, paramInt3, Blocks.fire);
-		}
-		else if (paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP)
-				&& paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3)) {
-			paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.fire, 0, 3);
-		}
-	}
-
-	@Override
-	public boolean isFireSource(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
-			final ForgeDirection paramForgeDirection) {
-		return TF_Block_Fluid_Pyrotheum.effect;
-	}
-
-	@Override
-	public boolean isFlammable(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
-			final int paramInt3, final ForgeDirection paramForgeDirection) {
-		return TF_Block_Fluid_Pyrotheum.effect && paramForgeDirection.ordinal() > ForgeDirection.UP.ordinal()
-				&& paramIBlockAccess.getBlock(paramInt1, paramInt2 - 1, paramInt3) != this;
-	}
-
-	@Override
-	public void onEntityCollidedWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3, final Entity paramEntity) {
-		if (!TF_Block_Fluid_Pyrotheum.effect) {
-			return;
-		}
-		if (ServerHelper.isClientWorld(paramWorld)) {
-			return;
-		}
-		if (!(paramEntity instanceof EntityPlayer)) {
-			if (paramEntity instanceof EntityCreeper) {
-				paramWorld.createExplosion(paramEntity, paramEntity.posX, paramEntity.posY, paramEntity.posZ, 6.0F,
-						paramEntity.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"));
-				paramEntity.setDead();
-			}
-		}
-	}
-
-	@Override
-	public boolean preInit() {
-		GameRegistry.registerBlock(this, "FluidPyrotheum");
-
-		this.addInteraction(Blocks.cobblestone, Blocks.stone);
-		this.addInteraction(Blocks.grass, Blocks.dirt);
-		this.addInteraction(Blocks.sand, Blocks.glass);
-		this.addInteraction(Blocks.water, Blocks.stone);
-		this.addInteraction(Blocks.flowing_water, Blocks.stone);
-		this.addInteraction(Blocks.clay, Blocks.hardened_clay);
-		this.addInteraction(Blocks.ice, Blocks.stone);
-		this.addInteraction(Blocks.snow, Blocks.air);
-		this.addInteraction(Blocks.snow_layer, Blocks.air);
-		for (int i = 0; i < 8; i++) {
-			this.addInteraction(Blocks.stone_stairs, i, Blocks.stone_brick_stairs, i);
-		}
-		final String str1 = "Fluid.Pyrotheum";
-		String str2 = "Enable this for Fluid Pyrotheum to be worse than lava.";
-		TF_Block_Fluid_Pyrotheum.effect = true;
-
-		str2 = "Enable this for Fluid Pyrotheum Source blocks to gradually fall downwards.";
-		TF_Block_Fluid_Pyrotheum.enableSourceFall = true;
-
-		return true;
-	}
-
-	protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2,
-			final int paramInt3) {
-		if (this.random.nextInt(16) == 0) {
-			paramWorld.playSoundEffect(paramInt1 + 0.5F, paramInt2 + 0.5F, paramInt3 + 0.5F, "random.fizz", 0.5F,
-					2.2F + (paramWorld.rand.nextFloat() - paramWorld.rand.nextFloat()) * 0.8F);
-		}
-	}
-
-	@Override
-	public void updateTick(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
-			final Random paramRandom) {
-		if (TF_Block_Fluid_Pyrotheum.effect) {
-			this.checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
-		}
-		if (TF_Block_Fluid_Pyrotheum.enableSourceFall
-				&& paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3) == 0) {
-			final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2 + this.densityDir, paramInt3);
-			final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2 + this.densityDir, paramInt3);
-			if (localBlock == this && i != 0 || localBlock.isFlammable(paramWorld, paramInt1,
-					paramInt2 + this.densityDir, paramInt3, ForgeDirection.UP)) {
-				paramWorld.setBlock(paramInt1, paramInt2 + this.densityDir, paramInt3, this, 0, 3);
-				paramWorld.setBlockToAir(paramInt1, paramInt2, paramInt3);
-				return;
-			}
-		}
-		super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
-	}
+public class TF_Block_Fluid_Pyrotheum
+  extends BlockFluidInteractive
+{
+  Random random = new Random();
+  public static final int LEVELS = 5;
+  public static final Material materialFluidPyrotheum = new MaterialLiquid(MapColor.tntColor);
+  private static boolean effect = true;
+  private static boolean enableSourceFall = true;
+  
+  public TF_Block_Fluid_Pyrotheum()
+  {
+    super(CORE.MODID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum");
+    setQuantaPerBlock(5);
+    setTickRate(10);
+    
+    setHardness(1000.0F);
+    setLightOpacity(1);
+    setParticleColor(1.0F, 0.7F, 0.15F);
+  }
+  
+  public boolean preInit()
+  {
+    GameRegistry.registerBlock(this, "FluidPyrotheum");
+    
+    addInteraction(Blocks.cobblestone, Blocks.stone);
+    addInteraction(Blocks.grass, Blocks.dirt);
+    addInteraction(Blocks.sand, Blocks.glass);
+    addInteraction(Blocks.water, Blocks.stone);
+    addInteraction(Blocks.flowing_water, Blocks.stone);
+    addInteraction(Blocks.clay, Blocks.hardened_clay);
+    addInteraction(Blocks.ice, Blocks.stone);
+    addInteraction(Blocks.snow, Blocks.air);
+    addInteraction(Blocks.snow_layer, Blocks.air);
+    for (int i = 0; i < 8; i++) {
+      addInteraction(Blocks.stone_stairs, i, Blocks.stone_brick_stairs, i);
+    }
+    String str1 = "Fluid.Pyrotheum";
+    String str2 = "Enable this for Fluid Pyrotheum to be worse than lava.";
+    effect = true;
+    
+    str2 = "Enable this for Fluid Pyrotheum Source blocks to gradually fall downwards.";
+    enableSourceFall = true;
+    
+    return true;
+  }
+  
+  public void onEntityCollidedWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3, Entity paramEntity)
+  {
+    if (!effect) {
+      return;
+    }
+    if (ServerHelper.isClientWorld(paramWorld)) {
+      return;
+    }
+    if (!(paramEntity instanceof EntityPlayer)) {
+      if ((paramEntity instanceof EntityCreeper))
+      {
+        paramWorld.createExplosion(paramEntity, paramEntity.posX, paramEntity.posY, paramEntity.posZ, 6.0F, paramEntity.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"));
+        paramEntity.setDead();
+      }
+    }
+  }
+  
+  public int getLightValue(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3)
+  {
+    return TF_Fluids.fluidPyrotheum.getLuminosity();
+  }
+  
+  public int getFireSpreadSpeed(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3, ForgeDirection paramForgeDirection)
+  {
+    return effect ? 800 : 0;
+  }
+  
+  public int getFlammability(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3, ForgeDirection paramForgeDirection)
+  {
+    return 0;
+  }
+  
+  public boolean isFlammable(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3, ForgeDirection paramForgeDirection)
+  {
+    return (effect) && (paramForgeDirection.ordinal() > ForgeDirection.UP.ordinal()) && (paramIBlockAccess.getBlock(paramInt1, paramInt2 - 1, paramInt3) != this);
+  }
+  
+  public boolean isFireSource(World paramWorld, int paramInt1, int paramInt2, int paramInt3, ForgeDirection paramForgeDirection)
+  {
+    return effect;
+  }
+  
+  public void updateTick(World paramWorld, int paramInt1, int paramInt2, int paramInt3, Random paramRandom)
+  {
+    if (effect) {
+      checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
+    }
+    if ((enableSourceFall) && (paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3) == 0))
+    {
+      Block localBlock = paramWorld.getBlock(paramInt1, paramInt2 + this.densityDir, paramInt3);
+      int i = paramWorld.getBlockMetadata(paramInt1, paramInt2 + this.densityDir, paramInt3);
+      if (((localBlock == this) && (i != 0)) || (localBlock.isFlammable(paramWorld, paramInt1, paramInt2 + this.densityDir, paramInt3, ForgeDirection.UP)))
+      {
+        paramWorld.setBlock(paramInt1, paramInt2 + this.densityDir, paramInt3, this, 0, 3);
+        paramWorld.setBlockToAir(paramInt1, paramInt2, paramInt3);
+        return;
+      }
+    }
+    super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
+  }
+  
+  protected void checkForInteraction(World paramWorld, int paramInt1, int paramInt2, int paramInt3)
+  {
+    if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
+      return;
+    }
+    int i = paramInt1;
+    int j = paramInt2;
+    int k = paramInt3;
+    for (int m = 0; m < 6; m++)
+    {
+      i = paramInt1 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][0];
+      j = paramInt2 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][1];
+      k = paramInt3 + cofh.lib.util.helpers.BlockHelper.SIDE_COORD_MOD[m][2];
+      
+      interactWithBlock(paramWorld, i, j, k);
+    }
+    interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 - 1);
+    interactWithBlock(paramWorld, paramInt1 - 1, paramInt2, paramInt3 + 1);
+    interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 - 1);
+    interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
+  }
+  
+  protected void interactWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3)
+  {
+    Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
+    if ((localBlock == Blocks.air) || (localBlock == this)) {
+      return;
+    }
+    int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
+    if (hasInteraction(localBlock, i))
+    {
+      BlockWrapper localBlockWrapper = getInteraction(localBlock, i);
+      paramWorld.setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
+      triggerInteractionEffects(paramWorld, paramInt1, paramInt2, paramInt3);
+    }
+    else if (localBlock.isFlammable(paramWorld, paramInt1, paramInt2, paramInt3, ForgeDirection.UP))
+    {
+      paramWorld.setBlock(paramInt1, paramInt2, paramInt3, Blocks.fire);
+    }
+    else if ((paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP)) && (paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3)))
+    {
+      paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.fire, 0, 3);
+    }
+  }
+  
+  protected void triggerInteractionEffects(World paramWorld, int paramInt1, int paramInt2, int paramInt3)
+  {
+    if (this.random.nextInt(16) == 0) {
+      paramWorld.playSoundEffect(paramInt1 + 0.5F, paramInt2 + 0.5F, paramInt3 + 0.5F, "random.fizz", 0.5F, 2.2F + (paramWorld.rand.nextFloat() - paramWorld.rand.nextFloat()) * 0.8F);
+    }
+  }
 }
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
index 1fccf3bb8c..867f8c7f7d 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
@@ -2,22 +2,25 @@ package gtPlusPlus.xmod.thermalfoundation.block;
 
 import cofh.core.fluid.BlockFluidCoFHBase;
 
-public class TF_Blocks {
-
-	public static BlockFluidCoFHBase	blockFluidPyrotheum;
-	public static BlockFluidCoFHBase	blockFluidCryotheum;
-
-	public static void init() {
-	}
-
-	public static void postInit() {
-
-	}
-
-	public static void preInit() {
-		TF_Blocks.blockFluidPyrotheum = new TF_Block_Fluid_Pyrotheum();
-		TF_Blocks.blockFluidCryotheum = new TF_Block_Fluid_Cryotheum();
-		TF_Blocks.blockFluidPyrotheum.preInit();
-		TF_Blocks.blockFluidCryotheum.preInit();
-	}
+public class TF_Blocks
+{
+  
+  public static BlockFluidCoFHBase blockFluidPyrotheum;
+  public static BlockFluidCoFHBase blockFluidCryotheum;
+  
+  
+  public static void preInit()
+  {
+    blockFluidPyrotheum = new TF_Block_Fluid_Pyrotheum();
+    blockFluidCryotheum = new TF_Block_Fluid_Cryotheum();
+    blockFluidPyrotheum.preInit();
+    blockFluidCryotheum.preInit();
+  }
+  
+  public static void init() {}
+  
+  public static void postInit()
+  {
+    
+  }
 }