Item reorganization, lithium creation

src/main/java/mekanism/client/ClientProxy.java

@@ -349,7 +349,7 @@ public class ClientProxy extends CommonProxy
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler);
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler);
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler);
-		MinecraftForgeClient.registerItemRenderer(MekanismItems.FrictionBoots, handler);
+		MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler);
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler);
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler);
 		MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler);

src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java

@@ -18,19 +18,20 @@ import mekanism.client.sound.SoundHandler;
 import mekanism.common.Mekanism;
 import mekanism.common.inventory.container.ContainerChemicalCrystallizer;
 import mekanism.common.network.PacketTileEntity.TileEntityMessage;
+import mekanism.common.recipe.machines.CrystallizerRecipe;
 import mekanism.common.tile.TileEntityChemicalCrystallizer;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
-
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 @SideOnly(Side.CLIENT)
 public class GuiChemicalCrystallizer extends GuiMekanism
 {
@@ -100,6 +101,17 @@ public class GuiChemicalCrystallizer extends GuiMekanism
 			{
 				fontRendererObj.drawString("(" + ((OreGas)tileEntity.inputTank.getGas().getGas()).getOreName() + ")", 29, 24, 0x00CD00);
 			}
+			else {
+				CrystallizerRecipe recipe = tileEntity.getRecipe();
+				
+				if(recipe == null)
+				{
+					fontRendererObj.drawString("(No recipe)", 29, 24, 0x00CD00);
+				}
+				else {
+					fontRendererObj.drawString("(" + recipe.recipeOutput.output.getDisplayName() + ")", 29, 24, 0x00CD00);
+				}
+			}
 		}
 
 		if(renderStack != null)

src/main/java/mekanism/common/Mekanism.java

@@ -419,7 +419,7 @@ public class Mekanism
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] {
 			"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
 		}));
-		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FrictionBoots), new Object[] {
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FreeRunners), new Object[] {
 			"C C", "A A", "T T", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem()
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), new Object[] {
@@ -729,6 +729,9 @@ public class Mekanism
 		RecipeHandler.addSolarEvaporationRecipe(FluidRegistry.getFluidStack("water", 40), FluidRegistry.getFluidStack("brine", 1));
 		RecipeHandler.addSolarEvaporationRecipe(FluidRegistry.getFluidStack("brine", 10), FluidRegistry.getFluidStack("lithium", 1));
 		
+		//Chemical Crystallizer Recipes
+		RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new ItemStack(MekanismItems.Dust, 1, 11));
+		
 		//T4 Processing Recipes
 		for(Gas gas : GasRegistry.getRegisteredGasses())
 		{

src/main/java/mekanism/common/MekanismItems.java

@@ -43,50 +43,50 @@ import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
 @ObjectHolder("Mekanism")
 public class MekanismItems
 {
-	public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow");
 	public static final Item EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy");
 	public static final Item ReinforcedAlloy = new ItemMekanism().setUnlocalizedName("ReinforcedAlloy");
 	public static final Item AtomicAlloy = new ItemMekanism().setUnlocalizedName("AtomicAlloy");
-	public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet");
+	public static final Item TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore");
-	public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade");
+	public static final Item ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore");
-	public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade");
+	public static final Item Substrate = new ItemMekanism().setUnlocalizedName("Substrate");
-	public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER).setUnlocalizedName("FilterUpgrade");
+	public static final Item Polyethene = new ItemHDPE().setUnlocalizedName("HDPE");
-	public static final ItemRobit Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit");
+	public static final Item BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel");
-	public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler");
+	public static final Item ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy");
 	public static final Item EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron");
 	public static final Item CompressedCarbon = new ItemMekanism().setUnlocalizedName("CompressedCarbon");
 	public static final Item CompressedRedstone = new ItemMekanism().setUnlocalizedName("CompressedRedstone");
 	public static final Item CompressedDiamond = new ItemMekanism().setUnlocalizedName("CompressedDiamond");
 	public static final Item CompressedObsidian = new ItemMekanism().setUnlocalizedName("CompressedObsidian");
+	public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket");
+	public static final Item LithiumBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("LithiumBucket");
+	public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade");
+	public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade");
+	public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER).setUnlocalizedName("FilterUpgrade");
+	public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet");
+	public static final ItemRobit Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit");
+	public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler");
 	public static final Item PortableTeleporter = new ItemPortableTeleporter().setUnlocalizedName("PortableTeleporter");
-	public static final Item TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore");
 	public static final Item Configurator = new ItemConfigurator().setUnlocalizedName("Configurator");
 	public static final Item NetworkReader = new ItemNetworkReader().setUnlocalizedName("NetworkReader");
 	public static final Item WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie");
-	public static final Item ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy");
+	public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow");
+	public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower");
+	public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader");
+	public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary");
+	public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard");
 	public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter");
 	public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel");
-	public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack");
 	public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank");
 	public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask");
-	public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower");
+	public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack");
-	public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary");
-	public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon");
-	public static final Item ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore");
-	public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust");
-	public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt");
-	public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket");
-	public static final Item LithiumBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("LithiumBucket");
-	public static final Item FrictionBoots = new ItemFreeRunners().setUnlocalizedName("FreeRunners");
 	public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
-	public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard");
+	public static final Item FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners");
-	public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader");
+	public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon");
-	public static final Item Substrate = new ItemMekanism().setUnlocalizedName("Substrate");
-	public static final Item Polyethene = new ItemHDPE().setUnlocalizedName("HDPE");
-	public static final Item BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel");
 
 	//Multi-ID Items
 	public static final Item Dust = new ItemDust();
+	public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust");
+	public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt");
 	public static final Item Ingot = new ItemIngot();
 	public static final Item Clump = new ItemClump();
 	public static final Item DirtyDust = new ItemDirtyDust();
@@ -106,7 +106,7 @@ public class MekanismItems
 		GameRegistry.registerItem(EnergyTablet, "EnergyTablet");
 		GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
 		GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
-		GameRegistry.registerItem(FilterUpgrade, "HeavyWaterUpgrade");
+		GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade");
 		GameRegistry.registerItem(Robit, "Robit");
 		GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
 		GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
@@ -138,7 +138,7 @@ public class MekanismItems
 		GameRegistry.registerItem(BrineBucket, "BrineBucket");
 		GameRegistry.registerItem(LithiumBucket, "LithiumBucket");
 		GameRegistry.registerItem(Crystal, "Crystal");
-		GameRegistry.registerItem(FrictionBoots, "FrictionBoots");
+		GameRegistry.registerItem(FreeRunners, "FrictionBoots");
 		GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack");
 		GameRegistry.registerItem(FilterCard, "FilterCard");
 		GameRegistry.registerItem(SeismicReader, "SeismicReader");
@@ -152,6 +152,6 @@ public class MekanismItems
 		FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET);
 
 		MinecraftForge.EVENT_BUS.register(GasMask);
-		MinecraftForge.EVENT_BUS.register(FrictionBoots);
+		MinecraftForge.EVENT_BUS.register(FreeRunners);
 	}
 }

src/main/java/mekanism/common/integration/OreDictManager.java

@@ -470,6 +470,11 @@ public final class OreDictManager
 			RecipeHandler.addCrusherRecipe(new ItemStack(Items.dye, 1, 4), MekanismUtils.size(ore, 1));
 		}
 		
+		for(ItemStack ore : OreDictionary.getOres("dustLithium"))
+		{
+			RecipeHandler.addChemicalOxidizerRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("lithium"), 100));
+		}
+		
 		for(ItemStack ore : OreDictionary.getOres("dustObsidian"))
 		{
 			RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 4), new ItemStack(Blocks.obsidian));