+ Added a simple block that can convert liquid xp to mob essence and back.

+ Added some Enchantment utilities.

6 files changed, 553 insertions, 106 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 6ebb21bb9c..992cd7e991 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -3,9 +3,20 @@ package gtPlusPlus.core.block;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.block.general.*;
+import gtPlusPlus.core.block.general.BlockTankXpConverter;
+import gtPlusPlus.core.block.general.FirePit;
+import gtPlusPlus.core.block.general.FluidTankInfinite;
+import gtPlusPlus.core.block.general.HellFire;
+import gtPlusPlus.core.block.general.LightGlass;
+import gtPlusPlus.core.block.general.MiningExplosives;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
-import gtPlusPlus.core.block.machine.*;
+import gtPlusPlus.core.block.machine.FishTrap;
+import gtPlusPlus.core.block.machine.HeliumGenerator;
+import gtPlusPlus.core.block.machine.Machine_ModularityTable;
+import gtPlusPlus.core.block.machine.Machine_ProjectTable;
+import gtPlusPlus.core.block.machine.Machine_TradeTable;
+import gtPlusPlus.core.block.machine.Machine_Workbench;
+import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
@@ -38,16 +49,17 @@ public final class ModBlocks {
 	public static Block blockFirePit;
 
 	public static Block blockOreFluorite;
-	
+
 	public static Block blockMiningExplosive;
-	
+
 	public static Block blockHellfire;
 	public static Block blockInfiniteFLuidTank;
 	public static Block blockProjectTable;
 	public static Block blockTradeTable;
 	public static Block blockModularTable;
-	
+
 	public static Block blockWitherGuard;
+	public static Block blockXpConverter;
 
 	public static void init() {
 		Utils.LOG_INFO("Initializing Blocks.");
@@ -78,6 +90,7 @@ public final class ModBlocks {
 		blockTradeTable =  new Machine_TradeTable();
 		blockModularTable =  new Machine_ModularityTable();
 		blockWitherGuard = new BlockWitherProof();
+		blockXpConverter = new BlockTankXpConverter();
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
new file mode 100644
index 0000000000..aa19556317
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -0,0 +1,105 @@
+package gtPlusPlus.core.block.general;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityXpConverter;
+import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
+import gtPlusPlus.core.util.player.PlayerUtils;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class BlockTankXpConverter extends BlockContainer {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureBottom;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureFront;
+
+	@SuppressWarnings("deprecation")
+	public BlockTankXpConverter() {
+		super(Material.iron);
+		this.setBlockName("blockTankXpConverter");
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockEntityBase.class, "blockTankXpConverter");
+		LanguageRegistry.addName(this, "Xp Converter");
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
+		return p_149691_1_ == 1 ? this.textureTop
+				: (p_149691_1_ == 0 ? this.textureBottom
+						: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister p_149651_1_) {
+		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+		this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+			final int side, final float lx, final float ly, final float lz) {
+		if (world.isRemote) {
+			return true;
+		}
+		else {
+			final TileEntityXpConverter tank = (TileEntityXpConverter) world.getTileEntity(x, y, z);
+			if (tank != null){
+				if (tank.tankEssence.getFluid() != null){
+					PlayerUtils.messagePlayer(player, "This tank contains "+tank.tankEssence.getFluidAmount()+"L of "+tank.tankEssence.getFluid().getLocalizedName());
+				}
+				if (tank.tankLiquidXp.getFluid() != null){
+					PlayerUtils.messagePlayer(player, "This tank contains "+tank.tankLiquidXp.getFluidAmount()+"L of "+tank.tankLiquidXp.getFluid().getLocalizedName());
+				}
+				if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)){
+					PlayerUtils.messagePlayer(player, "This is worth "+EnchantmentUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()));
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public int getRenderBlockPass() {
+		return 1;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityXpConverter();
+	}
+
+	@Override
+	public void onBlockAdded(final World world, final int x, final int y, final int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
index 43a37b423c..0dda165b6b 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
@@ -1,9 +1,14 @@
 package gtPlusPlus.core.item.base.itemblock;
 
+import java.util.List;
+
+import gtPlusPlus.core.block.general.BlockTankXpConverter;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
 public class ItemBlockEntityBase extends ItemBlock {
 
@@ -19,5 +24,18 @@ public class ItemBlockEntityBase extends ItemBlock {
 		return super.getColorFromItemStack(p_82790_1_, p_82790_2_);
 	}
 
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTankXpConverter){
+			list.add(EnumChatFormatting.GRAY+"Liquid Xp can be filled or drained from all four sides.");
+			list.add(EnumChatFormatting.GRAY+"Mob Essence can be filled or drained from the top and bottom.");
+		}
+		else if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTankXpConverter){
+			//list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
new file mode 100644
index 0000000000..990304cf07
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
@@ -0,0 +1,193 @@
+package gtPlusPlus.core.tileentities.general;
+
+import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
+
+	public FluidTank tankEssence = new FluidTank((int) (64000*EnchantmentUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP));
+	public FluidTank tankLiquidXp = new FluidTank(64000);
+	private boolean needsUpdate = false;
+	private int updateTimer = 0;
+
+	public TileEntityXpConverter() {
+	}
+
+	@Override
+	public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
+		this.needsUpdate = true;
+		if (resource.isFluidEqual(EnchantmentUtils.getLiquidXP(1))){
+			return this.tankLiquidXp.fill(resource, doFill);
+		}
+		else if (resource.isFluidEqual(EnchantmentUtils.getMobEssence(1))){
+			return this.tankEssence.fill(resource, doFill);
+		}
+		else {
+			return 0;
+		}
+	}
+
+	@Override
+	public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) {
+		this.needsUpdate = true;
+		if (resource.isFluidEqual(EnchantmentUtils.getLiquidXP(1))){
+			return this.tankLiquidXp.drain(resource.amount, doDrain);
+		}
+		else if (resource.isFluidEqual(EnchantmentUtils.getMobEssence(1))){
+			return this.tankEssence.drain(resource.amount, doDrain);
+		}
+		else {
+			return null;
+		}
+
+	}
+
+	@Override
+	public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) {
+		this.needsUpdate = true;
+		final FluidStack fluid_Essence = this.tankEssence.getFluid();
+		final FluidStack fluid_Xp = this.tankLiquidXp.getFluid();
+		if ((fluid_Essence == null) && (fluid_Xp == null)) {
+			return null;
+		}
+
+		FluidStack fluid;
+		FluidTank tank;
+
+		if ((from == ForgeDirection.UP) || (from == ForgeDirection.DOWN)){
+			fluid = fluid_Essence;
+			tank = this.tankEssence;
+		}
+		else {
+			fluid = fluid_Xp;
+			tank = this.tankLiquidXp;
+		}
+
+		int drained = maxDrain;
+		if (fluid.amount < drained) {
+			drained = fluid.amount;
+		}
+
+		final FluidStack stack = new FluidStack(fluid, drained);
+		if (doDrain) {
+			fluid.amount -= drained;
+			if (fluid.amount <= 0) {
+				fluid = null;
+			}
+
+			if (this != null) {
+				FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluid, this.getWorldObj(), this.xCoord,
+						this.yCoord, this.zCoord, tank, 0));
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public boolean canFill(final ForgeDirection from, final Fluid fluid) {
+		return true;
+	}
+
+	@Override
+	public boolean canDrain(final ForgeDirection from, final Fluid fluid) {
+		return true;
+	}
+
+	@Override
+	public FluidTankInfo[] getTankInfo(final ForgeDirection from) {
+		if ((from == ForgeDirection.UP) || (from == ForgeDirection.DOWN)){
+			return new FluidTankInfo[] { this.tankEssence.getInfo() };
+		}
+		else {
+			return new FluidTankInfo[] { this.tankLiquidXp.getInfo() };
+		}
+	}
+
+	public float getAdjustedVolume() {
+		this.needsUpdate = true;
+		final float amount = this.tankLiquidXp.getFluidAmount();
+		final float capacity = this.tankLiquidXp.getCapacity();
+		final float volume = (amount / capacity) * 0.8F;
+		return volume;
+	}
+
+	@Override
+	public void updateEntity() {
+
+		if (this.tankEssence.getFluid() != null){
+			final FluidStack bigStorage = this.tankEssence.getFluid();
+			bigStorage.amount = this.tankEssence.getCapacity();
+			this.tankEssence.setFluid(bigStorage);
+		}
+
+		if (this.tankLiquidXp.getFluid() != null){
+			final FluidStack bigStorage = this.tankLiquidXp.getFluid();
+			bigStorage.amount = this.tankLiquidXp.getCapacity();
+			this.tankLiquidXp.setFluid(bigStorage);
+		}
+
+		if (this.needsUpdate) {
+
+			if (this.tankEssence.getFluid() != null){
+				final FluidStack bigStorage = this.tankEssence.getFluid();
+				bigStorage.amount = this.tankEssence.getCapacity();
+				this.tankEssence.setFluid(bigStorage);
+			}
+
+			if (this.tankLiquidXp.getFluid() != null){
+				final FluidStack bigStorage = this.tankLiquidXp.getFluid();
+				bigStorage.amount = this.tankLiquidXp.getCapacity();
+				this.tankLiquidXp.setFluid(bigStorage);
+			}
+
+			if (this.updateTimer == 0) {
+				this.updateTimer = 10; // every 10 ticks it will send an update
+			} else {
+				--this.updateTimer;
+				if (this.updateTimer == 0) {
+					this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+					this.needsUpdate = false;
+				}
+			}
+		}
+	}
+
+	@Override
+	public void readFromNBT(final NBTTagCompound tag) {
+		this.tankEssence.readFromNBT(tag);
+		this.tankLiquidXp.readFromNBT(tag);
+		super.readFromNBT(tag);
+	}
+
+	@Override
+	public void writeToNBT(final NBTTagCompound tag) {
+		this.tankEssence.writeToNBT(tag);
+		this.tankLiquidXp.writeToNBT(tag);
+		super.writeToNBT(tag);
+	}
+
+	@Override
+	public Packet getDescriptionPacket() {
+		final NBTTagCompound tag = new NBTTagCompound();
+		this.writeToNBT(tag);
+		return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, this.blockMetadata, tag);
+	}
+
+	@Override
+	public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity pkt) {
+		final NBTTagCompound tag = pkt.func_148857_g();
+		this.readFromNBT(tag);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java b/src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java
new file mode 100644
index 0000000000..49c625685c
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java
@@ -0,0 +1,102 @@
+package gtPlusPlus.core.util.enchantment;
+
+import gtPlusPlus.core.util.Utils;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+public class EnchantmentUtils {
+
+
+	public static final int XP_PER_BOTTLE = 8;
+	public static final int RATIO = 20;
+	public static final int LIQUID_PER_XP_BOTTLE = 160;
+	public static final double RATIO_MOB_ESSENCE_TO_LIQUID_XP = 13.32;
+
+	public static int liquidToXpRatio(final int liquid) {
+		return liquid / RATIO;
+	}
+
+	public static int xpToLiquidRatio(final int xp) {
+		return xp * RATIO;
+	}
+
+	public static FluidStack getEssenceFromLiquidXp(final int xpAmount){
+		if (xpAmount <= 0){
+			return null;
+		}
+		return getMobEssence((int) (xpAmount*RATIO_MOB_ESSENCE_TO_LIQUID_XP));
+	}
+
+	public static FluidStack getLiquidXpFromEssence(final int essenceAmount){
+		if (essenceAmount <= 0){
+			return null;
+		}
+		return getLiquidXP((int) (essenceAmount/RATIO_MOB_ESSENCE_TO_LIQUID_XP));
+	}
+
+	public static int getLiquidForLevel(final int level) {
+		final int xp = getExperienceForLevel(level);
+		return xpToLiquidRatio(xp);
+	}
+
+	public static int getLevelForLiquid(final int liquid) {
+		final int xp = liquidToXpRatio(liquid);
+		return getLevelForExperience(xp);
+	}
+
+	public static int getExperienceForLevel(final int level) {
+		if (level == 0) {
+			return 0;
+		}
+		if ((level > 0) && (level < 16)) {
+			return level * 17;
+		}
+		if ((level > 15) && (level < 31)) {
+			return (int) (((1.5 * Math.pow(level, 2.0)) - (29.5 * level)) + 360.0);
+		}
+		return (int) (((3.5 * Math.pow(level, 2.0)) - (151.5 * level)) + 2220.0);
+	}
+
+	public static int getXpToNextLevel(final int level) {
+		final int levelXP = getLevelForExperience(level);
+		final int nextXP = getExperienceForLevel(level + 1);
+		return nextXP - levelXP;
+	}
+
+	public static int getLevelForExperience(final int experience) {
+		int i;
+		for (i = 0; getExperienceForLevel(i) <= experience; ++i) {
+		}
+		return i - 1;
+	}
+
+
+
+
+
+
+
+	//Xp Fluids
+	public static FluidStack getMobEssence(final int amount){
+		Utils.LOG_WARNING("Trying to get a fluid stack of Mob Essence.");
+		try {
+			return FluidRegistry.getFluidStack("mobessence", amount).copy();
+		}
+		catch (final Throwable e){
+			return null;
+		}
+
+	}
+
+	public static FluidStack getLiquidXP(final int amount){
+		Utils.LOG_WARNING("Trying to get a fluid stack of Liquid XP.");
+		try {
+			return FluidRegistry.getFluidStack("xpjuice", amount).copy();
+		}
+		catch (final Throwable e){
+			return null;
+		}
+
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 47020b536b..b0b6102504 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.core.util.fluid;
 
-import gregtech.api.enums.*;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.fluids.GenericFluid;
 import gtPlusPlus.core.item.base.BaseItemComponent;
@@ -9,12 +11,17 @@ import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
 
 public class FluidUtils {
 
@@ -87,24 +94,24 @@ public class FluidUtils {
 	public static Fluid generateFluid(final String displayName, final String fluidName, final int tempK, final short[] rgba ,final int aState){
 		Fluid generatedFluid = null;
 		switch (aState) {
-		case 0: {
-			generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 10000, false, rgba);
-			break;
-		}
-		default:
-		case 1:
-		case 4: {
-			generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 1000, false, rgba);
-			break;
-		}
-		case 2: {
-			generatedFluid = new GenericFluid(displayName, fluidName, 0, -100, tempK, 200, true, rgba);
-			break;
-		}
-		case 3: {
-			generatedFluid = new GenericFluid(displayName, fluidName, 15, -10000, tempK, 10, true, rgba);
-			break;
-		}
+			case 0: {
+				generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 10000, false, rgba);
+				break;
+			}
+			default:
+			case 1:
+			case 4: {
+				generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 1000, false, rgba);
+				break;
+			}
+			case 2: {
+				generatedFluid = new GenericFluid(displayName, fluidName, 0, -100, tempK, 200, true, rgba);
+				break;
+			}
+			case 3: {
+				generatedFluid = new GenericFluid(displayName, fluidName, 15, -10000, tempK, 10, true, rgba);
+				break;
+			}
 		}
 		return generatedFluid;
 	}
@@ -122,24 +129,24 @@ public class FluidUtils {
 		final int tempK = material.getMeltingPointC();
 		Fluid generatedFluid = null;
 		switch (aState) {
-		case 0: {
-			generatedFluid = new GenericFluid(material, 0, 100, tempK, 10000, false);
-			break;
-		}
-		default:
-		case 1:
-		case 4: {
-			generatedFluid = new GenericFluid(material, 0, 100, tempK, 1000, false);
-			break;
-		}
-		case 2: {
-			generatedFluid = new GenericFluid(material, 0, -100, tempK, 200, true);
-			break;
-		}
-		case 3: {
-			generatedFluid = new GenericFluid(material, 15, -10000, tempK, 10, true);
-			break;
-		}
+			case 0: {
+				generatedFluid = new GenericFluid(material, 0, 100, tempK, 10000, false);
+				break;
+			}
+			default:
+			case 1:
+			case 4: {
+				generatedFluid = new GenericFluid(material, 0, 100, tempK, 1000, false);
+				break;
+			}
+			case 2: {
+				generatedFluid = new GenericFluid(material, 0, -100, tempK, 200, true);
+				break;
+			}
+			case 3: {
+				generatedFluid = new GenericFluid(material, 15, -10000, tempK, 10, true);
+				break;
+			}
 		}
 		return generatedFluid;
 	}
@@ -167,30 +174,30 @@ public class FluidUtils {
 		GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), (aLocalized == null) ? aName : aLocalized);
 		if (FluidRegistry.registerFluid(rFluid)) {
 			switch (aState) {
-			case 0: {
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(10000);
-				break;
-			}
-			case 1:
-			case 4: {
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(1000);
-				break;
-			}
-			case 2: {
-				rFluid.setGaseous(true);
-				rFluid.setDensity(-100);
-				rFluid.setViscosity(200);
-				break;
-			}
-			case 3: {
-				rFluid.setGaseous(true);
-				rFluid.setDensity(-10000);
-				rFluid.setViscosity(10);
-				rFluid.setLuminosity(15);
-				break;
-			}
+				case 0: {
+					rFluid.setGaseous(false);
+					rFluid.setViscosity(10000);
+					break;
+				}
+				case 1:
+				case 4: {
+					rFluid.setGaseous(false);
+					rFluid.setViscosity(1000);
+					break;
+				}
+				case 2: {
+					rFluid.setGaseous(true);
+					rFluid.setDensity(-100);
+					rFluid.setViscosity(200);
+					break;
+				}
+				case 3: {
+					rFluid.setGaseous(true);
+					rFluid.setDensity(-10000);
+					rFluid.setViscosity(10);
+					rFluid.setLuminosity(15);
+					break;
+				}
 			}
 		}
 		else {
@@ -201,18 +208,18 @@ public class FluidUtils {
 		}
 		if (aMaterial != null) {
 			switch (aState) {
-			case 1: {
-				aMaterial.mFluid = (rFluid);
-				break;
-			}
-			case 2: {
-				aMaterial.mGas = (rFluid);
-				break;
-			}
-			case 3: {
-				aMaterial.mPlasma = (rFluid);
-				break;
-			}
+				case 1: {
+					aMaterial.mFluid = (rFluid);
+					break;
+				}
+				case 2: {
+					aMaterial.mGas = (rFluid);
+					break;
+				}
+				case 3: {
+					aMaterial.mPlasma = (rFluid);
+					break;
+				}
 			}
 		}
 		if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
@@ -234,7 +241,7 @@ public class FluidUtils {
 	}
 
 	public static Fluid addGTPlasma(final Material aMaterial) {
-		if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || aMaterial.getComposites().size()>1 || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){
+		if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || (aMaterial.getComposites().size()>1) || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){
 			return null;
 		}
 		Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell");
@@ -277,30 +284,30 @@ public class FluidUtils {
 		GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), (aLocalized == null) ? aName : aLocalized);
 		if (FluidRegistry.registerFluid(rFluid)) {
 			switch (aState) {
-			case 0: {
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(10000);
-				break;
-			}
-			case 1:
-			case 4: {
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(1000);
-				break;
-			}
-			case 2: {
-				rFluid.setGaseous(true);
-				rFluid.setDensity(-100);
-				rFluid.setViscosity(200);
-				break;
-			}
-			case 3: {
-				rFluid.setGaseous(true);
-				rFluid.setDensity(-10000);
-				rFluid.setViscosity(10);
-				rFluid.setLuminosity(15);
-				break;
-			}
+				case 0: {
+					rFluid.setGaseous(false);
+					rFluid.setViscosity(10000);
+					break;
+				}
+				case 1:
+				case 4: {
+					rFluid.setGaseous(false);
+					rFluid.setViscosity(1000);
+					break;
+				}
+				case 2: {
+					rFluid.setGaseous(true);
+					rFluid.setDensity(-100);
+					rFluid.setViscosity(200);
+					break;
+				}
+				case 3: {
+					rFluid.setGaseous(true);
+					rFluid.setDensity(-10000);
+					rFluid.setViscosity(10);
+					rFluid.setLuminosity(15);
+					break;
+				}
 			}
 		}
 		else {
@@ -435,8 +442,8 @@ public class FluidUtils {
 		Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName);
 		return null;
 	}
-	
-	public final static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, ItemStack dustStack, final ItemStack dustStack2){
+
+	public final static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, final ItemStack dustStack, final ItemStack dustStack2){
 		return generateFluidNonMolten(unlocalizedName, localizedName, MeltingPoint, RGBA, dustStack, dustStack2, 144);
 	}
 
@@ -516,4 +523,13 @@ public class FluidUtils {
 	}
 
 
+	public static FluidStack getMobEssence(final int amount){
+		return EnchantmentUtils.getMobEssence(amount);
+	}
+
+	public static FluidStack getLiquidXP(final int amount){
+		return EnchantmentUtils.getLiquidXP(amount);
+	}
+
+
 }