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

+ Added some Enchantment utilities.

2 files changed, 219 insertions, 101 deletions

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);
+	}
+
+
 }