+ Added Xp Converter crafting recipe.

+ Added compressed obsidian.
+ Added inverted obsidian.
+ Added crafting & uncrafting recipes for the compressed & inverted obsidian.
% Formatting.

2 files changed, 155 insertions, 57 deletions

diff --git a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
new file mode 100644
index 0000000000..48ee7709ec
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -0,0 +1,90 @@
+package gtPlusPlus.core.block.general;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.BlockObsidian;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class BlockCompressedObsidian extends BlockObsidian {
+
+	@SideOnly(Side.CLIENT)
+	private final IIcon textureArray[] = new IIcon[6];
+
+	public BlockCompressedObsidian() {
+		this.setBlockName("blockCompressedObsidian");
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCompressedObsidian");
+	}
+
+	@Override
+	public MapColor getMapColor(final int meta) {
+		if (meta != 5) {
+			return MapColor.obsidianColor;
+		}
+		else {
+			return MapColor.sandColor;
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister iicon) {
+		this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian1");
+		this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian2");
+		this.textureArray[2] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian3");
+		this.textureArray[3] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian4");
+		this.textureArray[4] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian5");
+		this.textureArray[5] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian_invert");
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int side, final int meta) {
+		return this.textureArray[meta];
+	}
+
+	@Override
+	public int damageDropped(final int damage) {
+		return damage;
+	}
+
+	@Override
+	public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) {
+		for (int i = 0; i < 6; i++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+
+	@Override
+	public Item getItemDropped(final int meta, final Random rand, final int fortune) {
+		return Item.getItemFromBlock(this);
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata,
+			final int fortune) {
+		int m = metadata;
+		if (m == 5) {
+			m = 1;
+		}
+		return super.getDrops(world, x, y, z, m, fortune);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index c2afdfd21f..7e1ab75b84 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -50,7 +50,7 @@ public class BlockTankXpConverter extends BlockContainer {
 		GameRegistry.registerBlock(this, ItemBlockEntityBase.class, "blockTankXpConverter");
 		LanguageRegistry.addName(this, "Xp Converter");
 		this.generateRainbowMap();
-		if (!this.getTickRandomly()){
+		if (!this.getTickRandomly()) {
 			this.setTickRandomly(true);
 		}
 	}
@@ -86,44 +86,48 @@ public class BlockTankXpConverter extends BlockContainer {
 		}
 		else {
 			boolean mDidScrewDriver = false;
-			//Check For Screwdriver
+			// Check For Screwdriver
 			try {
 				final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
 				final Item mHandItem = mHandStack.getItem();
-				if (((mHandItem instanceof GT_MetaGenerated_Tool_01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))){
+				if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
+						&& ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
 					final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
-					if (tile != null){
+					if (tile != null) {
 						mDidScrewDriver = true;
 						tile.onScrewdriverRightClick((byte) side, player, x, y, z);
 					}
 
 				}
 			}
-			catch (final Throwable t){
+			catch (final Throwable t) {
 				mDidScrewDriver = false;
 			}
 
-			if (!mDidScrewDriver){
-
+			if (!mDidScrewDriver) {
 
 				try {
 					final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
-					if (tile != null){
+					if (tile != null) {
 						tile.onRightClick((byte) side, player, x, y, z);
 					}
 				}
-				catch (final Throwable t){}
+				catch (final Throwable t) {
+				}
 
 				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 != 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.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 "+EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount())+" levels.");
+					if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)) {
+						PlayerUtils.messagePlayer(player, "This is worth "
+								+ EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()) + " levels.");
 					}
 				}
 			}
@@ -152,42 +156,43 @@ public class BlockTankXpConverter extends BlockContainer {
 	}
 
 	@Override
-	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+			final int z) {
 		return false;
 	}
 
-	private final boolean generateRainbowMap(){
+	private final boolean generateRainbowMap() {
 		int id = 0;
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>( 51, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 255,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 204,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 153,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 102,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,  51,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0,   0));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0,  51));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0, 102));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0, 153));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0, 204));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>( 51,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0,   0, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0,  51, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 102, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 153, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 204, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255, 255));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255, 204));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255, 153));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255, 102));
-		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(  0, 255,  51));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(51, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 255, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 204, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 153, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 102, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 51, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 0));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 51));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 102));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 153));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 204));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(51, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 0, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 51, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 102, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 153, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 204, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 255));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 204));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 153));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 102));
+		this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 51));
 		this.mRainbowTickMax = this.mRainbowMap.size();
 		return true;
 	}
@@ -198,21 +203,24 @@ public class BlockTankXpConverter extends BlockContainer {
 	}
 
 	@Override
-	public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) {
+	public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_,
+			final int p_149720_4_) {
 
-		if ((this.mRainbowTick < 0) || (this.mRainbowTick > this.mRainbowTickMax)){
+		if ((this.mRainbowTick < 0) || (this.mRainbowTick > this.mRainbowTickMax)) {
 			this.mRainbowTick = 0;
 		}
-		//Utils.LOG_INFO("x: "+this.mRainbowTick);
-		if (this.mRainbowTick <= this.mRainbowTickMax){
+		// Utils.LOG_INFO("x: "+this.mRainbowTick);
+		if (this.mRainbowTick <= this.mRainbowTickMax) {
 			Triplet<Integer, Integer, Integer> mT = this.mRainbowMap.get(this.mRainbowTick);
 			try {
 				return Utils.rgbtoHexValue(mT.getValue_1(), mT.getValue_1(), mT.getValue_1());
-			} catch (final Throwable t){
+			}
+			catch (final Throwable t) {
 				try {
-					mT = this.mRainbowMap.get(this.mRainbowTick-1);
+					mT = this.mRainbowMap.get(this.mRainbowTick - 1);
 					return Utils.rgbtoHexValue(mT.getValue_1(), mT.getValue_1(), mT.getValue_1());
-				} catch (final Throwable t1){
+				}
+				catch (final Throwable t1) {
 					return Utils.rgbtoHexValue(0, 0, 0);
 				}
 			}
@@ -223,12 +231,12 @@ public class BlockTankXpConverter extends BlockContainer {
 
 	@Override
 	public void updateTick(final World world, final int x, final int y, final int z, final Random rand) {
-		//this.mRainbowTick++;
+		// this.mRainbowTick++;
 		super.updateTick(world, x, y, z, rand);
 	}
 
 	@Override
-	public void randomDisplayTick(final World world, final int x, final int y, final int z,	final Random rand) {
+	public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random rand) {
 		this.mRainbowTick++;
 		super.randomDisplayTick(world, x, y, z, rand);
 	}