Rename the mod..

build.gradle

@@ -13,8 +13,8 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 version = "0.3"
-group = "storagecraft"
-archivesBaseName = "storagecraft"
+group = "refinedstorage"
+archivesBaseName = "refinedstorage"
 
 minecraft {
     version = "1.9-12.16.0.1770-1.9"

src/main/java/refinedstorage/RefinedStorage.java

@@ -1,4 +1,4 @@
-package storagecraft;
+package refinedstorage;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -12,13 +12,13 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import storagecraft.item.ItemStorageCell;
-import storagecraft.proxy.CommonProxy;
+import refinedstorage.item.ItemStorageCell;
+import refinedstorage.proxy.CommonProxy;
 
-@Mod(modid = StorageCraft.ID, version = StorageCraft.VERSION)
-public final class StorageCraft
+@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
+public final class RefinedStorage
 {
-	public static final String ID = "storagecraft";
+	public static final String ID = "refinedstorage";
 	public static final String VERSION = "0.3";
 
 	public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
@@ -28,7 +28,7 @@ public final class StorageCraft
 		@Override
 		public ItemStack getIconItemStack()
 		{
-			return new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K);
+			return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K);
 		}
 
 		@Override
@@ -38,11 +38,11 @@ public final class StorageCraft
 		}
 	};
 
-	@SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy")
+	@SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
 	public static CommonProxy PROXY;
 
 	@Instance
-	public static StorageCraft INSTANCE;
+	public static RefinedStorage INSTANCE;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent e)

src/main/java/refinedstorage/RefinedStorageBlocks.java

@@ -1,8 +1,8 @@
-package storagecraft;
+package refinedstorage;
 
-import storagecraft.block.*;
+import refinedstorage.block.*;
 
-public final class StorageCraftBlocks
+public final class RefinedStorageBlocks
 {
 	public static final BlockController CONTROLLER = new BlockController();
 	public static final BlockCable CABLE = new BlockCable();

src/main/java/refinedstorage/RefinedStorageGui.java

@@ -1,6 +1,6 @@
-package storagecraft;
+package refinedstorage;
 
-public final class StorageCraftGUI
+public final class RefinedStorageGui
 {
 	public static final int CONTROLLER = 0;
 	public static final int GRID = 1;

src/main/java/refinedstorage/RefinedStorageItems.java

@@ -1,8 +1,8 @@
-package storagecraft;
+package refinedstorage;
 
-import storagecraft.item.*;
+import refinedstorage.item.*;
 
-public final class StorageCraftItems
+public final class RefinedStorageItems
 {
 	public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell();
 	public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid();

src/main/java/refinedstorage/block/BlockBase.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
@@ -14,9 +14,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.tile.TileBase;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.RefinedStorage;
+import refinedstorage.tile.TileBase;
+import refinedstorage.util.InventoryUtils;
 
 public abstract class BlockBase extends Block
 {
@@ -31,13 +31,13 @@ public abstract class BlockBase extends Block
 		this.name = name;
 
 		setHardness(0.6F);
-		setCreativeTab(StorageCraft.TAB);
+		setCreativeTab(RefinedStorage.TAB);
 	}
 
 	@Override
 	public String getUnlocalizedName()
 	{
-		return "block." + StorageCraft.ID + ":" + name;
+		return "block." + RefinedStorage.ID + ":" + name;
 	}
 
 	@Override

src/main/java/refinedstorage/block/BlockCable.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -9,7 +9,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.tile.TileCable;
+import refinedstorage.tile.TileCable;
 
 public class BlockCable extends BlockBase
 {

src/main/java/refinedstorage/block/BlockConstructor.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileConstructor;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileConstructor;
 
 public class BlockConstructor extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockConstructor extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockController.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import java.util.List;
 import net.minecraft.block.properties.IProperty;
@@ -16,9 +16,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileController;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileController;
 
 public class BlockController extends BlockBase
 {
@@ -86,7 +86,7 @@ public class BlockController extends BlockBase
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockDestructor.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileDestructor;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileDestructor;
 
 public class BlockDestructor extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockDestructor extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockDetector.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -12,9 +12,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileDetector;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileDetector;
 
 public class BlockDetector extends BlockMachine
 {
@@ -79,7 +79,7 @@ public class BlockDetector extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockDrive.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileDrive;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileDrive;
 
 public class BlockDrive extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockDrive extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DRIVE, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockExporter.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileExporter;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileExporter;
 
 public class BlockExporter extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockExporter extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockExternalStorage.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileExternalStorage;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileExternalStorage;
 
 public class BlockExternalStorage extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockExternalStorage extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockGrid.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import java.util.List;
 import net.minecraft.block.properties.IProperty;
@@ -14,9 +14,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileGrid;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileGrid;
 
 public class BlockGrid extends BlockMachine
 {
@@ -70,7 +70,7 @@ public class BlockGrid extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockImporter.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileImporter;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileImporter;
 
 public class BlockImporter extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockImporter extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockMachine.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -6,7 +6,7 @@ import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import storagecraft.tile.TileMachine;
+import refinedstorage.tile.TileMachine;
 
 public abstract class BlockMachine extends BlockBase
 {

src/main/java/refinedstorage/block/BlockMachineCasing.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 public class BlockMachineCasing extends BlockBase
 {

src/main/java/refinedstorage/block/BlockSolderer.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileSolderer;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileSolderer;
 
 public class BlockSolderer extends BlockMachine
 {
@@ -29,7 +29,7 @@ public class BlockSolderer extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/BlockStorage.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,11 +18,11 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftBlocks;
-import storagecraft.StorageCraftGUI;
-import storagecraft.item.ItemBlockStorage;
-import storagecraft.tile.TileStorage;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.item.ItemBlockStorage;
+import refinedstorage.tile.TileStorage;
 
 public class BlockStorage extends BlockMachine
 {
@@ -76,7 +76,7 @@ public class BlockStorage extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;
@@ -100,7 +100,7 @@ public class BlockStorage extends BlockMachine
 	{
 		List<ItemStack> drops = new ArrayList<ItemStack>();
 
-		ItemStack stack = new ItemStack(StorageCraftBlocks.STORAGE, 1, StorageCraftBlocks.STORAGE.getMetaFromState(state));
+		ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state));
 
 		NBTTagCompound tag = new NBTTagCompound();
 

src/main/java/refinedstorage/block/BlockWirelessTransmitter.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -12,9 +12,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.tile.TileWirelessTransmitter;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.tile.TileWirelessTransmitter;
 
 public class BlockWirelessTransmitter extends BlockMachine
 {
@@ -54,7 +54,7 @@ public class BlockWirelessTransmitter extends BlockMachine
 	{
 		if (!world.isRemote)
 		{
-			player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
+			player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
 		}
 
 		return true;

src/main/java/refinedstorage/block/EnumControllerType.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.util.IStringSerializable;
 

src/main/java/refinedstorage/block/EnumGridType.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.util.IStringSerializable;
 

src/main/java/refinedstorage/block/EnumStorageType.java

@@ -1,4 +1,4 @@
-package storagecraft.block;
+package refinedstorage.block;
 
 import net.minecraft.util.IStringSerializable;
 

src/main/java/refinedstorage/container/ContainerBase.java

@@ -1,4 +1,4 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,8 +7,8 @@ import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import storagecraft.container.slot.SlotDisabled;
-import storagecraft.container.slot.SlotSpecimen;
+import refinedstorage.container.slot.SlotDisabled;
+import refinedstorage.container.slot.SlotSpecimen;
 
 public abstract class ContainerBase extends Container
 {

src/main/java/refinedstorage/container/ContainerConstructor.java

@@ -1,11 +1,11 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import storagecraft.container.slot.SlotSpecimen;
-import storagecraft.tile.TileConstructor;
+import refinedstorage.container.slot.SlotSpecimen;
+import refinedstorage.tile.TileConstructor;
 
 public class ContainerConstructor extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerController.java

@@ -1,4 +1,4 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 

src/main/java/refinedstorage/container/ContainerDestructor.java

@@ -1,4 +1,4 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 

src/main/java/refinedstorage/container/ContainerDetector.java

@@ -1,8 +1,8 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import storagecraft.container.slot.SlotSpecimen;
-import storagecraft.tile.TileDetector;
+import refinedstorage.container.slot.SlotSpecimen;
+import refinedstorage.tile.TileDetector;
 
 public class ContainerDetector extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerDrive.java

@@ -1,12 +1,12 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import storagecraft.StorageCraftItems;
-import storagecraft.container.slot.BasicItemValidator;
-import storagecraft.container.slot.SlotFiltered;
-import storagecraft.tile.TileDrive;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.container.slot.BasicItemValidator;
+import refinedstorage.container.slot.SlotFiltered;
+import refinedstorage.tile.TileDrive;
 
 public class ContainerDrive extends ContainerBase
 {
@@ -19,7 +19,7 @@ public class ContainerDrive extends ContainerBase
 
 		for (int i = 0; i < 8; ++i)
 		{
-			addSlotToContainer(new SlotFiltered(drive, i, x, y, new BasicItemValidator(StorageCraftItems.STORAGE_CELL)));
+			addSlotToContainer(new SlotFiltered(drive, i, x, y, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL)));
 
 			if ((i + 1) % 2 == 0)
 			{

src/main/java/refinedstorage/container/ContainerExporter.java

@@ -1,8 +1,8 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import storagecraft.container.slot.SlotSpecimen;
-import storagecraft.tile.TileExporter;
+import refinedstorage.container.slot.SlotSpecimen;
+import refinedstorage.tile.TileExporter;
 
 public class ContainerExporter extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerGrid.java

@@ -1,10 +1,10 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
-import storagecraft.block.EnumGridType;
-import storagecraft.container.slot.SlotGridCraftingResult;
-import storagecraft.tile.TileGrid;
+import refinedstorage.block.EnumGridType;
+import refinedstorage.container.slot.SlotGridCraftingResult;
+import refinedstorage.tile.TileGrid;
 
 public class ContainerGrid extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerImporter.java

@@ -1,8 +1,8 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import storagecraft.container.slot.SlotSpecimen;
-import storagecraft.tile.TileImporter;
+import refinedstorage.container.slot.SlotSpecimen;
+import refinedstorage.tile.TileImporter;
 
 public class ContainerImporter extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerSolderer.java

@@ -1,10 +1,10 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import storagecraft.container.slot.SlotOutput;
-import storagecraft.tile.TileSolderer;
+import refinedstorage.container.slot.SlotOutput;
+import refinedstorage.tile.TileSolderer;
 
 public class ContainerSolderer extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerStorage.java

@@ -1,8 +1,8 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-import storagecraft.container.slot.SlotSpecimen;
+import refinedstorage.container.slot.SlotSpecimen;
 
 public class ContainerStorage extends ContainerBase
 {

src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java

@@ -1,14 +1,14 @@
-package storagecraft.container;
+package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import storagecraft.StorageCraftItems;
-import storagecraft.container.slot.BasicItemValidator;
-import storagecraft.container.slot.SlotFiltered;
-import storagecraft.container.slot.SlotOutput;
-import storagecraft.tile.TileWirelessTransmitter;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.container.slot.BasicItemValidator;
+import refinedstorage.container.slot.SlotFiltered;
+import refinedstorage.container.slot.SlotOutput;
+import refinedstorage.tile.TileWirelessTransmitter;
 
 public class ContainerWirelessTransmitter extends ContainerBase
 {
@@ -17,7 +17,7 @@ public class ContainerWirelessTransmitter extends ContainerBase
 		super(player);
 
 		addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl)));
-		addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(StorageCraftItems.WIRELESS_GRID)));
+		addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID)));
 		addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 20));
 
 		addPlayerInventory(8, 55);

src/main/java/refinedstorage/container/slot/BasicItemValidator.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/refinedstorage/container/slot/IItemValidator.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/refinedstorage/container/slot/SlotDisabled.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/refinedstorage/container/slot/SlotFiltered.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java

@@ -1,11 +1,11 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
-import storagecraft.tile.TileGrid;
+import refinedstorage.tile.TileGrid;
 
 public class SlotGridCraftingResult extends SlotCrafting
 {

src/main/java/refinedstorage/container/slot/SlotOutput.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/refinedstorage/container/slot/SlotSpecimen.java

@@ -1,4 +1,4 @@
-package storagecraft.container.slot;
+package refinedstorage.container.slot;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

src/main/java/refinedstorage/gui/GuiBase.java

@@ -1,4 +1,4 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.translation.I18n;
 import org.lwjgl.opengl.GL11;
-import storagecraft.StorageCraft;
-import storagecraft.gui.sidebutton.SideButton;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.sidebutton.SideButton;
 
 public abstract class GuiBase extends GuiContainer
 {
@@ -146,7 +146,7 @@ public abstract class GuiBase extends GuiContainer
 
 	public void bindTexture(String file)
 	{
-		bindTexture(StorageCraft.ID, file);
+		bindTexture(RefinedStorage.ID, file);
 	}
 
 	public void bindTexture(String base, String file)

src/main/java/refinedstorage/gui/GuiConstructor.java

@@ -1,10 +1,10 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
-import storagecraft.container.ContainerConstructor;
-import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileConstructor;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.container.ContainerConstructor;
+import refinedstorage.gui.sidebutton.SideButtonCompare;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileConstructor;
+import refinedstorage.util.InventoryUtils;
 
 public class GuiConstructor extends GuiBase
 {
@@ -42,7 +42,7 @@ public class GuiConstructor extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:constructor"));
+		drawString(7, 7, t("gui.refinedstorage:constructor"));
 		drawString(7, 43, t("container.inventory"));
 	}
 }

src/main/java/refinedstorage/gui/GuiController.java

@@ -1,8 +1,8 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
-import storagecraft.container.ContainerController;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileController;
+import refinedstorage.container.ContainerController;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileController;
 
 public class GuiController extends GuiBase
 {
@@ -46,14 +46,14 @@ public class GuiController extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:controller." + controller.getType().getId()));
+		drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId()));
 		drawString(7, 87, t("container.inventory"));
 
-		drawString(31, 20, t("misc.storagecraft:energy_usage", controller.getEnergyUsage()));
+		drawString(31, 20, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()));
 
 		if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY))
 		{
-			drawTooltip(mouseX, mouseY, t("misc.storagecraft:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
+			drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
 		}
 	}
 }

src/main/java/refinedstorage/gui/GuiDestructor.java

@@ -1,8 +1,8 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
-import storagecraft.container.ContainerDestructor;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileDestructor;
+import refinedstorage.container.ContainerDestructor;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileDestructor;
 
 public class GuiDestructor extends GuiBase
 {
@@ -37,7 +37,7 @@ public class GuiDestructor extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:destructor"));
+		drawString(7, 7, t("gui.refinedstorage:destructor"));
 		drawString(7, 39, t("container.inventory"));
 	}
 }

src/main/java/refinedstorage/gui/GuiDetector.java

@@ -1,15 +1,15 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import com.google.common.primitives.Ints;
 import java.io.IOException;
 import net.minecraft.client.gui.GuiTextField;
-import storagecraft.StorageCraft;
-import storagecraft.container.ContainerDetector;
-import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonDetectorMode;
-import storagecraft.network.MessageDetectorAmountUpdate;
-import storagecraft.tile.TileDetector;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.RefinedStorage;
+import refinedstorage.container.ContainerDetector;
+import refinedstorage.gui.sidebutton.SideButtonCompare;
+import refinedstorage.gui.sidebutton.SideButtonDetectorMode;
+import refinedstorage.network.MessageDetectorAmountUpdate;
+import refinedstorage.tile.TileDetector;
+import refinedstorage.util.InventoryUtils;
 
 public class GuiDetector extends GuiBase
 {
@@ -59,7 +59,7 @@ public class GuiDetector extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:detector"));
+		drawString(7, 7, t("gui.refinedstorage:detector"));
 		drawString(7, 43, t("container.inventory"));
 	}
 
@@ -72,7 +72,7 @@ public class GuiDetector extends GuiBase
 
 			if (result != null)
 			{
-				StorageCraft.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result));
+				RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result));
 			}
 		}
 		else

src/main/java/refinedstorage/gui/GuiDrive.java

@@ -1,13 +1,13 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import com.google.common.primitives.Ints;
 import java.io.IOException;
 import net.minecraft.client.gui.GuiTextField;
-import storagecraft.StorageCraft;
-import storagecraft.container.ContainerDrive;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.network.MessagePriorityUpdate;
-import storagecraft.tile.TileDrive;
+import refinedstorage.RefinedStorage;
+import refinedstorage.container.ContainerDrive;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.network.MessagePriorityUpdate;
+import refinedstorage.tile.TileDrive;
 
 public class GuiDrive extends GuiBase
 {
@@ -54,8 +54,8 @@ public class GuiDrive extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:drive"));
-		drawString(51, 20, t("misc.storagecraft:priority"));
+		drawString(7, 7, t("gui.refinedstorage:drive"));
+		drawString(51, 20, t("misc.refinedstorage:priority"));
 		drawString(7, 96, t("container.inventory"));
 	}
 
@@ -68,7 +68,7 @@ public class GuiDrive extends GuiBase
 
 			if (result != null)
 			{
-				StorageCraft.NETWORK.sendToServer(new MessagePriorityUpdate(drive.getPos(), result));
+				RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(drive.getPos(), result));
 			}
 		}
 		else

src/main/java/refinedstorage/gui/GuiExporter.java

@@ -1,10 +1,10 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
-import storagecraft.container.ContainerExporter;
-import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileExporter;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.container.ContainerExporter;
+import refinedstorage.gui.sidebutton.SideButtonCompare;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileExporter;
+import refinedstorage.util.InventoryUtils;
 
 public class GuiExporter extends GuiBase
 {
@@ -42,7 +42,7 @@ public class GuiExporter extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:exporter"));
+		drawString(7, 7, t("gui.refinedstorage:exporter"));
 		drawString(7, 43, t("container.inventory"));
 	}
 }

src/main/java/refinedstorage/gui/GuiGrid.java

@@ -1,4 +1,4 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -14,18 +14,18 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
-import storagecraft.StorageCraft;
-import storagecraft.block.EnumGridType;
-import storagecraft.container.ContainerGrid;
-import storagecraft.gui.sidebutton.SideButtonGridSortingDirection;
-import storagecraft.gui.sidebutton.SideButtonGridSortingType;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.network.MessageGridCraftingClear;
-import storagecraft.network.MessageStoragePull;
-import storagecraft.network.MessageStoragePush;
-import storagecraft.storage.StorageItem;
-import storagecraft.tile.TileController;
-import storagecraft.tile.TileGrid;
+import refinedstorage.RefinedStorage;
+import refinedstorage.block.EnumGridType;
+import refinedstorage.container.ContainerGrid;
+import refinedstorage.gui.sidebutton.SideButtonGridSortingDirection;
+import refinedstorage.gui.sidebutton.SideButtonGridSortingType;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.network.MessageGridCraftingClear;
+import refinedstorage.network.MessageStoragePull;
+import refinedstorage.network.MessageStoragePush;
+import refinedstorage.storage.StorageItem;
+import refinedstorage.tile.TileController;
+import refinedstorage.tile.TileGrid;
 
 public class GuiGrid extends GuiBase
 {
@@ -143,7 +143,7 @@ public class GuiGrid extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:grid"));
+		drawString(7, 7, t("gui.refinedstorage:grid"));
 
 		if (grid.getType() == EnumGridType.CRAFTING)
 		{
@@ -212,7 +212,7 @@ public class GuiGrid extends GuiBase
 
 		if (isHoveringOverClear(mouseX, mouseY))
 		{
-			drawTooltip(mouseX, mouseY, t("misc.storagecraft:clear"));
+			drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear"));
 		}
 	}
 
@@ -297,7 +297,7 @@ public class GuiGrid extends GuiBase
 
 			if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null)
 			{
-				StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1));
+				RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1));
 			}
 			else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null)
 			{
@@ -305,11 +305,11 @@ public class GuiGrid extends GuiBase
 				boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT);
 				boolean one = clickedButton == 2;
 
-				StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift));
+				RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift));
 			}
 			else if (clickedClear)
 			{
-				StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
+				RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
 			}
 			else
 			{
@@ -319,7 +319,7 @@ public class GuiGrid extends GuiBase
 					{
 						if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
 						{
-							StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1));
+							RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1));
 						}
 					}
 				}

src/main/java/refinedstorage/gui/GuiHandler.java

@@ -1,4 +1,4 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -6,10 +6,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.IGuiHandler;
-import storagecraft.StorageCraftGUI;
-import storagecraft.container.*;
-import storagecraft.storage.IStorageGui;
-import storagecraft.tile.*;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.container.*;
+import refinedstorage.storage.IStorageGui;
+import refinedstorage.tile.*;
 
 public class GuiHandler implements IGuiHandler
 {
@@ -17,27 +17,27 @@ public class GuiHandler implements IGuiHandler
 	{
 		switch (ID)
 		{
-			case StorageCraftGUI.CONTROLLER:
+			case RefinedStorageGui.CONTROLLER:
 				return new ContainerController(player);
-			case StorageCraftGUI.GRID:
+			case RefinedStorageGui.GRID:
 				return new ContainerGrid(player, (TileGrid) tile);
-			case StorageCraftGUI.DRIVE:
+			case RefinedStorageGui.DRIVE:
 				return new ContainerDrive(player, (TileDrive) tile);
-			case StorageCraftGUI.IMPORTER:
+			case RefinedStorageGui.IMPORTER:
 				return new ContainerImporter(player, (TileImporter) tile);
-			case StorageCraftGUI.EXPORTER:
+			case RefinedStorageGui.EXPORTER:
 				return new ContainerExporter(player, (TileExporter) tile);
-			case StorageCraftGUI.DETECTOR:
+			case RefinedStorageGui.DETECTOR:
 				return new ContainerDetector(player, (TileDetector) tile);
-			case StorageCraftGUI.SOLDERER:
+			case RefinedStorageGui.SOLDERER:
 				return new ContainerSolderer(player, (TileSolderer) tile);
-			case StorageCraftGUI.WIRELESS_TRANSMITTER:
+			case RefinedStorageGui.WIRELESS_TRANSMITTER:
 				return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile);
-			case StorageCraftGUI.DESTRUCTOR:
+			case RefinedStorageGui.DESTRUCTOR:
 				return new ContainerDestructor(player);
-			case StorageCraftGUI.CONSTRUCTOR:
+			case RefinedStorageGui.CONSTRUCTOR:
 				return new ContainerConstructor(player, (TileConstructor) tile);
-			case StorageCraftGUI.STORAGE:
+			case RefinedStorageGui.STORAGE:
 				return new ContainerStorage(player, ((IStorageGui) tile).getInventory());
 			default:
 				return null;
@@ -57,27 +57,27 @@ public class GuiHandler implements IGuiHandler
 
 		switch (ID)
 		{
-			case StorageCraftGUI.CONTROLLER:
+			case RefinedStorageGui.CONTROLLER:
 				return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile);
-			case StorageCraftGUI.GRID:
+			case RefinedStorageGui.GRID:
 				return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile);
-			case StorageCraftGUI.DRIVE:
+			case RefinedStorageGui.DRIVE:
 				return new GuiDrive((ContainerDrive) getContainer(ID, player, tile), (TileDrive) tile);
-			case StorageCraftGUI.IMPORTER:
+			case RefinedStorageGui.IMPORTER:
 				return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile);
-			case StorageCraftGUI.EXPORTER:
+			case RefinedStorageGui.EXPORTER:
 				return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile);
-			case StorageCraftGUI.DETECTOR:
+			case RefinedStorageGui.DETECTOR:
 				return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile);
-			case StorageCraftGUI.SOLDERER:
+			case RefinedStorageGui.SOLDERER:
 				return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile);
-			case StorageCraftGUI.WIRELESS_TRANSMITTER:
+			case RefinedStorageGui.WIRELESS_TRANSMITTER:
 				return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile);
-			case StorageCraftGUI.DESTRUCTOR:
+			case RefinedStorageGui.DESTRUCTOR:
 				return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile);
-			case StorageCraftGUI.CONSTRUCTOR:
+			case RefinedStorageGui.CONSTRUCTOR:
 				return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile);
-			case StorageCraftGUI.STORAGE:
+			case RefinedStorageGui.STORAGE:
 				return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile);
 			default:
 				return null;

src/main/java/refinedstorage/gui/GuiImporter.java

@@ -1,11 +1,11 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
-import storagecraft.container.ContainerImporter;
-import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonMode;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileImporter;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.container.ContainerImporter;
+import refinedstorage.gui.sidebutton.SideButtonCompare;
+import refinedstorage.gui.sidebutton.SideButtonMode;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileImporter;
+import refinedstorage.util.InventoryUtils;
 
 public class GuiImporter extends GuiBase
 {
@@ -45,7 +45,7 @@ public class GuiImporter extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:importer"));
+		drawString(7, 7, t("gui.refinedstorage:importer"));
 		drawString(7, 43, t("container.inventory"));
 	}
 }

src/main/java/refinedstorage/gui/GuiSolderer.java

@@ -1,8 +1,8 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import net.minecraft.inventory.Container;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileSolderer;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileSolderer;
 
 public class GuiSolderer extends GuiBase
 {
@@ -42,7 +42,7 @@ public class GuiSolderer extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:solderer"));
+		drawString(7, 7, t("gui.refinedstorage:solderer"));
 		drawString(7, 82, t("container.inventory"));
 	}
 }

src/main/java/refinedstorage/gui/GuiStorage.java

@@ -1,14 +1,14 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import com.google.common.primitives.Ints;
 import java.io.IOException;
 import net.minecraft.client.gui.GuiTextField;
-import storagecraft.container.ContainerStorage;
-import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonMode;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.storage.IStorageGui;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.container.ContainerStorage;
+import refinedstorage.gui.sidebutton.SideButtonCompare;
+import refinedstorage.gui.sidebutton.SideButtonMode;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.storage.IStorageGui;
+import refinedstorage.util.InventoryUtils;
 
 public class GuiStorage extends GuiBase
 {
@@ -79,20 +79,20 @@ public class GuiStorage extends GuiBase
 	public void drawForeground(int mouseX, int mouseY)
 	{
 		drawString(7, 7, t(gui.getName()));
-		drawString(7, 42, t("misc.storagecraft:storage"));
-		drawString(115, 42, t("misc.storagecraft:priority"));
+		drawString(7, 42, t("misc.refinedstorage:storage"));
+		drawString(115, 42, t("misc.refinedstorage:priority"));
 		drawString(7, 117, t("container.inventory"));
 
-		drawString(30, 54, t("misc.storagecraft:storage.stored", gui.getStored()));
+		drawString(30, 54, t("misc.refinedstorage:storage.stored", gui.getStored()));
 
 		if (gui.getCapacity() != -1)
 		{
-			drawString(30, 64, t("misc.storagecraft:storage.capacity", gui.getCapacity()));
+			drawString(30, 64, t("misc.refinedstorage:storage.capacity", gui.getCapacity()));
 		}
 
 		if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY))
 		{
-			drawTooltip(mouseX, mouseY, t("misc.storagecraft:storage.full", (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f)));
+			drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f)));
 		}
 	}
 

src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java

@@ -1,8 +1,8 @@
-package storagecraft.gui;
+package refinedstorage.gui;
 
 import net.minecraft.inventory.Container;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
-import storagecraft.tile.TileWirelessTransmitter;
+import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
+import refinedstorage.tile.TileWirelessTransmitter;
 
 public class GuiWirelessTransmitter extends GuiBase
 {
@@ -44,7 +44,7 @@ public class GuiWirelessTransmitter extends GuiBase
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
-		drawString(7, 7, t("gui.storagecraft:wireless_transmitter"));
+		drawString(7, 7, t("gui.refinedstorage:wireless_transmitter"));
 		drawString(7, 43, t("container.inventory"));
 
 		if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking())

src/main/java/refinedstorage/gui/sidebutton/SideButton.java

@@ -1,6 +1,6 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
-import storagecraft.gui.GuiBase;
+import refinedstorage.gui.GuiBase;
 
 public abstract class SideButton
 {

src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java

@@ -1,11 +1,11 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageCompareUpdate;
-import storagecraft.tile.settings.ICompareSetting;
-import storagecraft.util.InventoryUtils;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageCompareUpdate;
+import refinedstorage.tile.settings.ICompareSetting;
+import refinedstorage.util.InventoryUtils;
 
 public class SideButtonCompare extends SideButton
 {
@@ -23,15 +23,15 @@ public class SideButtonCompare extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:compare." + mask)).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n");
 
 		if ((setting.getCompare() & mask) == mask)
 		{
-			builder.append(gui.t("misc.storagecraft:yes"));
+			builder.append(gui.t("misc.refinedstorage:yes"));
 		}
 		else
 		{
-			builder.append(gui.t("misc.storagecraft:no"));
+			builder.append(gui.t("misc.refinedstorage:no"));
 		}
 
 		return builder.toString();
@@ -61,6 +61,6 @@ public class SideButtonCompare extends SideButton
 	@Override
 	public void actionPerformed()
 	{
-		StorageCraft.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask));
+		RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask));
 	}
 }

src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java

@@ -1,12 +1,12 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageDetectorModeUpdate;
-import storagecraft.tile.TileDetector;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageDetectorModeUpdate;
+import refinedstorage.tile.TileDetector;
 
 public class SideButtonDetectorMode extends SideButton
 {
@@ -22,9 +22,9 @@ public class SideButtonDetectorMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:detector.mode")).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n");
 
-		builder.append(gui.t("sidebutton.storagecraft:detector.mode." + detector.getMode()));
+		builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode()));
 
 		return builder.toString();
 	}
@@ -38,6 +38,6 @@ public class SideButtonDetectorMode extends SideButton
 	@Override
 	public void actionPerformed()
 	{
-		StorageCraft.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector));
+		RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector));
 	}
 }

src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java

@@ -1,10 +1,10 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageGridSortingUpdate;
-import storagecraft.tile.TileGrid;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageGridSortingUpdate;
+import refinedstorage.tile.TileGrid;
 
 public class SideButtonGridSortingDirection extends SideButton
 {
@@ -20,9 +20,9 @@ public class SideButtonGridSortingDirection extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.direction")).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n");
 
-		builder.append(gui.t("sidebutton.storagecraft:sorting.direction." + grid.getSortingDirection()));
+		builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection()));
 
 		return builder.toString();
 	}
@@ -48,6 +48,6 @@ public class SideButtonGridSortingDirection extends SideButton
 			dir = TileGrid.SORTING_DIRECTION_ASCENDING;
 		}
 
-		StorageCraft.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType()));
+		RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType()));
 	}
 }

src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java

@@ -1,10 +1,10 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageGridSortingUpdate;
-import storagecraft.tile.TileGrid;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageGridSortingUpdate;
+import refinedstorage.tile.TileGrid;
 
 public class SideButtonGridSortingType extends SideButton
 {
@@ -20,9 +20,9 @@ public class SideButtonGridSortingType extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.type")).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n");
 
-		builder.append(gui.t("sidebutton.storagecraft:sorting.type." + grid.getSortingType()));
+		builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType()));
 
 		return builder.toString();
 	}
@@ -48,6 +48,6 @@ public class SideButtonGridSortingType extends SideButton
 			type = TileGrid.SORTING_TYPE_QUANTITY;
 		}
 
-		StorageCraft.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type));
+		RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type));
 	}
 }

src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java

@@ -1,10 +1,10 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageModeToggle;
-import storagecraft.tile.settings.IModeSetting;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageModeToggle;
+import refinedstorage.tile.settings.IModeSetting;
 
 public class SideButtonMode extends SideButton
 {
@@ -20,9 +20,9 @@ public class SideButtonMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:mode")).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n");
 
-		builder.append(gui.t("sidebutton.storagecraft:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist")));
+		builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist")));
 
 		return builder.toString();
 	}
@@ -49,6 +49,6 @@ public class SideButtonMode extends SideButton
 	@Override
 	public void actionPerformed()
 	{
-		StorageCraft.NETWORK.sendToServer(new MessageModeToggle(mode));
+		RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode));
 	}
 }

src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java

@@ -1,10 +1,10 @@
-package storagecraft.gui.sidebutton;
+package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import storagecraft.StorageCraft;
-import storagecraft.gui.GuiBase;
-import storagecraft.network.MessageRedstoneModeUpdate;
-import storagecraft.tile.settings.IRedstoneModeSetting;
+import refinedstorage.RefinedStorage;
+import refinedstorage.gui.GuiBase;
+import refinedstorage.network.MessageRedstoneModeUpdate;
+import refinedstorage.tile.settings.IRedstoneModeSetting;
 
 public class SideButtonRedstoneMode extends SideButton
 {
@@ -20,9 +20,9 @@ public class SideButtonRedstoneMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(TextFormatting.RED).append(gui.t("sidebutton.storagecraft:redstone_mode")).append(TextFormatting.RESET).append("\n");
+		builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n");
 
-		builder.append(gui.t("sidebutton.storagecraft:redstone_mode." + setting.getRedstoneMode().id));
+		builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id));
 
 		return builder.toString();
 	}
@@ -37,6 +37,6 @@ public class SideButtonRedstoneMode extends SideButton
 	@Override
 	public void actionPerformed()
 	{
-		StorageCraft.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting));
+		RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting));
 	}
 }

src/main/java/refinedstorage/inventory/InventorySimple.java

@@ -1,4 +1,4 @@
-package storagecraft.inventory;
+package refinedstorage.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

src/main/java/refinedstorage/item/ItemBase.java

@@ -1,8 +1,8 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import storagecraft.StorageCraft;
+import refinedstorage.RefinedStorage;
 
 public abstract class ItemBase extends Item
 {
@@ -12,13 +12,13 @@ public abstract class ItemBase extends Item
 	{
 		this.name = name;
 
-		setCreativeTab(StorageCraft.TAB);
+		setCreativeTab(RefinedStorage.TAB);
 	}
 
 	@Override
 	public String getUnlocalizedName()
 	{
-		return "item." + StorageCraft.ID + ":" + name;
+		return "item." + RefinedStorage.ID + ":" + name;
 	}
 
 	@Override

src/main/java/refinedstorage/item/ItemBlockBase.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemColored;

src/main/java/refinedstorage/item/ItemBlockController.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import net.minecraft.block.Block;
 

src/main/java/refinedstorage/item/ItemBlockGrid.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import net.minecraft.block.Block;
 

src/main/java/refinedstorage/item/ItemBlockStorage.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.block.Block;
@@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
-import storagecraft.block.EnumStorageType;
-import storagecraft.storage.NBTStorage;
-import storagecraft.tile.TileStorage;
+import refinedstorage.block.EnumStorageType;
+import refinedstorage.storage.NBTStorage;
+import refinedstorage.tile.TileStorage;
 
 public class ItemBlockStorage extends ItemBlockBase
 {
@@ -29,11 +29,11 @@ public class ItemBlockStorage extends ItemBlockBase
 
 			if (type == EnumStorageType.TYPE_CREATIVE)
 			{
-				list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(tag)));
+				list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag)));
 			}
 			else
 			{
-				list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity()));
+				list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity()));
 			}
 		}
 	}

src/main/java/refinedstorage/item/ItemCore.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;

src/main/java/refinedstorage/item/ItemProcessor.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;

src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 public class ItemQuartzEnrichedIron extends ItemBase
 {

src/main/java/refinedstorage/item/ItemSilicon.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 public class ItemSilicon extends ItemBase
 {

src/main/java/refinedstorage/item/ItemStorageCell.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;
@@ -7,8 +7,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
-import storagecraft.storage.CellStorage;
-import storagecraft.storage.NBTStorage;
+import refinedstorage.storage.CellStorage;
+import refinedstorage.storage.NBTStorage;
 
 public class ItemStorageCell extends ItemBase
 {
@@ -41,11 +41,11 @@ public class ItemStorageCell extends ItemBase
 	{
 		if (CellStorage.getCapacity(cell) == -1)
 		{
-			list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(cell.getTagCompound())));
+			list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound())));
 		}
 		else
 		{
-			list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell)));
+			list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell)));
 		}
 	}
 

src/main/java/refinedstorage/item/ItemStoragePart.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;

src/main/java/refinedstorage/item/ItemWirelessGrid.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 import java.util.List;
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,11 +13,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
-import storagecraft.StorageCraft;
-import storagecraft.StorageCraftGUI;
-import storagecraft.block.EnumGridType;
-import storagecraft.tile.TileGrid;
-import storagecraft.tile.TileWirelessTransmitter;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageGui;
+import refinedstorage.block.EnumGridType;
+import refinedstorage.tile.TileGrid;
+import refinedstorage.tile.TileWirelessTransmitter;
 
 public class ItemWirelessGrid extends ItemBase
 {
@@ -46,7 +46,7 @@ public class ItemWirelessGrid extends ItemBase
 	{
 		if (isValid(stack))
 		{
-			list.add(I18n.translateToLocalFormatted("misc.storagecraft:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack)));
+			list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack)));
 		}
 	}
 
@@ -75,33 +75,33 @@ public class ItemWirelessGrid extends ItemBase
 
 							if (grid == null)
 							{
-								player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
+								player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage())));
 							}
 							else
 							{
-								player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ());
+								player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ());
 
 								return new ActionResult(EnumActionResult.SUCCESS, stack);
 							}
 						}
 						else
 						{
-							player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
+							player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working")));
 						}
 					}
 					else
 					{
-						player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
+						player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found")));
 					}
 				}
 				else
 				{
-					player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
+					player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range")));
 				}
 			}
 			else
 			{
-				player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
+				player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage())));
 			}
 
 			return new ActionResult(EnumActionResult.FAIL, stack);

src/main/java/refinedstorage/item/ItemWirelessGridPlate.java

@@ -1,4 +1,4 @@
-package storagecraft.item;
+package refinedstorage.item;
 
 public class ItemWirelessGridPlate extends ItemBase
 {

src/main/java/refinedstorage/jei/PluginRefinedStorage.java

@@ -1,16 +1,16 @@
-package storagecraft.jei;
+package refinedstorage.jei;
 
 import mezz.jei.api.BlankModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
 import net.minecraft.item.Item;
-import storagecraft.StorageCraftBlocks;
-import storagecraft.StorageCraftItems;
-import storagecraft.storage.CellStorage;
-import storagecraft.tile.TileStorage;
+import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.storage.CellStorage;
+import refinedstorage.tile.TileStorage;
 
 @JEIPlugin
-public class PluginStorageCraft extends BlankModPlugin
+public class PluginRefinedStorage extends BlankModPlugin
 {
 	@Override
 	public void register(IModRegistry registry)
@@ -21,7 +21,7 @@ public class PluginStorageCraft extends BlankModPlugin
 
 		registry.addRecipes(SoldererRecipeMaker.getRecipes());
 
-		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(StorageCraftItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED);
-		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), TileStorage.NBT_STORAGE);
+		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED);
+		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE);
 	}
 }

src/main/java/refinedstorage/jei/SoldererRecipeCategory.java

@@ -1,4 +1,4 @@
-package storagecraft.jei;
+package refinedstorage.jei;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -17,19 +17,19 @@ public class SoldererRecipeCategory implements IRecipeCategory
 
 	public SoldererRecipeCategory(IGuiHelper helper)
 	{
-		background = helper.createDrawable(new ResourceLocation("storagecraft", "textures/gui/solderer.png"), 8, 5, 162, 89);
+		background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89);
 	}
 
 	@Override
 	public String getUid()
 	{
-		return "storagecraft.solderer";
+		return "refinedstorage.solderer";
 	}
 
 	@Override
 	public String getTitle()
 	{
-		return I18n.translateToLocal("gui.storagecraft:solderer");
+		return I18n.translateToLocal("gui.refinedstorage:solderer");
 	}
 
 	@Override

src/main/java/refinedstorage/jei/SoldererRecipeHandler.java

@@ -1,4 +1,4 @@
-package storagecraft.jei;
+package refinedstorage.jei;
 
 import mezz.jei.api.recipe.IRecipeHandler;
 import mezz.jei.api.recipe.IRecipeWrapper;
@@ -14,7 +14,7 @@ public class SoldererRecipeHandler implements IRecipeHandler<SoldererRecipeWrapp
 	@Override
 	public String getRecipeCategoryUid()
 	{
-		return "storagecraft.solderer";
+		return "refinedstorage.solderer";
 	}
 
 	@Override

src/main/java/refinedstorage/jei/SoldererRecipeMaker.java

@@ -1,10 +1,10 @@
-package storagecraft.jei;
+package refinedstorage.jei;
 
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.item.ItemStack;
-import storagecraft.tile.solderer.ISoldererRecipe;
-import storagecraft.tile.solderer.SoldererRegistry;
+import refinedstorage.tile.solderer.ISoldererRecipe;
+import refinedstorage.tile.solderer.SoldererRegistry;
 
 public class SoldererRecipeMaker
 {

src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java

@@ -1,4 +1,4 @@
-package storagecraft.jei;
+package refinedstorage.jei;
 
 import com.google.common.base.Objects;
 import java.util.Collections;

src/main/java/refinedstorage/network/MessageCompareUpdate.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.settings.ICompareSetting;
+import refinedstorage.tile.settings.ICompareSetting;
 
 public class MessageCompareUpdate extends MessageHandlerPlayerToServer<MessageCompareUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.TileDetector;
+import refinedstorage.tile.TileDetector;
 
 public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer<MessageDetectorAmountUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.TileDetector;
+import refinedstorage.tile.TileDetector;
 
 public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer<MessageDetectorModeUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageGridCraftingClear.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.block.EnumGridType;
-import storagecraft.tile.TileGrid;
+import refinedstorage.block.EnumGridType;
+import refinedstorage.tile.TileGrid;
 
 public class MessageGridCraftingClear extends MessageHandlerPlayerToServer<MessageGridCraftingClear> implements IMessage
 {

src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
@@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-import storagecraft.tile.TileGrid;
+import refinedstorage.tile.TileGrid;
 
 public class MessageGridCraftingUpdate implements IMessage, IMessageHandler<MessageGridCraftingUpdate, IMessage>
 {

src/main/java/refinedstorage/network/MessageGridSortingUpdate.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.TileGrid;
+import refinedstorage.tile.TileGrid;
 
 public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer<MessageGridSortingUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;

src/main/java/refinedstorage/network/MessageModeToggle.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.settings.IModeSetting;
+import refinedstorage.tile.settings.IModeSetting;
 
 public class MessageModeToggle extends MessageHandlerPlayerToServer<MessageModeToggle> implements IMessage
 {

src/main/java/refinedstorage/network/MessagePriorityUpdate.java

@@ -1,13 +1,13 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.TileDrive;
-import storagecraft.tile.TileExternalStorage;
-import storagecraft.tile.TileStorage;
+import refinedstorage.tile.TileDrive;
+import refinedstorage.tile.TileExternalStorage;
+import refinedstorage.tile.TileStorage;
 
 public class MessagePriorityUpdate extends MessageHandlerPlayerToServer<MessagePriorityUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java

@@ -1,11 +1,11 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.settings.IRedstoneModeSetting;
+import refinedstorage.tile.settings.IRedstoneModeSetting;
 
 public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer<MessageRedstoneModeUpdate> implements IMessage
 {

src/main/java/refinedstorage/network/MessageStoragePull.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.storage.StorageItem;
-import storagecraft.tile.TileController;
+import refinedstorage.storage.StorageItem;
+import refinedstorage.tile.TileController;
 
 public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStoragePull> implements IMessage
 {

src/main/java/refinedstorage/network/MessageStoragePush.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import storagecraft.tile.TileController;
+import refinedstorage.tile.TileController;
 
 public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStoragePush> implements IMessage
 {

src/main/java/refinedstorage/network/MessageTileUpdate.java

@@ -1,4 +1,4 @@
-package storagecraft.network;
+package refinedstorage.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
@@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-import storagecraft.tile.INetworkTile;
+import refinedstorage.tile.INetworkTile;
 
 public class MessageTileUpdate implements IMessage, IMessageHandler<MessageTileUpdate, IMessage>
 {

src/main/java/refinedstorage/proxy/ClientProxy.java

@@ -0,0 +1,134 @@
+package refinedstorage.proxy;
+
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.ModelBakery;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.statemap.StateMap;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.block.*;
+import refinedstorage.item.*;
+
+public class ClientProxy extends CommonProxy
+{
+	@Override
+	public void preInit(FMLPreInitializationEvent e)
+	{
+		super.preInit(e);
+
+		// Item Variants
+		ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL,
+			new ResourceLocation("refinedstorage:1k_storage_cell"),
+			new ResourceLocation("refinedstorage:4k_storage_cell"),
+			new ResourceLocation("refinedstorage:16k_storage_cell"),
+			new ResourceLocation("refinedstorage:64k_storage_cell"),
+			new ResourceLocation("refinedstorage:creative_storage_cell")
+		);
+
+		ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART,
+			new ResourceLocation("refinedstorage:1k_storage_part"),
+			new ResourceLocation("refinedstorage:4k_storage_part"),
+			new ResourceLocation("refinedstorage:16k_storage_part"),
+			new ResourceLocation("refinedstorage:64k_storage_part")
+		);
+
+		ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR,
+			new ResourceLocation("refinedstorage:basic_printed_processor"),
+			new ResourceLocation("refinedstorage:improved_printed_processor"),
+			new ResourceLocation("refinedstorage:advanced_printed_processor"),
+			new ResourceLocation("refinedstorage:basic_processor"),
+			new ResourceLocation("refinedstorage:improved_processor"),
+			new ResourceLocation("refinedstorage:advanced_processor"),
+			new ResourceLocation("refinedstorage:printed_silicon")
+		);
+
+		ModelBakery.registerItemVariants(RefinedStorageItems.CORE,
+			new ResourceLocation("refinedstorage:construction_core"),
+			new ResourceLocation("refinedstorage:destruction_core")
+		);
+
+		ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID,
+			new ResourceLocation("refinedstorage:wireless_grid_connected"),
+			new ResourceLocation("refinedstorage:wireless_grid_disconnected")
+		);
+
+		// Items
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory"));
+
+		ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory"));
+
+		ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition()
+		{
+			@Override
+			public ModelResourceLocation getModelLocation(ItemStack stack)
+			{
+				if (ItemWirelessGrid.isValid(stack))
+				{
+					return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory");
+				}
+				else
+				{
+					return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory");
+				}
+			}
+		});
+
+		// Blocks
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DRIVE), 0, new ModelResourceLocation("refinedstorage:drive", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory"));
+
+		ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder())
+			.ignore(RefinedStorageBlocks.STORAGE.DIRECTION)
+			.ignore(RefinedStorageBlocks.STORAGE.CONNECTED)
+			.build()
+		);
+
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
+	}
+}

src/main/java/refinedstorage/proxy/CommonProxy.java

@@ -0,0 +1,355 @@
+package refinedstorage.proxy;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import refinedstorage.RefinedStorage;
+import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.block.*;
+import refinedstorage.gui.GuiHandler;
+import refinedstorage.item.*;
+import refinedstorage.network.*;
+import refinedstorage.storage.NBTStorage;
+import refinedstorage.tile.*;
+import refinedstorage.tile.solderer.*;
+
+public class CommonProxy
+{
+	public void preInit(FMLPreInitializationEvent e)
+	{
+		RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT);
+		RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT);
+		RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER);
+		RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER);
+
+		NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler());
+
+		GameRegistry.registerTileEntity(TileController.class, "controller");
+		GameRegistry.registerTileEntity(TileCable.class, "cable");
+		GameRegistry.registerTileEntity(TileGrid.class, "grid");
+		GameRegistry.registerTileEntity(TileDrive.class, "drive");
+		GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage");
+		GameRegistry.registerTileEntity(TileImporter.class, "importer");
+		GameRegistry.registerTileEntity(TileExporter.class, "exporter");
+		GameRegistry.registerTileEntity(TileDetector.class, "detector");
+		GameRegistry.registerTileEntity(TileSolderer.class, "solderer");
+		GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter");
+		GameRegistry.registerTileEntity(TileDestructor.class, "destructor");
+		GameRegistry.registerTileEntity(TileConstructor.class, "constructor");
+		GameRegistry.registerTileEntity(TileStorage.class, "storage");
+
+		GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller");
+		GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable");
+		GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid");
+		GameRegistry.registerBlock(RefinedStorageBlocks.DRIVE, "drive");
+		GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage");
+		GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer");
+		GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter");
+		GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector");
+		GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing");
+		GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer");
+		GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter");
+		GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor");
+		GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor");
+		GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage");
+
+		GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell");
+		GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid");
+		GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate");
+		GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron");
+		GameRegistry.registerItem(RefinedStorageItems.CORE, "core");
+		GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon");
+		GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor");
+		GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part");
+
+		// Processors
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON));
+
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC));
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED));
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED));
+
+		// Silicon
+		GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f);
+
+		// Quartz Enriched Iron
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4),
+			"II",
+			"IQ",
+			'I', new ItemStack(Items.iron_ingot),
+			'Q', new ItemStack(Items.quartz)
+		);
+
+		// Machine Casing
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			"EEE",
+			"E E",
+			"EEE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		// Construction Core
+		GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+			new ItemStack(Items.glowstone_dust)
+		);
+
+		// Destruction Core
+		GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+			new ItemStack(Items.quartz)
+		);
+
+		// Controller
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()),
+			"EDE",
+			"SRS",
+			"ESE",
+			'D', new ItemStack(Items.diamond),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'R', new ItemStack(Items.redstone),
+			'S', new ItemStack(RefinedStorageItems.SILICON)
+		);
+
+		// Solderer
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER),
+			"ESE",
+			"E E",
+			"ESE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'S', new ItemStack(Blocks.sticky_piston)
+		);
+
+		// Drive
+		SoldererRegistry.addRecipe(new SoldererRecipeDrive());
+
+		// Cable
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6),
+			"EEE",
+			"GRG",
+			"EEE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone)
+		);
+
+		// Grid
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+			"ECE",
+			"PMP",
+			"EDE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+			'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING)
+		);
+
+		// Crafting Grid
+		SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid());
+
+		// Wireless Transmitter
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER),
+			"EPE",
+			"EME",
+			"EAE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+			'P', new ItemStack(Items.ender_pearl),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING)
+		);
+
+		// Wireless Grid Plate
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE),
+			" P ",
+			"ERE",
+			"EEE",
+			'P', new ItemStack(Items.ender_pearl),
+			'R', new ItemStack(Items.redstone),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		// Wireless Grid
+		SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0));
+		SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1));
+
+		// External Storage
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE),
+			"CED",
+			"HMH",
+			"EPE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'H', new ItemStack(Blocks.chest),
+			'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+		);
+
+		// Importer
+		GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER),
+			new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
+		);
+
+		// Exporter
+		GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER),
+			new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
+		);
+
+		// Destructor
+		GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR),
+			"EDE",
+			"RMR",
+			"EIE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			'R', new ItemStack(Items.redstone),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+		);
+
+		// Constructor
+		GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR),
+			"ECE",
+			"RMR",
+			"EIE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			'R', new ItemStack(Items.redstone),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+		);
+
+		// Detector
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR),
+			"ECE",
+			"RMR",
+			"EPE",
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'R', new ItemStack(Items.redstone),
+			'C', new ItemStack(Items.comparator),
+			'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+		);
+
+		// Storage Cell Parts
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
+			"EPE",
+			"SRS",
+			"ESE",
+			'R', new ItemStack(Items.redstone),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(RefinedStorageItems.SILICON),
+			'S', new ItemStack(Blocks.glass)
+		);
+
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
+			"EPE",
+			"SRS",
+			"ESE",
+			'R', new ItemStack(Items.redstone),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+			'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K)
+		);
+
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
+			"EPE",
+			"SRS",
+			"ESE",
+			'R', new ItemStack(Items.redstone),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+			'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K)
+		);
+
+		GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
+			"EPE",
+			"SRS",
+			"ESE",
+			'R', new ItemStack(Items.redstone),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+			'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
+		);
+
+		// Storage Cells
+		GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)),
+			"GRG",
+			"RPR",
+			"EEE",
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone),
+			'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)),
+			"GRG",
+			"RPR",
+			"EEE",
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone),
+			'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)),
+			"GRG",
+			"RPR",
+			"EEE",
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone),
+			'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)),
+			"GRG",
+			"RPR",
+			"EEE",
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone),
+			'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
+			'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+		);
+
+		// Storage Blocks
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K));
+	}
+
+	public void init(FMLInitializationEvent e)
+	{
+	}
+
+	public void postInit(FMLPostInitializationEvent e)
+	{
+	}
+}

src/main/java/refinedstorage/proxy/ServerProxy.java

@@ -1,4 +1,4 @@
-package storagecraft.proxy;
+package refinedstorage.proxy;
 
 public class ServerProxy extends CommonProxy
 {

src/main/java/refinedstorage/storage/CellStorage.java

@@ -1,7 +1,7 @@
-package storagecraft.storage;
+package refinedstorage.storage;
 
 import net.minecraft.item.ItemStack;
-import storagecraft.item.ItemStorageCell;
+import refinedstorage.item.ItemStorageCell;
 
 public class CellStorage extends NBTStorage
 {

src/main/java/refinedstorage/storage/IStorage.java

@@ -1,4 +1,4 @@
-package storagecraft.storage;
+package refinedstorage.storage;
 
 import java.util.List;
 import net.minecraft.item.ItemStack;